diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 15:38:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 15:38:39 -0400 |
| commit | c3c9897c63ebb0b93b7f78724e38d6ee1da04041 (patch) | |
| tree | f1ed40f2ac6108b23251dd4e41adeac403396fea /arch/x86/mm | |
| parent | d2441183dc222d12961ff2201f5086c846505d93 (diff) | |
| parent | 3cfba0892585d4c8e7b4122b5dc0d206a76936de (diff) | |
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: fix section mismatch warning - apic_x2apic_phys
x86: fix section mismatch warning - apic_x2apic_cluster
x86: fix section mismatch warning - apic_x2apic_uv_x
x86: fix section mismatch warning - apic_physflat
x86: fix section mismatch warning - apic_flat
x86: memtest fix use of reserve_early()
x86 syscall.h: fix argument order
x86/tlb_uv: remove strange mc146818rtc include
x86: remove redundant KERN_DEBUG on pr_debug
x86: do_boot_cpu - check if we have ESR register
x86: MAINTAINERS change for AMD microcode patch loader
x86/proc: fix /proc/cpuinfo cpu offline bug
x86: call dmi-quirks for HP Laptops after early-quirks are executed
x86, kexec: fix hang on i386 when panic occurs while console_sem is held
MCE: Don't run 32bit machine checks with interrupts on
x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC
x86: make variables static
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/memtest.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c index 672e17f8262a..9cab18b0b857 100644 --- a/arch/x86/mm/memtest.c +++ b/arch/x86/mm/memtest.c | |||
| @@ -61,9 +61,9 @@ static void __init memtest(unsigned long start_phys, unsigned long size, | |||
| 61 | last_bad += incr; | 61 | last_bad += incr; |
| 62 | } else { | 62 | } else { |
| 63 | if (start_bad) { | 63 | if (start_bad) { |
| 64 | printk(KERN_CONT "\n %010lx bad mem addr %010lx - %010lx reserved", | 64 | printk(KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved", |
| 65 | val, start_bad, last_bad + incr); | 65 | val, start_bad, last_bad + incr); |
| 66 | reserve_early(start_bad, last_bad - start_bad, "BAD RAM"); | 66 | reserve_early(start_bad, last_bad + incr, "BAD RAM"); |
| 67 | } | 67 | } |
| 68 | start_bad = last_bad = start_phys_aligned; | 68 | start_bad = last_bad = start_phys_aligned; |
| 69 | } | 69 | } |
| @@ -72,9 +72,8 @@ static void __init memtest(unsigned long start_phys, unsigned long size, | |||
| 72 | if (start_bad) { | 72 | if (start_bad) { |
| 73 | printk(KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved", | 73 | printk(KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved", |
| 74 | val, start_bad, last_bad + incr); | 74 | val, start_bad, last_bad + incr); |
| 75 | reserve_early(start_bad, last_bad - start_bad, "BAD RAM"); | 75 | reserve_early(start_bad, last_bad + incr, "BAD RAM"); |
| 76 | } | 76 | } |
| 77 | |||
| 78 | } | 77 | } |
| 79 | 78 | ||
| 80 | /* default is disabled */ | 79 | /* default is disabled */ |