git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
[pandora-kernel.git]
/
fs
/
proc
/
array.c
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index
e51f2ec
..
885ab55
100644
(file)
--- a/
fs/proc/array.c
+++ b/
fs/proc/array.c
@@
-81,7
+81,6
@@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
#include <linux/tracehook.h>
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
#include <linux/tracehook.h>
-#include <linux/swapops.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
@@
-495,7
+494,7
@@
static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
rsslim,
mm ? mm->start_code : 0,
mm ? mm->end_code : 0,
rsslim,
mm ? mm->start_code : 0,
mm ? mm->end_code : 0,
- (permitted && mm) ?
task->stack_start
: 0,
+ (permitted && mm) ?
mm->start_stack
: 0,
esp,
eip,
/* The signal information here is obsolete.
esp,
eip,
/* The signal information here is obsolete.