aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-26 12:50:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-26 12:50:58 -0400
commit4a27214d7be31e122db4102166f49ec15958e8e9 (patch)
treedceae47b6cabc5a4e755262b85187758f921dff1
parentc837c93a03be711dd6e09215b74b4f23bbd1ff83 (diff)
parent8db979bcfe46dcdced1065e9359e4ef7a50b8a6f (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* '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
-rw-r--r--arch/x86/mm/pat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index ef8b64b89c7d..9851265e4d65 100644
--- 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,
334 break; 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 saved_ptr->start, saved_ptr->end); 338 saved_ptr->start, saved_ptr->end);
339 /* No conflict. Go ahead and add this new entry */ 339 /* No conflict. Go ahead and add this new entry */
340 list_add(&new_entry->nd, saved_ptr->nd.prev); 340 list_add(&new_entry->nd, saved_ptr->nd.prev);