diff options
| author | Dave Jones <davej@redhat.com> | 2011-06-17 15:46:56 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-06-17 15:46:56 -0400 |
| commit | 27d8829e66864b1972fcd74614c565bd5ddd1614 (patch) | |
| tree | 23e6bfe966012f5ce8fc2c1cad3bd381d75a4497 | |
| parent | 3e5443018e6c236f288a60b04021af22d9e3a68b (diff) | |
| download | kernel-27d8829e66864b1972fcd74614c565bd5ddd1614.tar.gz kernel-27d8829e66864b1972fcd74614c565bd5ddd1614.tar.xz kernel-27d8829e66864b1972fcd74614c565bd5ddd1614.zip | |
drop linux-2.6-debug-always-inline-kzalloc.patch.
Can't recall why this was added. Can easily re-add if deemed necessary.
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | linux-2.6-debug-always-inline-kzalloc.patch | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/kernel.spec b/kernel.spec index 9c1a1722a..1eabce490 100644 --- a/kernel.spec +++ b/kernel.spec @@ -626,7 +626,6 @@ Patch161: linux-2.6-i386-nx-emulation.patch Patch202: linux-2.6-debug-taint-vm.patch Patch203: linux-2.6-debug-vm-would-have-oomkilled.patch -Patch204: linux-2.6-debug-always-inline-kzalloc.patch Patch383: linux-2.6-defaults-aspm.patch @@ -1184,7 +1183,6 @@ ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch # Various low-impact patches to aid debugging. ApplyPatch linux-2.6-debug-taint-vm.patch ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch -ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch # # PCI @@ -1882,6 +1880,8 @@ fi * Fri Jun 17 2011 Dave Jones <davej@redhat.com> - drop qcserial 'compile fix' that was just duplicating an include. - drop struct sizeof debug patch. (no real value. not upstreamable) +- drop linux-2.6-debug-always-inline-kzalloc.patch. + Can't recall why this was added. Can easily re-add if deemed necessary. * Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com> - linux-2.6-defaults-pci_no_msi.patch: drop, haven't toggled the default diff --git a/linux-2.6-debug-always-inline-kzalloc.patch b/linux-2.6-debug-always-inline-kzalloc.patch deleted file mode 100644 index 24f665ca6..000000000 --- a/linux-2.6-debug-always-inline-kzalloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 76ec0e2e6d6edf81abc0331d5e7873ef7b2f6019 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin <kyle@phobos.i.jkkm.org> -Date: Wed, 8 Jul 2009 13:06:01 -0400 -Subject: [PATCH 6/6] fedora: linux-2.6-debug-always-inline-kzalloc.patch - ---- - include/linux/slab.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/linux/slab.h b/include/linux/slab.h -index 2da8372..d4ef74f 100644 ---- a/include/linux/slab.h -+++ b/include/linux/slab.h -@@ -310,7 +310,7 @@ static inline void *kmem_cache_zalloc(struct kmem_cache *k, gfp_t flags) - * @size: how many bytes of memory are required. - * @flags: the type of memory to allocate (see kmalloc). - */ --static inline void *kzalloc(size_t size, gfp_t flags) -+static __always_inline void *kzalloc(size_t size, gfp_t flags) - { - return kmalloc(size, flags | __GFP_ZERO); - } --- -1.6.2.5 - |