Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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'
+13
-12
+2
-2
arch/x86/kernel/acpi/realmode/wakeup.lds.S
+2
-2
arch/x86/kernel/acpi/realmode/wakeup.lds.S
+2
-2
arch/x86/kernel/irq.c
+2
-2
arch/x86/kernel/irq.c
···
63
63
for_each_online_cpu(j)
64
64
seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);
65
65
seq_printf(p, " Spurious interrupts\n");
66
-
seq_printf(p, "%*s: ", prec, "CNT");
66
+
seq_printf(p, "%*s: ", prec, "PMI");
67
67
for_each_online_cpu(j)
68
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
70
seq_printf(p, "%*s: ", prec, "PND");
71
71
for_each_online_cpu(j)
72
72
seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs);
+9
-8
arch/x86/kernel/vmlinux.lds.S
+9
-8
arch/x86/kernel/vmlinux.lds.S
···
305
305
306
306
307
307
#ifdef CONFIG_X86_32
308
-
ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
309
-
"kernel image bigger than KERNEL_IMAGE_SIZE");
308
+
. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
309
+
"kernel image bigger than KERNEL_IMAGE_SIZE");
310
310
#else
311
311
/*
312
312
* Per-cpu symbols which need to be offset from __per_cpu_load
···
319
319
/*
320
320
* Build-time check on the image size:
321
321
*/
322
-
ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
323
-
"kernel image bigger than KERNEL_IMAGE_SIZE");
322
+
. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
323
+
"kernel image bigger than KERNEL_IMAGE_SIZE");
324
324
325
325
#ifdef CONFIG_SMP
326
-
ASSERT((per_cpu__irq_stack_union == 0),
327
-
"irq_stack_union is not at start of per-cpu area");
326
+
. = ASSERT((per_cpu__irq_stack_union == 0),
327
+
"irq_stack_union is not at start of per-cpu area");
328
328
#endif
329
329
330
330
#endif /* CONFIG_X86_32 */
···
332
332
#ifdef CONFIG_KEXEC
333
333
#include <asm/kexec.h>
334
334
335
-
ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,
336
-
"kexec control code size is too big");
335
+
. = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,
336
+
"kexec control code size is too big");
337
337
#endif
338
+