diff options
| author | Dave Jones <davej@redhat.com> | 2011-08-26 11:49:02 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-08-26 11:49:02 -0400 |
| commit | ce55283388749e497f990c13b5777327ef18da18 (patch) | |
| tree | 0e5dc1c6f27ee2f7beb7203ff4e5fa8b9c4e1699 | |
| parent | d9244d04418fe4f34e10df697fdc53938ad4aef4 (diff) | |
| download | kernel-ce55283388749e497f990c13b5777327ef18da18.tar.gz kernel-ce55283388749e497f990c13b5777327ef18da18.tar.xz kernel-ce55283388749e497f990c13b5777327ef18da18.zip | |
remove pointless linux-2.6.29-sparc-IOC_TYPECHECK.patch
This is the same definition as the one in asm-generic
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | linux-2.6.29-sparc-IOC_TYPECHECK.patch | 21 |
3 files changed, 0 insertions, 35 deletions
@@ -23,9 +23,6 @@ Rolandware that is used by the debuginfo generation. Possibly upstreamable ? -* linux-2.6.29-sparc-IOC_TYPECHECK.patch - Responsible: Spot/Dennis. - * linux-2.6-v4l-dvb-uvcvideo-update.patch Responsible: Hans. diff --git a/kernel.spec b/kernel.spec index fae86736a..1d4cc9907 100644 --- a/kernel.spec +++ b/kernel.spec @@ -645,8 +645,6 @@ Patch09: linux-2.6-upstream-reverts.patch # Standalone patches -Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch - Patch160: linux-2.6-32bit-mmap-exec-randomization.patch Patch161: linux-2.6-i386-nx-emulation.patch @@ -1208,15 +1206,6 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R # # -# PowerPC -# - -# -# SPARC64 -# -ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch - -# # ARM # ApplyPatch arm-omap-dt-compat.patch diff --git a/linux-2.6.29-sparc-IOC_TYPECHECK.patch b/linux-2.6.29-sparc-IOC_TYPECHECK.patch deleted file mode 100644 index d73c30adc..000000000 --- a/linux-2.6.29-sparc-IOC_TYPECHECK.patch +++ /dev/null @@ -1,21 +0,0 @@ -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)) |