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

Commit 47f16ca7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, irqinit: preempt merge conflicts 



To make the topic merge life easier for tip:perfcounters/core,
include two (inactive in this topic) IRQ vector initializations
here.

Also fix build bug - missing kprobes.h inclusion.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent abdb5a57

arch/x86/kernel/irqinit.c

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/timex.h>

#include <linux/slab.h>

#include <linux/random.h>

#include <linux/kprobes.h>

#include <linux/init.h>

#include <linux/kernel_stat.h>

#include <linux/sysdev.h>
@@ -195,6 +196,13 @@ static void __init apic_intr_init(void) 
	/* IPI vectors for APIC spurious and error interrupts */

	alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);

	alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);



	/* Performance monitoring interrupts: */

# ifdef CONFIG_PERF_COUNTERS

	alloc_intr_gate(LOCAL_PERF_VECTOR, perf_counter_interrupt);

	alloc_intr_gate(LOCAL_PENDING_VECTOR, perf_pending_interrupt);

# endif



#endif



#ifdef CONFIG_X86_32