ia64/linux-2.6.18-xen.hg

changeset 476:15d72fac31de

xen/x86: put trap initialization code/data into cpuinit space
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 18 11:17:05 2008 +0000 (2008-03-18)
parents f122c54b8740
children 7a8ac7a685ba
files arch/i386/kernel/traps-xen.c arch/x86_64/kernel/traps-xen.c
line diff
     1.1 --- a/arch/i386/kernel/traps-xen.c	Tue Mar 18 11:16:03 2008 +0000
     1.2 +++ b/arch/i386/kernel/traps-xen.c	Tue Mar 18 11:17:05 2008 +0000
     1.3 @@ -1094,7 +1094,7 @@ void __init trap_init_f00f_bug(void)
     1.4   * NB. All these are "trap gates" (i.e. events_mask isn't set) except
     1.5   * for those that specify <dpl>|4 in the second field.
     1.6   */
     1.7 -static trap_info_t trap_table[] = {
     1.8 +static trap_info_t __cpuinitdata trap_table[] = {
     1.9  	{  0, 0, __KERNEL_CS, (unsigned long)divide_error		},
    1.10  	{  1, 0|4, __KERNEL_CS, (unsigned long)debug			},
    1.11  	{  3, 3|4, __KERNEL_CS, (unsigned long)int3			},
    1.12 @@ -1155,7 +1155,7 @@ void __init trap_init(void)
    1.13  	cpu_init();
    1.14  }
    1.15  
    1.16 -void smp_trap_init(trap_info_t *trap_ctxt)
    1.17 +void __cpuinit smp_trap_init(trap_info_t *trap_ctxt)
    1.18  {
    1.19  	const trap_info_t *t = trap_table;
    1.20  
     2.1 --- a/arch/x86_64/kernel/traps-xen.c	Tue Mar 18 11:16:03 2008 +0000
     2.2 +++ b/arch/x86_64/kernel/traps-xen.c	Tue Mar 18 11:17:05 2008 +0000
     2.3 @@ -1088,7 +1088,7 @@ asmlinkage void math_state_restore(void)
     2.4   * NB. All these are "interrupt gates" (i.e. events_mask is set) because we
     2.5   * specify <dpl>|4 in the second field.
     2.6   */
     2.7 -static trap_info_t trap_table[] = {
     2.8 +static trap_info_t __cpuinitdata trap_table[] = {
     2.9          {  0, 0|4, __KERNEL_CS, (unsigned long)divide_error               },
    2.10          {  1, 0|4, __KERNEL_CS, (unsigned long)debug                      },
    2.11          {  3, 3|4, __KERNEL_CS, (unsigned long)int3                       },
    2.12 @@ -1129,7 +1129,7 @@ void __init trap_init(void)
    2.13  	cpu_init();
    2.14  }
    2.15  
    2.16 -void smp_trap_init(trap_info_t *trap_ctxt)
    2.17 +void __cpuinit smp_trap_init(trap_info_t *trap_ctxt)
    2.18  {
    2.19  	const trap_info_t *t = trap_table;
    2.20