From: Christoph Lameter <clameter@sgi.com>
To: linux-arch@vger.kernel.org
Cc: Paul Mundt <lethal@linux-sh.org>,
Christoph Hellwig <hch@infradead.org>,
James Bottomley <James.Bottomley@SteelEye.com>,
Arjan van de Ven <arjan@infradead.org>,
linux-mm@kvack.org, Russell King <rmk@arm.linux.org.uk>,
Christoph Lameter <clameter@sgi.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Andi Kleen <ak@suse.de>
Subject: [PATCH 6/8] Optional ZONE_DMA for ia64
Date: Mon, 18 Sep 2006 11:36:45 -0700 (PDT) [thread overview]
Message-ID: <20060918183645.19679.4719.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20060918183614.19679.50359.sendpatchset@schroedinger.engr.sgi.com>
ZONE_DMA less operation for IA64 SGI platform
Disable ZONE_DMA for SGI SN2. All memory is addressable by all
devices and we do not need any special memory pool.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.18-rc6-mm1/arch/ia64/mm/discontig.c
===================================================================
--- linux-2.6.18-rc6-mm1.orig/arch/ia64/mm/discontig.c 2006-09-11 16:42:07.206714114 -0500
+++ linux-2.6.18-rc6-mm1/arch/ia64/mm/discontig.c 2006-09-11 16:51:50.094129334 -0500
@@ -37,7 +37,9 @@
unsigned long pernode_size;
struct bootmem_data bootmem_data;
unsigned long num_physpages;
+#ifdef CONFIG_ZONE_DMA
unsigned long num_dma_physpages;
+#endif
unsigned long min_pfn;
unsigned long max_pfn;
};
@@ -656,9 +658,11 @@
add_active_range(node, start >> PAGE_SHIFT, end >> PAGE_SHIFT);
mem_data[node].num_physpages += len >> PAGE_SHIFT;
+#ifdef CONFIG_ZONE_DMA
if (start <= __pa(MAX_DMA_ADDRESS))
mem_data[node].num_dma_physpages +=
(min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT;
+#endif
start = GRANULEROUNDDOWN(start);
start = ORDERROUNDDOWN(start);
end = GRANULEROUNDUP(end);
@@ -709,7 +713,9 @@
max_pfn = mem_data[node].max_pfn;
}
+#ifdef CONFIG_ZONE_DMA
max_zone_pfns[ZONE_DMA] = max_dma;
+#endif
max_zone_pfns[ZONE_NORMAL] = max_pfn;
free_area_init_nodes(max_zone_pfns);
Index: linux-2.6.18-rc6-mm1/arch/ia64/mm/contig.c
===================================================================
--- linux-2.6.18-rc6-mm1.orig/arch/ia64/mm/contig.c 2006-09-11 16:42:07.215503923 -0500
+++ linux-2.6.18-rc6-mm1/arch/ia64/mm/contig.c 2006-09-11 16:51:50.104872434 -0500
@@ -231,8 +231,10 @@
num_physpages = 0;
efi_memmap_walk(count_pages, &num_physpages);
+#ifdef CONFIG_ZONE_DMA
max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
max_zone_pfns[ZONE_DMA] = max_dma;
+#endif
max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
#ifdef CONFIG_VIRTUAL_MEM_MAP
Index: linux-2.6.18-rc6-mm1/arch/ia64/Kconfig
===================================================================
--- linux-2.6.18-rc6-mm1.orig/arch/ia64/Kconfig 2006-09-11 16:44:55.649739769 -0500
+++ linux-2.6.18-rc6-mm1/arch/ia64/Kconfig 2006-09-11 16:51:50.114638888 -0500
@@ -23,8 +23,8 @@
default y
config ZONE_DMA
- bool
- default y
+ def_bool y
+ depends on !IA64_SGI_SN2
config MMU
bool
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2006-09-18 18:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-18 18:36 [PATCH 0/8] Optional ZONE_DMA V2 Christoph Lameter
2006-09-18 18:36 ` [PATCH 1/8] Deal with cases of ZONE_DMA meaning the first zone Christoph Lameter
2006-09-18 18:36 ` [PATCH 2/8] Introduce CONFIG_ZONE_DMA Christoph Lameter
2006-09-18 18:36 ` [PATCH 3/8] Optional ZONE_DMA in the VM Christoph Lameter
2006-09-18 18:36 ` [PATCH 4/8] Optional ZONE_DMA for i386 Christoph Lameter
2006-09-18 18:36 ` [PATCH 5/8] Optional ZONE_DMA for x86_64 Christoph Lameter
2006-09-18 18:36 ` Christoph Lameter [this message]
2006-09-18 18:36 ` [PATCH 7/8] Remove ZONE_DMA remains from parisc Christoph Lameter
2006-09-18 18:36 ` [PATCH 8/8] Remove ZONE_DMA remains from sh/sh64 Christoph Lameter
[not found] ` <20060911222729.4849.69497.sendpatchset@schroedinger.engr.sgi.com>
[not found] ` <20060911222744.4849.26386.sendpatchset@schroedinger.engr.sgi.com>
[not found] ` <450600C7.7090801@yahoo.com.au>
2006-09-12 1:40 ` [PATCH 3/6] Optional ZONE_DMA in the VM Christoph Lameter
[not found] ` <20060912133457.GC10689@sgi.com>
[not found] ` <Pine.LNX.4.64.0609121032310.11278@schroedinger.engr.sgi.com>
2006-09-12 17:47 ` [PATCH 0/8] Optional ZONE_DMA V1 Martin Bligh
2006-09-12 17:53 ` Christoph Lameter
[not found] ` <1158046205.2992.1.camel@laptopd505.fenrus.org>
[not found] ` <Pine.LNX.4.64.0609121024290.11188@schroedinger.engr.sgi.com>
[not found] ` <yq0d5a0fbcj.fsf@jaguar.mkp.net>
[not found] ` <Pine.LNX.4.64.0609130109030.15792@schroedinger.engr.sgi.com>
[not found] ` <4507D4EE.4060501@sgi.com>
2006-09-13 17:23 ` Christoph Lameter
2006-09-13 17:49 ` Jack Steiner
2006-09-13 18:00 ` Christoph Lameter
2006-09-14 8:52 ` Jes Sorensen
2006-09-14 16:55 ` Christoph Lameter
[not found] ` <20060911222739.4849.79915.sendpatchset@schroedinger.engr.sgi.com>
[not found] ` <20060918135559.GB15096@infradead.org>
[not found] ` <20060918152243.GA4320@localhost.na.rta>
2006-09-18 17:33 ` [PATCH 2/6] Introduce CONFIG_ZONE_DMA Christoph Lameter
2006-09-18 22:45 ` Paul Mundt
2006-09-18 22:58 ` Christoph Lameter
2006-09-18 23:25 ` Paul Mundt
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=20060918183645.19679.4719.sendpatchset@schroedinger.engr.sgi.com \
--to=clameter@sgi.com \
--cc=James.Bottomley@SteelEye.com \
--cc=ak@suse.de \
--cc=arjan@infradead.org \
--cc=hch@infradead.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=lethal@linux-sh.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rmk@arm.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox