Resolve patch conflicts after rebase to 2.6.22 mainline

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 4a3c980..bc8eea6 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -160,7 +160,6 @@ Patch010: linux-2.6-010-e1000e.patch
 Patch015: linux-2.6-015-igb.patch
 Patch017: linux-2.6-017-bnx2.patch
 Patch020: linux-2.6-020-build-id.patch
-Patch021: linux-2.6-021-bcm.patch
 Patch030: linux-2.6-030-netns.patch
 Patch040: linux-2.6-040-i_mutex-check.patch
 Patch050: linux-2.6-050-getline.patch
@@ -402,7 +401,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 15
 %ApplyPatch 17
 %ApplyPatch 20
-%ApplyPatch 21
 
 # NetNS patch for VINI
 %if 0%{?with_netns}

diff --git a/linux-2.6-590-chopstix-intern.patch b/linux-2.6-590-chopstix-intern.patch
index 91039e6..bfc859b 100644 (file)
--- a/linux-2.6-590-chopstix-intern.patch
+++ b/linux-2.6-590-chopstix-intern.patch
@@ -935,54 +935,3 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags
        local_irq_restore(flags);
  }
  EXPORT_SYMBOL(kfree);
---- linux-2.6.22.19-chopstix/mm/memory.c.orig  2008-02-25 18:59:40.000000000 -0500
-+++ linux-2.6.22.19-chopstix/mm/memory.c       2009-02-17 18:34:55.000000000 -0500
-@@ -59,6 +59,7 @@
- 
- #include <linux/swapops.h>
- #include <linux/elf.h>
-+#include <linux/arrays.h>
- 
- #ifndef CONFIG_NEED_MULTIPLE_NODES
- /* use the per-pgdat data instead for discontigmem - mbligh */
-@@ -2581,6 +2582,15 @@
-       return VM_FAULT_MINOR;
- }
- 
-+extern void (*rec_event)(void *,unsigned int);
-+struct event_spec {
-+      unsigned long pc;
-+      unsigned long dcookie; 
-+      unsigned count;
-+      unsigned char reason;
-+};
-+
-+
- /*
-  * By the time we get here, we already hold the mm semaphore
-  */
-@@ -2610,6 +2620,24 @@
-       if (!pte)
-               return VM_FAULT_OOM;
- 
-+#ifdef CONFIG_CHOPSTIX
-+      if (rec_event) {
-+              struct event event;
-+              struct event_spec espec;
-+        struct pt_regs *regs;
-+        unsigned int pc;
-+        regs = task_pt_regs(current);
-+        pc = regs->eip & (unsigned int) ~4095;
-+
-+              espec.reason = 0; /* alloc */
-+              event.event_data=&espec;
-+              event.task = current;
-+              espec.pc=pc;
-+              event.event_type=5; 
-+              (*rec_event)(&event, 1);
-+      }
-+#endif
-+
-       return handle_pte_fault(mm, vma, address, pte, pmd, write_access);
- }
-