Don't put vide in .setup.init section

PATCH New Arun Sharma 1 participant 1 message Aug 24, 2005

Share & tools

Arun Sharma

author

2005-08-24 23:19 UTC #0 lore raw

PATCH 1/1 Don't put vide in .setup.init section

[ Today's xen hung without output on the serial console for us. The
seemingly harmless custom_param() in amd.c broke things on an Intel box :) ]

Don't put vide in .setup.init section

Also, it's safer to test for the case where param > __setup_end due to some mysterious misalignment.

Signed-off-by Jun Nakajima <[email protected]>

Signed-off-by Arun Sharma <[email protected]>

xen/arch/x86/cpu/amd.c +1 -1

diff -r fa0754a9f64f -r e2025593f702 xen/arch/x86/cpu/amd.c
@@ -39,7 +39,7 @@
  */
  
 extern void vide(void);
-__asm__(".align 4\nvide: ret");
+__asm__(".text\n.align 4\nvide: ret");
 
 static void __init init_amd(struct cpuinfo_x86 *c)
 {

xen/common/kernel.c +1 -1

diff -r fa0754a9f64f -r e2025593f702 xen/common/kernel.c
@@ -46,7 +46,7 @@
         if ( optval != NULL )
             *optval++ = '\0';
 
-        for ( param = &__setup_start; param != &__setup_end; param++ )
+        for ( param = &__setup_start; param <= &__setup_end; param++ )
         {
             if ( strcmp(param->name, opt ) != 0 )
                 continue;