include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / arch / sparc / kernel / traps_64.c

diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index 10f7bb9fc1404e77a6eb542dec98285e98762162..837dfc2390d6ff2071afc8335f4f7a47d7829d22 100644 (file)
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -17,6 +17,7 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/kdebug.h>
+#include <linux/gfp.h>
 
 #include <asm/smp.h>
 #include <asm/delay.h>
@@ -2548,15 +2549,6 @@ void __init trap_init(void)
                                               rwbuf_stkptrs) ||
                     TI_GSR != offsetof(struct thread_info, gsr) ||
                     TI_XFSR != offsetof(struct thread_info, xfsr) ||
-                    TI_USER_CNTD0 != offsetof(struct thread_info,
-                                              user_cntd0) ||
-                    TI_USER_CNTD1 != offsetof(struct thread_info,
-                                              user_cntd1) ||
-                    TI_KERN_CNTD0 != offsetof(struct thread_info,
-                                              kernel_cntd0) ||
-                    TI_KERN_CNTD1 != offsetof(struct thread_info,
-                                              kernel_cntd1) ||
-                    TI_PCR != offsetof(struct thread_info, pcr_reg) ||
                     TI_PRE_COUNT != offsetof(struct thread_info,
                                              preempt_count) ||
                     TI_NEW_CHILD != offsetof(struct thread_info, new_child) ||