diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 00:05:18 (GMT) |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 00:05:18 (GMT) |
commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
tree | b7e792414fef2390718a657765719fbbb529ce84 /fs/proc/array.c | |
parent | c3935e30495869dd611e1cd62253c94ebc7c6c04 (diff) | |
parent | b160fdabe93a8a53094f90f02bf4dcb500782aab (diff) | |
download | linux-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index e51f2ec..885ab55 100644 --- 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/swapops.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, - (permitted && mm) ? task->stack_start : 0, + (permitted && mm) ? mm->start_stack : 0, esp, eip, /* The signal information here is obsolete. |