procfs: disable per-task stack usage on NOMMU

It needs walk_page_range(). Reported-by: Michal Simek <monstr@monstr.eu> Tested-by: Michal Simek <monstr@monstr.eu> Cc: Stefani Seibold <stefani@seibold.net> Cc: David Howells <dhowells@redhat.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg Ungerer <gerg@snapgear.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

procfs: disable per-task stack usage on NOMMU
It needs walk_page_range(). Reported-by: Michal Simek <monstr@monstr.eu> Tested-by: Michal Simek <monstr@monstr.eu> Cc: Stefani Seibold <stefani@seibold.net> Cc: David Howells <dhowells@redhat.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg Ungerer <gerg@snapgear.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andrew Morton · Linus Torvalds
1 parent b9b9df62e7
Showing 2 changed files with 9 additions and 2 deletions Side-by-side Diff
fs/proc/array.c
mm/Makefile
@@ -322,6 +322,8 @@
 			p->nivcsw);
 }
  
+#ifdef CONFIG_MMU
+
 struct stack_stats {
 	struct vm_area_struct *vma;
 	unsigned long	startpage;
@@ -402,6 +404,11 @@
 		mmput(mm);
 	}
 }
+#else
+static void task_show_stack_usage(struct seq_file *m, struct task_struct *task)
+{
+}
+#endif		/* CONFIG_MMU */
  
 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
 			struct pid *pid, struct task_struct *task)
@@ -5,14 +5,14 @@
 mmu-y			:= nommu.o
 mmu-$(CONFIG_MMU)	:= fremap.o highmem.o madvise.o memory.o mincore.o \
 			   mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
-			   vmalloc.o
+			   vmalloc.o pagewalk.o
  
 obj-y			:= bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
 			   maccess.o page_alloc.o page-writeback.o \
 			   readahead.o swap.o truncate.o vmscan.o shmem.o \
 			   prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \
 			   page_isolation.o mm_init.o mmu_context.o \
-			   pagewalk.o $(mmu-y)
+			   $(mmu-y)
 obj-y += init-mm.o
  
 obj-$(CONFIG_BOUNCE)	+= bounce.o
...	...	@@ -322,6 +322,8 @@
322	322	p->nivcsw);
323	323	}
324	324
	325	+#ifdef CONFIG_MMU
	326	+
325	327	struct stack_stats {
326	328	struct vm_area_struct *vma;
327	329	unsigned long startpage;
...	...	@@ -402,6 +404,11 @@
402	404	mmput(mm);
403	405	}
404	406	}
	407	+#else
	408	+static void task_show_stack_usage(struct seq_file m, struct task_struct task)
	409	+{
	410	+}
	411	+#endif /* CONFIG_MMU */
405	412
406	413	int proc_pid_status(struct seq_file m, struct pid_namespace ns,
407	414	struct pid pid, struct task_struct task)
...	...	@@ -5,14 +5,14 @@
5	5	mmu-y := nommu.o
6	6	mmu-$(CONFIG_MMU) := fremap.o highmem.o madvise.o memory.o mincore.o \
7	7	mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
8		- vmalloc.o
	8	+ vmalloc.o pagewalk.o
9	9
10	10	obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
11	11	maccess.o page_alloc.o page-writeback.o \
12	12	readahead.o swap.o truncate.o vmscan.o shmem.o \
13	13	prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \
14	14	page_isolation.o mm_init.o mmu_context.o \
15		- pagewalk.o $(mmu-y)
	15	+ $(mmu-y)
16	16	obj-y += init-mm.o
17	17
18	18	obj-$(CONFIG_BOUNCE) += bounce.o