diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 18:50:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 18:50:58 +0200 |
| commit | 4a27214d7be31e122db4102166f49ec15958e8e9 (patch) | |
| tree | dceae47b6cabc5a4e755262b85187758f921dff1 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | x86 PAT: decouple from nonpromisc devmem (diff) | |
| download | linux-4a27214d7be31e122db4102166f49ec15958e8e9.tar.xz linux-4a27214d7be31e122db4102166f49ec15958e8e9.zip | |
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.c | 2 |
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, 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); |