diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 07:45:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 07:45:41 +0200 |
| commit | 37aab38972a2dd971f52a01533c0678a0646294b (patch) | |
| tree | e3dca938edbd3d02e4912738850ec3ab8b59dda5 /arch/x86/mm/kmemcheck | |
| parent | a3368904bd230f9101d77de0a683b5d7d4525351 (diff) | |
| parent | 9f5314fb4d556d3132c784d0df47352b2830ca53 (diff) | |
Manual merge of tip/x86/irq into kmemcheck
this manual merge fixes this merge interaction without making the
tree non-bisectable:
arch/x86/mm/kmemcheck/smp.c: In function 'kmemcheck_pause_allbutself':
arch/x86/mm/kmemcheck/smp.c:59: error: 'NMI_VECTOR' undeclared (first use in this function)
arch/x86/mm/kmemcheck/smp.c:59: error: (Each undeclared identifier is reported only once
arch/x86/mm/kmemcheck/smp.c:59: error: for each function it appears in.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/kmemcheck')
| -rw-r--r-- | arch/x86/mm/kmemcheck/smp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/kmemcheck/smp.c b/arch/x86/mm/kmemcheck/smp.c index c4ff615b16db..cd17ddfda082 100644 --- a/arch/x86/mm/kmemcheck/smp.c +++ b/arch/x86/mm/kmemcheck/smp.c @@ -5,6 +5,7 @@ #include <mach_ipi.h> #include "smp.h" +#include <asm/irq_vectors.h> static spinlock_t nmi_spinlock; |