diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:20:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:20:17 -0400 |
commit | 36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad (patch) | |
tree | 99e0c131153d2f8126b6bd64e9a2a0e4e68216a0 | |
parent | 21279cfa107af07ef985539ac0de2152b9cba5f5 (diff) | |
parent | db8590f5043f3436a65b24155a3a7af2604df876 (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:
Revert "x86: linker script syntax nits"
x86, perf_event: Rename 'performance counter interrupt'
-rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.lds.S | 4 | ||||
-rw-r--r-- | arch/x86/kernel/irq.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 17 |
3 files changed, 13 insertions, 12 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S index 0e50e1e5c573..7da00b799cda 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S | |||
@@ -56,6 +56,6 @@ SECTIONS | |||
56 | /DISCARD/ : { | 56 | /DISCARD/ : { |
57 | *(.note*) | 57 | *(.note*) |
58 | } | 58 | } |
59 | } | ||
60 | 59 | ||
61 | ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); | 60 | . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!"); |
61 | } | ||
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 74656d1d4e30..04bbd5278568 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c | |||
@@ -63,10 +63,10 @@ static int show_other_interrupts(struct seq_file *p, int prec) | |||
63 | for_each_online_cpu(j) | 63 | for_each_online_cpu(j) |
64 | seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count); | 64 | seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count); |
65 | seq_printf(p, " Spurious interrupts\n"); | 65 | seq_printf(p, " Spurious interrupts\n"); |
66 | seq_printf(p, "%*s: ", prec, "CNT"); | 66 | seq_printf(p, "%*s: ", prec, "PMI"); |
67 | for_each_online_cpu(j) | 67 | for_each_online_cpu(j) |
68 | seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs); | 68 | seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs); |
69 | seq_printf(p, " Performance counter interrupts\n"); | 69 | seq_printf(p, " Performance monitoring interrupts\n"); |
70 | seq_printf(p, "%*s: ", prec, "PND"); | 70 | seq_printf(p, "%*s: ", prec, "PND"); |
71 | for_each_online_cpu(j) | 71 | for_each_online_cpu(j) |
72 | seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs); | 72 | seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs); |
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 8d6001ad8d8d..92929fb3f9fa 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
@@ -305,8 +305,8 @@ SECTIONS | |||
305 | 305 | ||
306 | 306 | ||
307 | #ifdef CONFIG_X86_32 | 307 | #ifdef CONFIG_X86_32 |
308 | ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), | 308 | . = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), |
309 | "kernel image bigger than KERNEL_IMAGE_SIZE"); | 309 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
310 | #else | 310 | #else |
311 | /* | 311 | /* |
312 | * Per-cpu symbols which need to be offset from __per_cpu_load | 312 | * Per-cpu symbols which need to be offset from __per_cpu_load |
@@ -319,12 +319,12 @@ INIT_PER_CPU(irq_stack_union); | |||
319 | /* | 319 | /* |
320 | * Build-time check on the image size: | 320 | * Build-time check on the image size: |
321 | */ | 321 | */ |
322 | ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), | 322 | . = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), |
323 | "kernel image bigger than KERNEL_IMAGE_SIZE"); | 323 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
324 | 324 | ||
325 | #ifdef CONFIG_SMP | 325 | #ifdef CONFIG_SMP |
326 | ASSERT((per_cpu__irq_stack_union == 0), | 326 | . = ASSERT((per_cpu__irq_stack_union == 0), |
327 | "irq_stack_union is not at start of per-cpu area"); | 327 | "irq_stack_union is not at start of per-cpu area"); |
328 | #endif | 328 | #endif |
329 | 329 | ||
330 | #endif /* CONFIG_X86_32 */ | 330 | #endif /* CONFIG_X86_32 */ |
@@ -332,6 +332,7 @@ ASSERT((per_cpu__irq_stack_union == 0), | |||
332 | #ifdef CONFIG_KEXEC | 332 | #ifdef CONFIG_KEXEC |
333 | #include <asm/kexec.h> | 333 | #include <asm/kexec.h> |
334 | 334 | ||
335 | ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, | 335 | . = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, |
336 | "kexec control code size is too big"); | 336 | "kexec control code size is too big"); |
337 | #endif | 337 | #endif |
338 | |||