[Xen-changelog] [linux-2.6.18-xen] xen/x86: put trap initialization code/data into cpuinit space

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1205839025 0
# Node ID 15d72fac31de6ff445e03539c451915feef6436b
# Parent  f122c54b87404fcb8ec030f26e11d412de578a9d
xen/x86: put trap initialization code/data into cpuinit space
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/i386/kernel/traps-xen.c   |    4 ++--
 arch/x86_64/kernel/traps-xen.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r f122c54b8740 -r 15d72fac31de arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c      Tue Mar 18 11:16:03 2008 +0000
+++ b/arch/i386/kernel/traps-xen.c      Tue Mar 18 11:17:05 2008 +0000
@@ -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 -r f122c54b8740 -r 15d72fac31de arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c    Tue Mar 18 11:16:03 2008 +0000
+++ b/arch/x86_64/kernel/traps-xen.c    Tue Mar 18 11:17:05 2008 +0000
@@ -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;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog