ia64/xen-unstable

changeset 5657:cb6b221bef55

Recent header file cleanup (cset 2b6c1a8098078f7e53de7cf72227fddf01f0b2b6)
broke x86_64. The cleanup removed a padding field in trap_info_t, so the
trap table set the address for each trap handler to zero.

Signed-off-by: Chris Wright <chrisw@osdl.org>
author kaf24@firebug.cl.cam.ac.uk
date Mon Jul 04 08:18:42 2005 +0000 (2005-07-04)
parents f8acd354e129
children 50ac4630390b
files linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c	Sun Jul 03 22:36:48 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c	Mon Jul 04 08:18:42 2005 +0000
     1.3 @@ -910,31 +910,31 @@ void do_call_debug(struct pt_regs *regs)
     1.4  
     1.5  
     1.6  static trap_info_t trap_table[] = {
     1.7 -        {  0, 0, (__KERNEL_CS|0x3), 0, (unsigned long)divide_error               },
     1.8 -        {  1, 0, (__KERNEL_CS|0x3), 0, (unsigned long)debug                      },
     1.9 -        {  3, 3, (__KERNEL_CS|0x3), 0, (unsigned long)int3                       },
    1.10 -        {  4, 3, (__KERNEL_CS|0x3), 0, (unsigned long)overflow                   },
    1.11 -        {  5, 3, (__KERNEL_CS|0x3), 0, (unsigned long)bounds                     },
    1.12 -        {  6, 0, (__KERNEL_CS|0x3), 0, (unsigned long)invalid_op                 },
    1.13 -        {  7, 0, (__KERNEL_CS|0x3), 0, (unsigned long)device_not_available       },
    1.14 -        {  9, 0, (__KERNEL_CS|0x3), 0, (unsigned long)coprocessor_segment_overrun},
    1.15 -        { 10, 0, (__KERNEL_CS|0x3), 0, (unsigned long)invalid_TSS                },
    1.16 -        { 11, 0, (__KERNEL_CS|0x3), 0, (unsigned long)segment_not_present        },
    1.17 -        { 12, 0, (__KERNEL_CS|0x3), 0, (unsigned long)stack_segment              },
    1.18 -        { 13, 0, (__KERNEL_CS|0x3), 0, (unsigned long)general_protection         },
    1.19 -        { 14, 0, (__KERNEL_CS|0x3), 0, (unsigned long)page_fault                 },
    1.20 -        { 15, 0, (__KERNEL_CS|0x3), 0, (unsigned long)spurious_interrupt_bug     },
    1.21 -        { 16, 0, (__KERNEL_CS|0x3), 0, (unsigned long)coprocessor_error          },
    1.22 -        { 17, 0, (__KERNEL_CS|0x3), 0, (unsigned long)alignment_check            },
    1.23 +        {  0, 0, (__KERNEL_CS|0x3), (unsigned long)divide_error               },
    1.24 +        {  1, 0, (__KERNEL_CS|0x3), (unsigned long)debug                      },
    1.25 +        {  3, 3, (__KERNEL_CS|0x3), (unsigned long)int3                       },
    1.26 +        {  4, 3, (__KERNEL_CS|0x3), (unsigned long)overflow                   },
    1.27 +        {  5, 3, (__KERNEL_CS|0x3), (unsigned long)bounds                     },
    1.28 +        {  6, 0, (__KERNEL_CS|0x3), (unsigned long)invalid_op                 },
    1.29 +        {  7, 0, (__KERNEL_CS|0x3), (unsigned long)device_not_available       },
    1.30 +        {  9, 0, (__KERNEL_CS|0x3), (unsigned long)coprocessor_segment_overrun},
    1.31 +        { 10, 0, (__KERNEL_CS|0x3), (unsigned long)invalid_TSS                },
    1.32 +        { 11, 0, (__KERNEL_CS|0x3), (unsigned long)segment_not_present        },
    1.33 +        { 12, 0, (__KERNEL_CS|0x3), (unsigned long)stack_segment              },
    1.34 +        { 13, 0, (__KERNEL_CS|0x3), (unsigned long)general_protection         },
    1.35 +        { 14, 0, (__KERNEL_CS|0x3), (unsigned long)page_fault                 },
    1.36 +        { 15, 0, (__KERNEL_CS|0x3), (unsigned long)spurious_interrupt_bug     },
    1.37 +        { 16, 0, (__KERNEL_CS|0x3), (unsigned long)coprocessor_error          },
    1.38 +        { 17, 0, (__KERNEL_CS|0x3), (unsigned long)alignment_check            },
    1.39  #ifdef CONFIG_X86_MCE
    1.40 -        { 18, 0, (__KERNEL_CS|0x3), 0, (unsigned long)machine_check              },
    1.41 +        { 18, 0, (__KERNEL_CS|0x3), (unsigned long)machine_check              },
    1.42  #endif
    1.43 -        { 19, 0, (__KERNEL_CS|0x3), 0, (unsigned long)simd_coprocessor_error     },
    1.44 -        { SYSCALL_VECTOR,  3, (__KERNEL_CS|0x3), 0, (unsigned long)system_call   },
    1.45 +        { 19, 0, (__KERNEL_CS|0x3), (unsigned long)simd_coprocessor_error     },
    1.46 +        { SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), (unsigned long)system_call   },
    1.47  #ifdef CONFIG_IA32_EMULATION
    1.48 -	{ IA32_SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), 0, (unsigned long)ia32_syscall},
    1.49 +	{ IA32_SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), (unsigned long)ia32_syscall},
    1.50  #endif
    1.51 -        {  0, 0,           0, 0,  0                                              }
    1.52 +        {  0, 0,           0, 0                                              }
    1.53  };
    1.54  
    1.55  void __init trap_init(void)