From bae2fdcc5ed5753e5e654122866a6ba98da232fa Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 24 Sep 2009 14:47:43 -0700 Subject: [PATCH] --- yaml --- r: 166177 b: refs/heads/master c: c44972f1782124f945ec8bea8a78f30f1a3538bd h: refs/heads/master i: 166175: e1d953645fd3c7af58c4ab8404c4c488e94e46e0 v: v3 --- [refs] | 2 +- trunk/fs/proc/array.c | 7 +++++++ trunk/mm/Makefile | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9f02d395b15..c052be2fb84d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9b9df62e7fd6b5f099c24bc867100ab86e1da5a +refs/heads/master: c44972f1782124f945ec8bea8a78f30f1a3538bd diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 0c6bc602e6c4..07f77a7945c3 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -322,6 +322,8 @@ static inline void task_context_switch_counts(struct seq_file *m, p->nivcsw); } +#ifdef CONFIG_MMU + struct stack_stats { struct vm_area_struct *vma; unsigned long startpage; @@ -402,6 +404,11 @@ static inline void task_show_stack_usage(struct seq_file *m, 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) diff --git a/trunk/mm/Makefile b/trunk/mm/Makefile index 515fd793c17f..ebf849042ed3 100644 --- a/trunk/mm/Makefile +++ b/trunk/mm/Makefile @@ -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