diff options
| author |   Arjan van de Ven <arjan@linux.intel.com> | 2008-07-08 09:51:56 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-08-21 10:01:52 +0200 |
| commit | bde78a79a6eb015f33aa4660df1b06f5135def20 (patch) | |
| tree | eaf517054fa73cd871e0dba198852e32b136a7bd /arch/x86/kernel/cpu/mtrr/main.c | |
| parent | x86: use WARN() in arch/x86/mm/ioremap.c (diff) | |
| download | linux-dev-bde78a79a6eb015f33aa4660df1b06f5135def20.tar.xz linux-dev-bde78a79a6eb015f33aa4660df1b06f5135def20.zip | |
x86: use WARN() in arch/x86/kernel
Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.
This also allowed the folding of some if()'s into the WARN()
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: akpm@linux-foundation.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/main.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index 6f23969c8faf..b117d7f8a564 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c @@ -1496,11 +1496,8 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) /* kvm/qemu doesn't have mtrr set right, don't trim them all */ if (!highest_pfn) { - if (!kvm_para_available()) { - printk(KERN_WARNING + WARN(!kvm_para_available(), KERN_WARNING "WARNING: strange, CPU MTRRs all blank?\n"); - WARN_ON(1); - } return 0; } |