Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754834Ab1DSLKB (ORCPT ); Tue, 19 Apr 2011 07:10:01 -0400 Received: from cantor.suse.de ([195.135.220.2]:37072 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754616Ab1DSLJ6 (ORCPT ); Tue, 19 Apr 2011 07:09:58 -0400 Date: Tue, 19 Apr 2011 13:09:56 +0200 From: Michal Hocko To: Andrew Morton Cc: Hugh Dickins , linux-mm@kvack.org, LKML Subject: [PATCH followup] mm: get rid of CONFIG_STACK_GROWSUP || CONFIG_IA64 Message-ID: <20110419110956.GD21689@tiehlicka.suse.cz> References: <20110415135144.GE8828@tiehlicka.suse.cz> <20110418100131.GD8925@tiehlicka.suse.cz> <20110418135637.5baac204.akpm@linux-foundation.org> <20110419091022.GA21689@tiehlicka.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110419091022.GA21689@tiehlicka.suse.cz> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1924 Lines: 61 While I am in the cleanup mode. We should use VM_GROWSUP rather than tricky CONFIG_STACK_GROWSUP||CONFIG_IA64. What do you think? --- >From fd832dd46b4918718901f2ebe994f4662f167999 Mon Sep 17 00:00:00 2001 From: Michal Hocko 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. To avoid we have defined VM_GROWSUP which is defined only for the above configuration. We still have places which use the original ifdefs so let's get rid of them finally. Signed-off-by: Michal Hocko --- 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.1 -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/