xen/x86: put trap initialization code/data into cpuinit space

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/kernel/traps-xen.c b/arch/i386/kernel/traps-xen.c
index 445ba883c9d5d182b183f656163e8b13e443f636..a7f4909d499cc38c22067d09a11e758097b7cfc1 100644 (file)
--- a/arch/i386/kernel/traps-xen.c
+++ b/arch/i386/kernel/traps-xen.c
@@ -1094,7 +1094,7 @@ void __init trap_init_f00f_bug(void)
  * NB. All these are "trap gates" (i.e. events_mask isn't set) except
  * for those that specify <dpl>|4 in the second field.
  */
-static trap_info_t trap_table[] = {
+static trap_info_t __cpuinitdata trap_table[] = {
        {  0, 0, __KERNEL_CS, (unsigned long)divide_error               },
        {  1, 0|4, __KERNEL_CS, (unsigned long)debug                    },
        {  3, 3|4, __KERNEL_CS, (unsigned long)int3                     },
@@ -1155,7 +1155,7 @@ void __init trap_init(void)
        cpu_init();
 }
 
-void smp_trap_init(trap_info_t *trap_ctxt)
+void __cpuinit smp_trap_init(trap_info_t *trap_ctxt)
 {
        const trap_info_t *t = trap_table;
 

diff --git a/arch/x86_64/kernel/traps-xen.c b/arch/x86_64/kernel/traps-xen.c
index ce2889c98385686a90934d3940763f753addc144..4e82e6d679b957cc17f94fc50dd760a653b863ab 100644 (file)
--- a/arch/x86_64/kernel/traps-xen.c
+++ b/arch/x86_64/kernel/traps-xen.c
@@ -1088,7 +1088,7 @@ asmlinkage void math_state_restore(void)
  * NB. All these are "interrupt gates" (i.e. events_mask is set) because we
  * specify <dpl>|4 in the second field.
  */
-static trap_info_t trap_table[] = {
+static trap_info_t __cpuinitdata trap_table[] = {
         {  0, 0|4, __KERNEL_CS, (unsigned long)divide_error               },
         {  1, 0|4, __KERNEL_CS, (unsigned long)debug                      },
         {  3, 3|4, __KERNEL_CS, (unsigned long)int3                       },
@@ -1129,7 +1129,7 @@ void __init trap_init(void)
        cpu_init();
 }
 
-void smp_trap_init(trap_info_t *trap_ctxt)
+void __cpuinit smp_trap_init(trap_info_t *trap_ctxt)
 {
        const trap_info_t *t = trap_table;