Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36d6f3ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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'
parents 21279cfa db8590f5

arch/x86/kernel/acpi/realmode/wakeup.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,6 @@ SECTIONS 
	/DISCARD/ : {

		*(.note*)

	}

}



ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
 
	. = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");

}

arch/x86/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ static int show_other_interrupts(struct seq_file *p, int prec) 
	for_each_online_cpu(j)

		seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);

	seq_printf(p, "  Spurious interrupts\n");

	seq_printf(p, "%*s: ", prec, "CNT");

	seq_printf(p, "%*s: ", prec, "PMI");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs);

	seq_printf(p, "  Performance counter interrupts\n");

	seq_printf(p, "  Performance monitoring interrupts\n");

	seq_printf(p, "%*s: ", prec, "PND");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs);

arch/x86/kernel/vmlinux.lds.S

+9 −8
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ SECTIONS 




#ifdef CONFIG_X86_32

ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),

. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),

	   "kernel image bigger than KERNEL_IMAGE_SIZE");

#else

/*
@@ -319,11 +319,11 @@ INIT_PER_CPU(irq_stack_union); 
/*

 * Build-time check on the image size:

 */

ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),

. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),

	   "kernel image bigger than KERNEL_IMAGE_SIZE");



#ifdef CONFIG_SMP

ASSERT((per_cpu__irq_stack_union == 0),

. = ASSERT((per_cpu__irq_stack_union == 0),

           "irq_stack_union is not at start of per-cpu area");

#endif
@@ -332,6 +332,7 @@ ASSERT((per_cpu__irq_stack_union == 0), 
#ifdef CONFIG_KEXEC

#include <asm/kexec.h>



ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,

. = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE,

           "kexec control code size is too big");

#endif