All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pekka Enberg <penberg@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>,
	Yinghai Lu <yinghai@kernel.org>,
	David Rientjes <rientjes@google.com>,
	Arun Sharma <asharma@fb.com>, Pekka Enberg <penberg@kernel.org>,
	"H. Peter Anvin" <hpa@linux.intel.com>
Subject: [PATCH v2 4/7] x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32
Date: Tue,  1 Nov 2011 15:58:19 +0200	[thread overview]
Message-ID: <1320155902-10424-4-git-send-email-penberg@kernel.org> (raw)
In-Reply-To: <1320155902-10424-1-git-send-email-penberg@kernel.org>

In preparation for unifying 32-bit and 64-bit zone_sizes_init() make sure
ZONE_DMA32 is wrapped in CONFIG_ZONE_DMA32.

Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Arun Sharma <asharma@fb.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 arch/x86/mm/init_64.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 3ddda59..a9214e6 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -620,7 +620,9 @@ static void __init zone_sizes_init(void)
 #ifdef CONFIG_ZONE_DMA
 	max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
 #endif
+#ifdef CONFIG_ZONE_DMA32
 	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
+#endif
 	max_zone_pfns[ZONE_NORMAL] = max_pfn;
 
 	free_area_init_nodes(max_zone_pfns);
-- 
1.7.6.4


  parent reply	other threads:[~2011-11-01 13:59 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-01 13:58 [PATCH v2 1/7] x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit Pekka Enberg
2011-11-01 13:58 ` [PATCH v2 2/7] x86, mm: Move zone init from paging_init() on 64-bit Pekka Enberg
2011-11-18 23:23   ` [tip:x86/mm] " tip-bot for Pekka Enberg
2011-11-01 13:58 ` [PATCH v2 3/7] x86, mm: Use max_pfn instead of highend_pfn Pekka Enberg
2011-11-18 23:24   ` [tip:x86/mm] " tip-bot for Pekka Enberg
2011-11-01 13:58 ` Pekka Enberg [this message]
2011-11-18 23:25   ` [tip:x86/mm] x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32 tip-bot for Pekka Enberg
2011-11-01 13:58 ` [PATCH v2 5/7] x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit Pekka Enberg
2011-11-18 23:25   ` [tip:x86/mm] " tip-bot for Pekka Enberg
2011-11-01 13:58 ` [PATCH v2 6/7] x86, mm: Prepare zone_sizes_init() for unification Pekka Enberg
2011-11-18 23:26   ` [tip:x86/mm] " tip-bot for Pekka Enberg
2011-11-01 13:58 ` [PATCH v2 7/7] x86, mm: Unify zone_sizes_init() Pekka Enberg
2011-11-18 23:27   ` [tip:x86/mm] " tip-bot for Pekka Enberg
2011-11-08 14:43 ` [PATCH v2 1/7] x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit Pekka Enberg
2011-11-11  9:21   ` Ingo Molnar
2011-11-18 23:22 ` [tip:x86/mm] " tip-bot for Pekka Enberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320155902-10424-4-git-send-email-penberg@kernel.org \
    --to=penberg@kernel.org \
    --cc=asharma@fb.com \
    --cc=hpa@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rientjes@google.com \
    --cc=tj@kernel.org \
    --cc=x86@kernel.org \
    --cc=yinghai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.