summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 13:24:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 13:24:20 -0800
commit4d2a914239eee6fcddd12a7c9c32e135dde8f3f1 (patch)
tree55100d41d0771f1f47083c886475c2fbaf648751 /kernel
parent9e9868a7372afc60615e8e11db246a91a121654d (diff)
parent1786bf009f18f722afbb62143c8541e7e60a4e92 (diff)
downloadlinux-4d2a914239eee6fcddd12a7c9c32e135dde8f3f1.tar.gz
linux-4d2a914239eee6fcddd12a7c9c32e135dde8f3f1.tar.bz2
linux-4d2a914239eee6fcddd12a7c9c32e135dde8f3f1.zip
Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: core: Clean up user return notifers use of per_cpu
Diffstat (limited to 'kernel')
-rw-r--r--kernel/user-return-notifier.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/user-return-notifier.c b/kernel/user-return-notifier.c
index 03e2d6fd9b18..eb27fd3430a2 100644
--- a/kernel/user-return-notifier.c
+++ b/kernel/user-return-notifier.c
@@ -6,8 +6,6 @@
static DEFINE_PER_CPU(struct hlist_head, return_notifier_list);
-#define URN_LIST_HEAD per_cpu(return_notifier_list, raw_smp_processor_id())
-
/*
* Request a notification when the current cpu returns to userspace. Must be
* called in atomic context. The notifier will also be called in atomic
@@ -16,7 +14,7 @@ static DEFINE_PER_CPU(struct hlist_head, return_notifier_list);
void user_return_notifier_register(struct user_return_notifier *urn)
{
set_tsk_thread_flag(current, TIF_USER_RETURN_NOTIFY);
- hlist_add_head(&urn->link, &URN_LIST_HEAD);
+ hlist_add_head(&urn->link, &__get_cpu_var(return_notifier_list));
}
EXPORT_SYMBOL_GPL(user_return_notifier_register);
@@ -27,7 +25,7 @@ EXPORT_SYMBOL_GPL(user_return_notifier_register);
void user_return_notifier_unregister(struct user_return_notifier *urn)
{
hlist_del(&urn->link);
- if (hlist_empty(&URN_LIST_HEAD))
+ if (hlist_empty(&__get_cpu_var(return_notifier_list)))
clear_tsk_thread_flag(current, TIF_USER_RETURN_NOTIFY);
}
EXPORT_SYMBOL_GPL(user_return_notifier_unregister);