diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-08-03 11:04:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-03 11:04:00 +0200 |
| commit | f320ead76a87a9c533f681ecce3bf3241d07c47d (patch) | |
| tree | 76ae437119088b180737670cb99a307e163a1ca0 /include/linux/jump_label.h | |
| parent | locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_acquire() (diff) | |
| parent | x86/vm86: Rename vm86->v86flags and v86mask (diff) | |
| download | linux-dev-f320ead76a87a9c533f681ecce3bf3241d07c47d.tar.xz linux-dev-f320ead76a87a9c533f681ecce3bf3241d07c47d.zip | |
Merge branch 'x86/asm' into locking/core
Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:
4ea1636b04db 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>
Diffstat (limited to 'include/linux/jump_label.h')
0 files changed, 0 insertions, 0 deletions