The patch titled
posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode fix
has been added to the -mm tree. Its filename is
posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode fix
From: Frederik Deweerdt <deweerdt@xxxxxxx>
posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode.patch
declares two functions with the wrong return type.
Cc: Toyo Abe <toyoa@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/posix-cpu-timers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN kernel/posix-cpu-timers.c~posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode-fix kernel/posix-cpu-timers.c
--- a/kernel/posix-cpu-timers.c~posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode-fix
+++ a/kernel/posix-cpu-timers.c
@@ -1521,7 +1521,7 @@ static int process_cpu_nsleep(const cloc
{
return posix_cpu_nsleep(PROCESS_CLOCK, flags, rqtp, rmtp);
}
-static int process_cpu_nsleep_restart(struct restart_block *restart_block)
+static long process_cpu_nsleep_restart(struct restart_block *restart_block)
{
return -EINVAL;
}
@@ -1545,7 +1545,7 @@ static int thread_cpu_nsleep(const clock
{
return -EINVAL;
}
-static int thread_cpu_nsleep_restart(struct restart_block *restart_block)
+static long thread_cpu_nsleep_restart(struct restart_block *restart_block)
{
return -EINVAL;
}
_
Patches currently in -mm which might be from deweerdt@xxxxxxx are
bluetooth-use-gfp_atomic-in-_sock_creates-sk_alloc.patch
posix-timers-fix-clock_nanosleep-doesnt-return-the-remaining-time-in-compatibility-mode-fix.patch
posix-timers-fix-the-flags-handling-in-posix_cpu_nsleep-fix.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
