]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: abdb5a5) | patch
x86, irqinit: preempt merge conflicts
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 12:58:05 +0000 (14:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 14:26:43 +0000 (16:26 +0200)
commit47f16ca7631f9c6bad8e6d968cfb1433029b09ec
tree182a5bf4607bf31b02e90efa065ce5e3d2eeabc9tree | snapshot
parentabdb5a5713330e17dfe91ab0d3e29c4744d95162commit | diff
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: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/irqinit.c diff | blob | history
Beck SC1x5 Kernel