Messages in this thread Patch in this message | | | Date | Sat, 26 Apr 2008 16:21:34 +0200 | From | Ingo Molnar <> | Subject | [git pull] x86 updates |
| |
Linus, please pull the latest x86 updates git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes.git for-linus
Thanks,
Ingo
------------------> Ingo Molnar (2): x86 PAT: tone down debugging messages x86 PAT: decouple from nonpromisc devmem
arch/x86/Kconfig | 4 ++-- arch/x86/mm/pat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4d350b5..4aa4180 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1049,9 +1049,9 @@ config MTRR See <file:Documentation/mtrr.txt> for more information. config X86_PAT - def_bool y + bool prompt "x86 PAT support" - depends on MTRR && NONPROMISC_DEVMEM + depends on MTRR help Use PAT attributes to setup page level cache control. diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index ef8b64b..9851265 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);
| |