---

yaml --- r: 348138 b: refs/heads/master c: ce73ec6 h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · f9d1593 · f9d1593
1 parent 32c0c2d
commit f9d1593
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 062fe95afe93a24b33d34491c54445ab5438d0ba
+refs/heads/master: ce73ec6db47af84d1466402781ae0872a9e7873c
diff --git a/trunk/arch/ia64/include/asm/unistd.h b/trunk/arch/ia64/include/asm/unistd.h
@@ -11,7 +11,7 @@
 
 
 
-#define NR_syscalls			312 /* length of syscall table */
+#define NR_syscalls			311 /* length of syscall table */
 
 /*
  * The following defines stop scripts/checksyscalls.sh from complaining about

diff --git a/trunk/arch/ia64/include/uapi/asm/unistd.h b/trunk/arch/ia64/include/uapi/asm/unistd.h
@@ -324,6 +324,5 @@
 #define __NR_process_vm_readv		1332
 #define __NR_process_vm_writev		1333
 #define __NR_accept4			1334
-#define __NR_finit_module		1335
 
 #endif /* _UAPI_ASM_IA64_UNISTD_H */
diff --git a/trunk/arch/ia64/kernel/entry.S b/trunk/arch/ia64/kernel/entry.S
@@ -1785,7 +1785,6 @@ sys_call_table:
 	data8 sys_process_vm_readv
 	data8 sys_process_vm_writev
 	data8 sys_accept4
-	data8 sys_finit_module			// 1335
 
 	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls
 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
@@ -770,13 +770,8 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
 
 void update_vsyscall_tz(void)
 {
-	/* Make userspace gettimeofday spin until we're done. */
-	++vdso_data->tb_update_count;
-	smp_mb();
 	vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
 	vdso_data->tz_dsttime = sys_tz.tz_dsttime;
-	smp_mb();
-	++vdso_data->tb_update_count;
 }
 
 static void __init clocksource_init(void)
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
-    #define NR_syscalls			312 /* length of syscall table */
+    #define NR_syscalls			311 /* length of syscall table */
     /*
      * The following defines stop scripts/checksyscalls.sh from complaining about
@@ Expand Down @@