Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6] / include / asm-x86 / segment.h

diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h
index 57c8d37238366eac1304af89e4ca7c64d9af38fa..ed5131dd7d92af9980f34341aed73bbe2eaa340d 100644 (file)
--- a/include/asm-x86/segment.h
+++ b/include/asm-x86/segment.h
@@ -191,8 +191,15 @@
 #define SEGMENT_TI_MASK                0x4
 
 #define IDT_ENTRIES 256
+#define NUM_EXCEPTION_VECTORS 32
 #define GDT_SIZE (GDT_ENTRIES * 8)
 #define GDT_ENTRY_TLS_ENTRIES 3
 #define TLS_SIZE (GDT_ENTRY_TLS_ENTRIES * 8)
 
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+extern const char early_idt_handlers[NUM_EXCEPTION_VECTORS][10];
+#endif
+#endif
+
 #endif