Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee1b06ea authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot 



The initial version of this patch had %eax being a segment and %ecx
being the mode.  I had changed the interfaces, but not the actual
implementation!

Reported-by: default avatarBrian Gerst <brgerst@gmail.com>
LKML-Reference: <AANLkTikxqk=HEw9R-Du=v-1ti1HDGAY9vaNUep2XARaz@mail.gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Matthieu Castet <castet.matthieu@free.fr>
parent 3d35ac34

arch/x86/kernel/reboot_32.S

+7 −3
Original line number Diff line number Diff line
@@ -23,10 +23,14 @@ r_base = . 
1:	popl	%ebx

	subl	$1b, %ebx



	/* Compute the equivalent real-mode segment */

	movl	%ebx, %ecx

	shrl	$4, %ecx

	

	/* Patch post-real-mode segment jump */

	movw	dispatch_table(%ebx,%ecx,2),%cx

	movw	%cx, 101f(%ebx)

	movw	%ax, 102f(%ebx)

	movw	dispatch_table(%ebx,%eax,2),%ax

	movw	%ax, 101f(%ebx)

	movw	%cx, 102f(%ebx)



	/* Set up the IDT for real mode. */

	lidtl	machine_real_restart_idt(%ebx)