Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/x86_64/kernel/traps.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/x86_64/kernel/traps.c~lazy-tsss-i-o-bitmap-copy-for-x86-64-fix arch/x86_64/kernel/traps.c
--- 25/arch/x86_64/kernel/traps.c~lazy-tsss-i-o-bitmap-copy-for-x86-64-fix	2004-09-06 01:26:16.302438136 -0700
+++ 25-akpm/arch/x86_64/kernel/traps.c	2004-09-06 01:26:46.140902000 -0700
@@ -489,7 +489,7 @@ DO_ERROR_STACK( 8, SIGSEGV, "double faul
 asmlinkage void do_general_protection(struct pt_regs * regs, long error_code)
 {
 	int cpu = get_cpu();
-	struct tss_struct *tss = &per_cpu(init_tss, cpu);
+	struct tss_struct *tss = &init_tss[cpu];
 	struct thread_struct *tsk_th = &current->thread;
 
 	/*
_