diff -ur linux-2.6.13.4/arch/i386/boot/setup.S linux-2.6.13.4-sc520/arch/i386/boot/setup.S --- linux-2.6.13.4/arch/i386/boot/setup.S 2005-10-10 10:54:29.000000000 -0800 +++ linux-2.6.13.4-sc520/arch/i386/boot/setup.S 2005-10-12 10:07:15.000000000 -0800 @@ -391,13 +391,13 @@ movw %ax, (2) # Set the keyboard repeat rate to the max - movw $0x0305, %ax - xorw %bx, %bx - int $0x16 +# movw $0x0305, %ax +# xorw %bx, %bx +# int $0x16 # Check for video adapter and its parameters and allow the # user to browse video modes. - call video # NOTE: we need %ds pointing +# call video # NOTE: we need %ds pointing # to bootsector # Get hd0 data... @@ -424,6 +424,7 @@ rep movsb # Check that there IS a hd1 :-) + jmp no_disk1 movw $0x01500, %ax movb $0x81, %dl int $0x13 @@ -444,6 +445,7 @@ stosb is_disk1: # check for Micro Channel (MCA) bus + jmp no_mca movw %cs, %ax # aka SETUPSEG subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds @@ -492,6 +494,7 @@ no_voyager: #endif # Check for PS/2 pointing device + jmp no_psmouse movw %cs, %ax # aka SETUPSEG subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds @@ -516,6 +519,7 @@ #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) # Then check for an APM BIOS... + jmp done_apm_bios # %ds points to the bootsector movw $0, 0x40 # version = 0 means no APM BIOS movw $0x05300, %ax # APM BIOS installation check @@ -689,6 +693,7 @@ # A20 code ported from SYSLINUX 1.52-1.63 by H. Peter Anvin. # AMD Elan bug fix by Robert Schwebel. # + jmp a20_done #if defined(CONFIG_X86_ELAN) movb $0x02, %al # alternate A20 gate diff -ur linux-2.6.13.4/arch/i386/kernel/cpu/amd.c linux-2.6.13.4-sc520/arch/i386/kernel/cpu/amd.c --- linux-2.6.13.4/arch/i386/kernel/cpu/amd.c 2005-10-10 10:54:29.000000000 -0800 +++ linux-2.6.13.4-sc520/arch/i386/kernel/cpu/amd.c 2005-10-26 13:15:26.000000000 -0800 @@ -52,11 +52,14 @@ #define CBAR (0xfffc) /* Configuration Base Address (32-bit) */ #define CBAR_ENB (0x80000000) #define CBAR_KEY (0X000000CB) +/* if (c->x86_model==9 || c->x86_model == 10) { if (inl (CBAR) & CBAR_ENB) outl (0 | CBAR_KEY, CBAR); } +*/ break; + case 5: if( c->x86_model < 6 ) {