Commit-ID: 01522df346f846906eaf6ca57148641476209909 Gitweb: http://git.kernel.org/tip/01522df346f846906eaf6ca57148641476209909 Author: Michael K. Johnson <johnsonm@xxxxxxxxx> AuthorDate: Fri, 27 Mar 2009 13:14:41 -0400 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Sat, 28 Mar 2009 12:45:39 -0700 x86, setup: mark %esi as clobbered in E820 BIOS call Jordan Hargrave diagnosed a BIOS clobbering %esi in the E820 call. That particular BIOS has been fixed, but there is a possibility that this is responsible for other occasional reports of early boot failure, and it does not hurt to add %esi to the clobbers. -stable candidate patch. Cc: Justin Forbes <jmforbes@xxxxxxxxxxx> Signed-off-by: Michael K Johnson <johnsonm@xxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> Cc: stable@xxxxxxxxxx --- arch/x86/boot/memory.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c index 8c3c25f..a99dbbe 100644 --- a/arch/x86/boot/memory.c +++ b/arch/x86/boot/memory.c @@ -27,13 +27,14 @@ static int detect_memory_e820(void) do { size = sizeof(struct e820entry); - /* Important: %edx is clobbered by some BIOSes, - so it must be either used for the error output + /* Important: %edx and %esi are clobbered by some BIOSes, + so they must be either used for the error output or explicitly marked clobbered. */ asm("int $0x15; setc %0" : "=d" (err), "+b" (next), "=a" (id), "+c" (size), "=m" (*desc) - : "D" (desc), "d" (SMAP), "a" (0xe820)); + : "D" (desc), "d" (SMAP), "a" (0xe820) + : "esi"); /* BIOSes which terminate the chain with CF = 1 as opposed to %ebx = 0 don't always report the SMAP signature on -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html