Signed-off-by: Andrew Morton --- arch/i386/boot/setup.S | 4 ++-- arch/x86_64/boot/setup.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/i386/boot/setup.S~x86_64-mm-aux_device_info-is-one-byte-long,-use-movb arch/i386/boot/setup.S --- a/arch/i386/boot/setup.S~x86_64-mm-aux_device_info-is-one-byte-long,-use-movb +++ a/arch/i386/boot/setup.S @@ -497,12 +497,12 @@ no_voyager: movw %cs, %ax # aka SETUPSEG subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds - movw $0, (0x1ff) # default is no pointing device + movb $0, (0x1ff) # default is no pointing device int $0x11 # int 0x11: equipment list testb $0x04, %al # check if mouse installed jz no_psmouse - movw $0xAA, (0x1ff) # device present + movb $0xAA, (0x1ff) # device present no_psmouse: #if defined(CONFIG_X86_SPEEDSTEP_SMI) || defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) diff -puN arch/x86_64/boot/setup.S~x86_64-mm-aux_device_info-is-one-byte-long,-use-movb arch/x86_64/boot/setup.S --- a/arch/x86_64/boot/setup.S~x86_64-mm-aux_device_info-is-one-byte-long,-use-movb +++ a/arch/x86_64/boot/setup.S @@ -526,12 +526,12 @@ is_disk1: movw %cs, %ax # aka SETUPSEG subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds - movw $0, (0x1ff) # default is no pointing device + movb $0, (0x1ff) # default is no pointing device int $0x11 # int 0x11: equipment list testb $0x04, %al # check if mouse installed jz no_psmouse - movw $0xAA, (0x1ff) # device present + movb $0xAA, (0x1ff) # device present no_psmouse: #include "../../i386/boot/edd.S" _