[kernel] r5646 - in dists/sid/linux-2.6/debian: . patches patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Tue Jan 31 08:24:32 2006
New Revision: 5646

Added:
   dists/sid/linux-2.6/debian/patches/sparc64-clock-settime.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4
Log:
Add sparc64-clock-settime.patch to fix a hang while
setting the date with 'date -s'.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jan 31 08:24:32 2006
@@ -6,7 +6,13 @@
     time jumping forward with a subsequent hang. Thanks to Richard
     Mortimer, acked by David Miller and applied upstream.
     Ref: http://marc.theaimsgroup.com/?t=113745273000001&r=1&w=2
-
+  * [sparc64] Add sparc64-clock-settime.patch to fix the incorrect
+    handling of the clock_settime syscall arguments, which resulted 
+    in a hang when trying to set the date using 'date -s'. Patch
+    by David Miller is applied upstream. Thanks to Ludovic Courtes
+    and Frans Pop for reporting and testing.
+    Ref: http://marc.theaimsgroup.com/?t=113861017400002&r=1&w=2
+  
   [ Christian T. Steigies ]
   * [m68k] update m68k patch and config to 2.6.15
   * [m68k] SCSI drivers need to be built in until ramdisk generator tools

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Tue Jan 31 08:24:32 2006
@@ -5,3 +5,4 @@
 + arm-nslu2-beeper.patch
 + amd64-pppd-fix.patch
 + 64bit-vidiocswin-ioctl-fix.patch
++ sparc64-clock-settime.patch

Added: dists/sid/linux-2.6/debian/patches/sparc64-clock-settime.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/sparc64-clock-settime.patch	Tue Jan 31 08:24:32 2006
@@ -0,0 +1,23 @@
+diff -aur a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S
+--- a/arch/sparc64/kernel/sys32.S	2006-01-02 19:21:10.000000000 -0800
++++ b/arch/sparc64/kernel/sys32.S	2006-01-30 23:28:13.000000000 -0800
+@@ -84,7 +84,6 @@
+ SIGN2(sys32_bdflush, sys_bdflush, %o0, %o1)
+ SIGN1(sys32_mlockall, sys_mlockall, %o0)
+ SIGN1(sys32_nfsservctl, compat_sys_nfsservctl, %o0)
+-SIGN1(sys32_clock_settime, compat_sys_clock_settime, %o1)
+ SIGN1(sys32_clock_nanosleep, compat_sys_clock_nanosleep, %o1)
+ SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1)
+ SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)
+diff -aur a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
+--- a/arch/sparc64/kernel/systbls.S	2006-01-02 19:21:10.000000000 -0800
++++ b/arch/sparc64/kernel/systbls.S	2006-01-30 23:28:13.000000000 -0800
+@@ -71,7 +71,7 @@
+ /*240*/	.word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler
+ 	.word sys_sched_yield, sys32_sched_get_priority_max, sys32_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep
+ /*250*/	.word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
+-	.word sys_ni_syscall, sys32_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
++	.word sys_ni_syscall, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
+ /*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
+ 	.word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
+ /*270*/	.word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink