rpms/kernel/devel linux-2.6.29-sparc-IOC_TYPECHECK.patch, NONE, 1.1 config-sparc64-generic, 1.21, 1.22 kernel.spec, 1.1399, 1.1400

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18255

Modified Files:
	config-sparc64-generic kernel.spec 
Added Files:
	linux-2.6.29-sparc-IOC_TYPECHECK.patch 
Log Message:
sparc config changes, fix sparc64 compile

linux-2.6.29-sparc-IOC_TYPECHECK.patch:

--- NEW FILE linux-2.6.29-sparc-IOC_TYPECHECK.patch ---
diff -up vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h.BAD vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h
--- vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h.BAD	2009-03-09 17:01:32.000000000 -0400
+++ vanilla-2.6.29-rc7-git2/arch/sparc/include/asm/ioctl.h	2009-03-09 16:52:27.000000000 -0400
@@ -41,6 +41,17 @@
          ((nr)   << _IOC_NRSHIFT) | \
          ((size) << _IOC_SIZESHIFT))
 
+#ifdef __KERNEL__
+/* provoke compile error for invalid uses of size argument */
+extern unsigned int __invalid_size_argument_for_IOC;
+#define _IOC_TYPECHECK(t) \
+        ((sizeof(t) == sizeof(t[1]) && \
+          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
+          sizeof(t) : __invalid_size_argument_for_IOC)
+#else
+#define _IOC_TYPECHECK(t) (sizeof(t))
+#endif
+
 #define _IO(type,nr)        _IOC(_IOC_NONE,(type),(nr),0)
 #define _IOR(type,nr,size)  _IOC(_IOC_READ,(type),(nr),sizeof(size))
 #define _IOW(type,nr,size)  _IOC(_IOC_WRITE,(type),(nr),sizeof(size))


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-sparc64-generic	17 Nov 2008 17:14:34 -0000	1.21
+++ config-sparc64-generic	9 Mar 2009 21:20:48 -0000	1.22
@@ -85,7 +85,6 @@
 # CONFIG_FB_LEO is not set
 CONFIG_FB_XVR500=y
 CONFIG_FB_XVR2500=y
-# CONFIG_DRM is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_CIRRUS is not set
@@ -153,7 +152,6 @@
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E_TX_RETRY=16
 # CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_INPUT_PCSPKR is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -r1.1399 -r1.1400
--- kernel.spec	9 Mar 2009 21:03:29 -0000	1.1399
+++ kernel.spec	9 Mar 2009 21:20:48 -0000	1.1400
@@ -604,6 +604,8 @@
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
 
+Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
+
 Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
@@ -1084,6 +1086,8 @@
 # SPARC64
 #
 
+ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
+
 #
 # Exec shield
 #
@@ -1806,6 +1810,9 @@
 # and build.
 
 %changelog
+* Tue Mar 10 2009 Tom "spot" Callaway <tcallawa at redhat.com>
+- linux-2.6.29-sparc-IOC_TYPECHECK.patch: missing function in sparc specific ioctl.h
+
 * Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: fix ppc