rpms/kernel/F-9 linux-2.6.25-sparc64-semctl.patch, NONE, 1.1 kernel.spec, 1.629, 1.630

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24632

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.25-sparc64-semctl.patch 
Log Message:
sparc64 semctl fix

linux-2.6.25-sparc64-semctl.patch:

--- NEW FILE linux-2.6.25-sparc64-semctl.patch ---
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 73ed01b..8d4761f 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -454,8 +454,8 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
 			err = sys_semget(first, (int)second, (int)third);
 			goto out;
 		case SEMCTL: {
-			err = sys_semctl(first, third,
-					 (int)second | IPC_64,
+			err = sys_semctl(first, second,
+					 (int)third | IPC_64,
 					 (union semun) ptr);
 			goto out;
 		}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- kernel.spec	25 Apr 2008 03:21:12 -0000	1.629
+++ kernel.spec	25 Apr 2008 13:35:34 -0000	1.630
@@ -586,6 +586,8 @@
 Patch148: linux-2.6-powerpc-zImage-32MiB.patch
 Patch149: linux-2.6-efika-not-chrp.patch
 
+Patch150: linux-2.6.25-sparc64-semctl.patch
+
 Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
@@ -1049,6 +1051,11 @@
 ApplyPatch linux-2.6-efika-not-chrp.patch
 
 #
+# SPARC64
+#
+ApplyPatch linux-2.6.25-sparc64-semctl.patch
+
+#
 # Exec shield
 #
 ApplyPatch linux-2.6-execshield.patch
@@ -1785,6 +1792,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Apr 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.25-11
+- add sparc64 semctl fix (David Miller)
+  (it will be in git shortly, and can be dropped on the next git merge)
+
 * Thu Apr 24 2008 John W. Linville <linville at redhat.com> 2.6.25-10
 - mac80211: Fix n-band association problem
 - net/mac80211/rx.c: fix off-by-one