Re: 2.6.11-mm1 (x86-abstract-discontigmem-setup.patch)

[Dave Hansen <haveblue@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

I hit send on that other one accidentally...

I believe the attached patch should fix the extra output.  Compiles on
my normal summit discontig configuration.  Andrew, please apply some
time after x86-abstract-discontigmem-setup-fix.patch in your series.

-- Dave

[-- Attachment #2: x86-abstract-discontigmem-setup-fix-printk.patch --]
[-- Type: text/x-patch, Size: 778 bytes --]



---

 clean-dave/arch/i386/mm/discontig.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/mm/discontig.c~x86-abstract-discontigmem-setup-fix-printk arch/i386/mm/discontig.c
--- clean/arch/i386/mm/discontig.c~x86-abstract-discontigmem-setup-fix-printk	2005-03-07 10:40:53.000000000 -0800
+++ clean-dave/arch/i386/mm/discontig.c	2005-03-07 10:41:29.000000000 -0800
@@ -70,9 +70,9 @@ void memory_present(int nid, unsigned lo
 	printk(KERN_DEBUG "  ");
 	for (pfn = start; pfn < end; pfn += PAGES_PER_ELEMENT) {
 		physnode_map[pfn / PAGES_PER_ELEMENT] = nid;
-		printk(KERN_DEBUG "%ld ", pfn);
+		printk("%ld ", pfn);
 	}
-	printk(KERN_DEBUG "\n");
+	printk("\n");
 }
 
 unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
_