From: Michal Piotrowski kernel/sys.c:359: error: conflicting types for '__blocking_notifier_call_chain' include/linux/notifier.h:140: error: previous declaration of '__blocking_notifier_call_chain' was here kernel/sys.c:375: error: conflicting types for '__blocking_notifier_call_chain' include/linux/notifier.h:140: error: previous declaration of '__blocking_notifier_call_chain' was here Signed-off-by: Michal Piotrowski Signed-off-by: Andrew Morton --- kernel/sys.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/sys.c~extend-notifier_call_chain-to-count-nr_calls-made-fixes-3 kernel/sys.c --- a/kernel/sys.c~extend-notifier_call_chain-to-count-nr_calls-made-fixes-3 +++ a/kernel/sys.c @@ -354,7 +354,7 @@ EXPORT_SYMBOL_GPL(blocking_notifier_chai int __blocking_notifier_call_chain(struct blocking_notifier_head *nh, unsigned long val, void *v, - int nr_to_call, unsigned int *nr_calls) + int nr_to_call, int *nr_calls) { int ret = NOTIFY_DONE; _