diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 15:19:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 15:19:09 -0700 |
| commit | 869c34f5208adde010065c387354f2ebe4ec3bfc (patch) | |
| tree | 6c427732d93fbb7357b68747bbbc182ba3b1fe9b /arch/x86/kernel/check.c | |
| parent | 52d3c03675fdbe1965b9b1909072b40ad2f80063 (diff) | |
| parent | 03150171dcf9492a96f57cbb2aef088bafcfcd2e (diff) | |
| download | lwn-869c34f5208adde010065c387354f2ebe4ec3bfc.tar.gz lwn-869c34f5208adde010065c387354f2ebe4ec3bfc.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: ce4100: Set pci ops via callback instead of module init
x86/mm: Fix pgd_lock deadlock
x86/mm: Handle mm_fault_error() in kernel space
x86: Don't check for BIOS corruption in first 64K when there's no need to
Diffstat (limited to 'arch/x86/kernel/check.c')
| -rw-r--r-- | arch/x86/kernel/check.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c index 13a389179514..452932d34730 100644 --- a/arch/x86/kernel/check.c +++ b/arch/x86/kernel/check.c @@ -106,8 +106,8 @@ void __init setup_bios_corruption_check(void) addr += size; } - printk(KERN_INFO "Scanning %d areas for low memory corruption\n", - num_scan_areas); + if (num_scan_areas) + printk(KERN_INFO "Scanning %d areas for low memory corruption\n", num_scan_areas); } @@ -143,12 +143,12 @@ static void check_corruption(struct work_struct *dummy) { check_for_bios_corruption(); schedule_delayed_work(&bios_check_work, - round_jiffies_relative(corruption_check_period*HZ)); + round_jiffies_relative(corruption_check_period*HZ)); } static int start_periodic_check_for_corruption(void) { - if (!memory_corruption_check || corruption_check_period == 0) + if (!num_scan_areas || !memory_corruption_check || corruption_check_period == 0) return 0; printk(KERN_INFO "Scanning for low memory corruption every %d seconds\n", |