summaryrefslogtreecommitdiffstats
path: root/kernel
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 /kernel
parent76695af20c015206cffb84b15912be6797d0cca2 (diff)
parentdecd275e62d5eef4b947fab89652fa6afdadf2f2 (diff)
downloadop-kernel-dev-f320ead76a87a9c533f681ecce3bf3241d07c47d.zip
op-kernel-dev-f320ead76a87a9c533f681ecce3bf3241d07c47d.tar.gz
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 'kernel')
-rw-r--r--kernel/notifier.c2
-rw-r--r--kernel/sys_ni.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/notifier.c b/kernel/notifier.c
index ae9fc7c..980e433 100644
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
@@ -544,6 +544,8 @@ int notrace notify_die(enum die_val val, const char *str,
.signr = sig,
};
+ rcu_lockdep_assert(rcu_is_watching(),
+ "notify_die called but RCU thinks we're quiescent");
return atomic_notifier_call_chain(&die_chain, val, &args);
}
NOKPROBE_SYMBOL(notify_die);
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 7995ef5..ca7d84f 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -140,6 +140,7 @@ cond_syscall(sys_sgetmask);
cond_syscall(sys_ssetmask);
cond_syscall(sys_vm86old);
cond_syscall(sys_vm86);
+cond_syscall(sys_modify_ldt);
cond_syscall(sys_ipc);
cond_syscall(compat_sys_ipc);
cond_syscall(compat_sys_sysctl);
OpenPOWER on IntegriCloud