Branch 27 for module linux-2.6 created (as new trunk) from tag linux-2.6-22-32

[linux-2.6.git] / linux-2.6-590-chopstix-intern.patch

diff --git a/linux-2.6-590-chopstix-intern.patch b/linux-2.6-590-chopstix-intern.patch
index ffbe5c5..0f20cea 100644 (file)
--- a/linux-2.6-590-chopstix-intern.patch
+++ b/linux-2.6-590-chopstix-intern.patch
@@ -194,15 +194,6 @@ diff -Nurb linux-2.6.22-580/fs/bio.c linux-2.6.22-590/fs/bio.c
 diff -Nurb linux-2.6.22-580/fs/exec.c linux-2.6.22-590/fs/exec.c
 --- linux-2.6.22-580/fs/exec.c 2008-04-30 09:29:26.000000000 -0400
 +++ linux-2.6.22-590/fs/exec.c 2008-04-30 09:29:41.000000000 -0400
-@@ -38,7 +38,7 @@
- #include <linux/binfmts.h>
- #include <linux/swap.h>
- #include <linux/utsname.h>
--#include <linux/pid_namespace.h>
-+/*#include <linux/pid_namespace.h>*/
- #include <linux/module.h>
- #include <linux/namei.h>
- #include <linux/proc_fs.h>
 @@ -52,6 +52,7 @@
  #include <linux/audit.h>
  #include <linux/signalfd.h>
@@ -224,17 +215,6 @@ diff -Nurb linux-2.6.22-580/fs/exec.c linux-2.6.22-590/fs/exec.c
                file = ERR_PTR(-EACCES);
                if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
                    S_ISREG(inode->i_mode)) {
-@@ -627,8 +634,10 @@
-        * Reparenting needs write_lock on tasklist_lock,
-        * so it is safe to do it under read_lock.
-        */
-+      /*
-       if (unlikely(tsk->group_leader == child_reaper(tsk)))
-               tsk->nsproxy->pid_ns->child_reaper = tsk;
-+              */
- 
-       zap_other_threads(tsk);
-       read_unlock(&tasklist_lock);
 diff -Nurb linux-2.6.22-580/include/linux/arrays.h linux-2.6.22-590/include/linux/arrays.h
 --- linux-2.6.22-580/include/linux/arrays.h    1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.22-590/include/linux/arrays.h    2008-04-30 09:29:41.000000000 -0400
@@ -311,7 +291,7 @@ diff -Nurb linux-2.6.22-580/kernel/mutex.c linux-2.6.22-590/kernel/mutex.c
  #include <linux/interrupt.h>
  #include <linux/debug_locks.h>
 +#include <linux/arrays.h>
-+
++#undef CONFIG_CHOPSTIX
 +#ifdef CONFIG_CHOPSTIX
 +struct event_spec {
 +      unsigned long pc;