[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110601081114.006208521@blue.kroah.org>
Date: Wed, 01 Jun 2011 17:10:12 +0900
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
James Bottomley <James.Bottomley@...senPartnership.com>,
Greg Kroah-Hartman <gregkh@...e.de>
Subject: [042/165] [PARISC] wire up clock_adjtime syscall
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
Content-Length: 1065
Lines: 36
From: James Bottomley <James.Bottomley@...senPartnership.com>
commit c3f957a22eca106bd28136943305b390b4337ebf upstream.
Signed-off-by: James Bottomley <James.Bottomley@...senPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists