Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes

torvalds · torvalds · commit 4a27214d7be3 · 2008-04-26T09:50:58.000-07:00
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
  x86 PAT: decouple from nonpromisc devmem
  x86 PAT: tone down debugging messages
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
@@ -334,7 +334,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
 				break;
 			}
 
-			printk("Overlap at 0x%Lx-0x%Lx\n",
+			pr_debug("Overlap at 0x%Lx-0x%Lx\n",
 			       saved_ptr->start, saved_ptr->end);
 			/* No conflict. Go ahead and add this new entry */
 			list_add(&new_entry->nd, saved_ptr->nd.prev);

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,`
`334`	`334`	`break;`
`335`	`335`	`}`
`336`	`336`
`337`		`- printk("Overlap at 0x%Lx-0x%Lx\n",`
	`337`	`+ pr_debug("Overlap at 0x%Lx-0x%Lx\n",`
`338`	`338`	`saved_ptr->start, saved_ptr->end);`
`339`	`339`	`/* No conflict. Go ahead and add this new entry */`
`340`	`340`	`list_add(&new_entry->nd, saved_ptr->nd.prev);`