Hi Andrew, the patch bellow probably got lost in the huge "parisc crashes with slub" thread triggered by my earlier clean up in this area so I am resending it standalone. --- >From 2e79c7e73a39a09389a84a8f37eb2a2f2f2859f5 Mon Sep 17 00:00:00 2001 From: Michal Hocko <mhocko@xxxxxxx> Date: Tue, 19 Apr 2011 11:11:41 +0200 Subject: [PATCH] mm: get rid of CONFIG_STACK_GROWSUP || CONFIG_IA64 IA64 needs some trickery for Register Backing Store so we have to export expand_stack_upwards for it even though the architecture expands its stack downwards normally. We have defined VM_GROWSUP which is defined only for the above configuration so let's use it everywhere rather than hardcoded CONFIG_STACK_GROWSUP || CONFIG_IA64 Signed-off-by: Michal Hocko <mhocko@xxxxxxx> --- mm/mmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 29c68b0..3ff9edf 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1726,7 +1726,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns return 0; } -#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64) +#if VM_GROWSUP /* * PA-RISC uses this for its stack; IA64 for its Register Backing Store. * vma is the last one with address > vma->vm_end. Have to extend vma. @@ -1777,7 +1777,7 @@ int expand_stack_upwards(struct vm_area_struct *vma, unsigned long address) khugepaged_enter_vma_merge(vma); return error; } -#endif /* CONFIG_STACK_GROWSUP || CONFIG_IA64 */ +#endif /* VM_GROWSUP */ /* * vma is the first one with address < vma->vm_start. Have to extend vma. -- 1.7.4.4 -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>