summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/assigned-dev.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-03 11:04:00 +0200
committerIngo Molnar <mingo@kernel.org>2015-08-03 11:04:00 +0200
commitf320ead76a87a9c533f681ecce3bf3241d07c47d (patch)
tree76ae437119088b180737670cb99a307e163a1ca0 /arch/x86/kvm/assigned-dev.c
parentlocking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_a... (diff)
parentx86/vm86: Rename vm86->v86flags and v86mask (diff)
downloadlinux-f320ead76a87a9c533f681ecce3bf3241d07c47d.tar.xz
linux-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 'arch/x86/kvm/assigned-dev.c')
0 files changed, 0 insertions, 0 deletions