Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d2a9142 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-entry-for-linus' of... 

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
parents 9e9868a7 1786bf00

kernel/user-return-notifier.c

+2 −4
Original line number Diff line number Diff line
@@ -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);