Merge branch 'x86/asm' into locking/core

Browse source

Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:

  4ea1636b04 x86/asm/tsc: Rename native_read_tsc() to rdtsc()
  ...

So merge it into the locking tree to have a smoother resolution.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2015-08-03 11:04:00 +02:00

parent 76695af20c decd275e62

commit f320ead76a

93 changed files with 2076 additions and 1261 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

include/linux/context_tracking.h

View file

1

include/linux/context_tracking_state.h

View file

30

include/linux/spinlock.h

View file