From 62e628bdc37745c8de87393df45e524d8679d97d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 10 Oct 2006 12:12:52 -0700 Subject: [PATCH] remove patch as per Christoph Lameter's request --- .../do-not-free-non-slab-allocated-per_cpu_pageset.patch | 2 +- queue-2.6.18/series | 1 - .../process_zones-fix-error-handling.patch | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename {queue-2.6.18 => rejects}/process_zones-fix-error-handling.patch (100%) diff --git a/queue-2.6.18/do-not-free-non-slab-allocated-per_cpu_pageset.patch b/queue-2.6.18/do-not-free-non-slab-allocated-per_cpu_pageset.patch index 1dbdd72939f..ff83a247ff2 100644 --- a/queue-2.6.18/do-not-free-non-slab-allocated-per_cpu_pageset.patch +++ b/queue-2.6.18/do-not-free-non-slab-allocated-per_cpu_pageset.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman --- linux-2.6.18.orig/mm/page_alloc.c +++ linux-2.6.18/mm/page_alloc.c -@@ -1847,8 +1847,10 @@ static inline void free_zone_pagesets(in +@@ -1845,8 +1845,10 @@ static inline void free_zone_pagesets(in for_each_zone(zone) { struct per_cpu_pageset *pset = zone_pcp(zone, cpu); diff --git a/queue-2.6.18/series b/queue-2.6.18/series index 3dc044cb68d..13400b6647a 100644 --- a/queue-2.6.18/series +++ b/queue-2.6.18/series @@ -37,7 +37,6 @@ sky2-network-driver-device-ids.patch 0015-powerpc-fix-building-gdb-against-asm-ptrace.h.patch sysfs-remove-duplicated-dput-in-sysfs_update_file.patch powerpc-fix-ohare-ide-irq-workaround-on-old-powermacs.patch -process_zones-fix-error-handling.patch i386-bootioremap-kexec-fix.patch rtc-lockdep-fix-workaround.patch do-not-free-non-slab-allocated-per_cpu_pageset.patch diff --git a/queue-2.6.18/process_zones-fix-error-handling.patch b/rejects/process_zones-fix-error-handling.patch similarity index 100% rename from queue-2.6.18/process_zones-fix-error-handling.patch rename to rejects/process_zones-fix-error-handling.patch -- 2.47.2