This patch switches task_watchers to from atomic to blocking notifier chains,
allowing notifier_calls to sleep.
Signed-off-by: Matt Helsley <[email protected]>
--
drivers/connector/cn_proc.c | 2 +-
kernel/sys.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6.17-rc6-mm2/kernel/sys.c
===================================================================
--- linux-2.6.17-rc6-mm2.orig/kernel/sys.c
+++ linux-2.6.17-rc6-mm2/kernel/sys.c
@@ -434,29 +434,29 @@ int unregister_reboot_notifier(struct no
}
EXPORT_SYMBOL(unregister_reboot_notifier);
/* task watchers notifier chain */
-static ATOMIC_NOTIFIER_HEAD(task_watchers);
+static BLOCKING_NOTIFIER_HEAD(task_watchers);
int register_task_watcher(struct notifier_block *nb)
{
- return atomic_notifier_chain_register(&task_watchers, nb);
+ return blocking_notifier_chain_register(&task_watchers, nb);
}
EXPORT_SYMBOL_GPL(register_task_watcher);
int unregister_task_watcher(struct notifier_block *nb)
{
- return atomic_notifier_chain_unregister(&task_watchers, nb);
+ return blocking_notifier_chain_unregister(&task_watchers, nb);
}
EXPORT_SYMBOL_GPL(unregister_task_watcher);
int notify_watchers(unsigned long val, void *v)
{
- return atomic_notifier_call_chain(&task_watchers, val, v);
+ return blocking_notifier_call_chain(&task_watchers, val, v);
}
static int set_one_prio(struct task_struct *p, int niceval, int error)
{
Index: linux-2.6.17-rc6-mm2/drivers/connector/cn_proc.c
===================================================================
--- linux-2.6.17-rc6-mm2.orig/drivers/connector/cn_proc.c
+++ linux-2.6.17-rc6-mm2/drivers/connector/cn_proc.c
@@ -193,11 +193,11 @@ static int cn_proc_watch_task(struct not
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ev->timestamp); /* get high res monotonic timestamp */
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
- cn_netlink_send(msg, CN_IDX_PROC, GFP_ATOMIC);
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
/* If cn_netlink_send() fails, drop data */
return rc;
}
static struct notifier_block __read_mostly cn_proc_nb = {
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
