fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / arch / ia64 / kernel / entry.h
index 6d4ecec..b83edac 100644 (file)
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 
 /*
  * Preserved registers that are shared between code in ivt.S and
@@ -23,6 +22,7 @@
 
 #define PT(f)          (IA64_PT_REGS_##f##_OFFSET)
 #define SW(f)          (IA64_SWITCH_STACK_##f##_OFFSET)
+#define SOS(f)         (IA64_SAL_OS_STATE_##f##_OFFSET)
 
 #define PT_REGS_SAVES(off)                     \
        .unwabi 3, 'i';                         \
@@ -60,7 +60,7 @@
        .spillsp @priunat,SW(AR_UNAT)+16+(off);                                 \
        .spillsp ar.rnat,SW(AR_RNAT)+16+(off);                                  \
        .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off);                          \
-       .spillsp pr,SW(PR)+16+(off))
+       .spillsp pr,SW(PR)+16+(off)
 
 #define DO_SAVE_SWITCH_STACK                   \
        movl r28=1f;                            \