2.6.38-stable review patch.  If anyone has any objections, please let us know.

------------------

From: James Bottomley <[email protected]>

commit c3f957a22eca106bd28136943305b390b4337ebf upstream.

Signed-off-by: James Bottomley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 arch/parisc/include/asm/unistd.h   |    3 ++-
 arch/parisc/kernel/syscall_table.S |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -816,8 +816,9 @@
 #define __NR_prlimit64         (__NR_Linux + 321)
 #define __NR_fanotify_init     (__NR_Linux + 322)
 #define __NR_fanotify_mark     (__NR_Linux + 323)
+#define __NR_clock_adjtime     (__NR_Linux + 324)
 
-#define __NR_Linux_syscalls    (__NR_fanotify_mark + 1)
+#define __NR_Linux_syscalls    (__NR_clock_adjtime + 1)
 
 
 #define __IGNORE_select                /* newselect */
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -422,6 +422,7 @@
        ENTRY_SAME(prlimit64)
        ENTRY_SAME(fanotify_init)
        ENTRY_COMP(fanotify_mark)
+       ENTRY_COMP(clock_adjtime)
 
        /* Nothing yet */
 


_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to