[kernel] r15795 - dists/sid/linux-2.6/debian/patches/features/all/vserver

[Ben Hutchings]

Author: benh
Date: Thu May 27 02:55:25 2010
New Revision: 15795

Log:
Fix up vs2.3.0.36.27.patch for 2.6.32.14

Modified:
   dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.27.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.27.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.27.patch	Thu May 27 02:52:11 2010	(r15794)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.27.patch	Thu May 27 02:55:25 2010	(r15795)
@@ -699,17 +699,6 @@
  source "security/Kconfig"
  
  config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/kernel/irq.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/irq.c
---- linux-2.6.32.1/arch/powerpc/kernel/irq.c	2009-12-03 20:02:01.000000000 +0100
-+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/irq.c	2009-12-03 20:04:56.000000000 +0100
-@@ -54,6 +54,7 @@
- #include <linux/pci.h>
- #include <linux/debugfs.h>
- #include <linux/perf_event.h>
-+// #include <linux/vs_context.h>
- 
- #include <asm/uaccess.h>
- #include <asm/system.h>
 diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/kernel/process.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/process.c
 --- linux-2.6.32.1/arch/powerpc/kernel/process.c	2009-12-03 20:02:02.000000000 +0100
 +++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/process.c	2009-12-03 20:04:56.000000000 +0100
@@ -6597,10 +6586,10 @@
 diff -NurpP --minimal linux-2.6.32.1/fs/proc/array.c linux-2.6.32.1-vs2.3.0.36.27/fs/proc/array.c
 --- linux-2.6.32.1/fs/proc/array.c	2009-12-03 20:02:53.000000000 +0100
 +++ linux-2.6.32.1-vs2.3.0.36.27/fs/proc/array.c	2009-12-03 20:04:56.000000000 +0100
-@@ -83,6 +83,8 @@
+@@ -83,5 +83,7 @@
+ #include <linux/pid_namespace.h>
  #include <linux/ptrace.h>
  #include <linux/tracehook.h>
- #include <linux/swapops.h>
 +#include <linux/vs_context.h>
 +#include <linux/vs_network.h>
  
@@ -6654,8 +6643,8 @@
  
  static inline void task_context_switch_counts(struct seq_file *m,
 @@ -410,6 +417,42 @@ static void task_show_stack_usage(struct
+ 			p->nivcsw);
  }
- #endif		/* CONFIG_MMU */
  
 +int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
 +			struct pid *pid, struct task_struct *task)