The patch titled
Task watchers: allow task watchers to block
has been added to the -mm tree. Its filename is
task-watchers-allow-task-watchers-to-block.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Task watchers: allow task watchers to block
From: Matt Helsley <matthltc@xxxxxxxxxx>
This patch switches task_watchers from atomic to blocking notifier chains,
allowing notifier_calls to sleep.
Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/connector/cn_proc.c | 2 +-
kernel/sys.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/connector/cn_proc.c~task-watchers-allow-task-watchers-to-block drivers/connector/cn_proc.c
--- a/drivers/connector/cn_proc.c~task-watchers-allow-task-watchers-to-block
+++ a/drivers/connector/cn_proc.c
@@ -195,7 +195,7 @@ static int cn_proc_watch_task(struct not
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;
}
diff -puN kernel/sys.c~task-watchers-allow-task-watchers-to-block kernel/sys.c
--- a/kernel/sys.c~task-watchers-allow-task-watchers-to-block
+++ a/kernel/sys.c
@@ -435,23 +435,23 @@ 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)
_
Patches currently in -mm which might be from matthltc@xxxxxxxxxx are
process-events-header-cleanup.patch
process-events-license-change.patch
remove-unecessary-null-check-in-kernel-acctc.patch
mark-profile-notifier-blocks-__read_mostly.patch
task-watchers-task-watchers.patch
task-watchers-task-watchers-tidy.patch
task-watchers-register-process-events-task-watcher.patch
task-watchers-refactor-process-events.patch
task-watchers-make-process-events-configurable-as.patch
task-watchers-allow-task-watchers-to-block.patch
task-watchers-register-audit-task-watcher.patch
task-watchers-register-per-task-delay-accounting.patch
task-watchers-register-profile-as-a-task-watcher.patch
task-watchers-add-support-for-per-task-watchers.patch
task-watchers-register-semundo-task-watcher.patch
task-watchers-register-per-task-semundo-watcher.patch
ipc-replace-kmalloc-and-memset-in-get_undo_list-with-kzalloc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
