Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] Correct the SMAP check for INT 0x15, AX=0xe820

+6 -3
+6 -3
arch/i386/boot/memory.c
··· 28 29 do { 30 size = sizeof(struct e820entry); 31 - id = SMAP; 32 asm("int $0x15; setc %0" 33 - : "=am" (err), "+b" (next), "+d" (id), "+c" (size), 34 "=m" (*desc) 35 - : "D" (desc), "a" (0xe820)); 36 37 /* Some BIOSes stop returning SMAP in the middle of 38 the search loop. We don't know exactly how the BIOS
··· 28 29 do { 30 size = sizeof(struct e820entry); 31 + 32 + /* Important: %edx is clobbered by some BIOSes, 33 + so it must be either used for the error output 34 + or explicitly marked clobbered. */ 35 asm("int $0x15; setc %0" 36 + : "=d" (err), "+b" (next), "=a" (id), "+c" (size), 37 "=m" (*desc) 38 + : "D" (desc), "d" (SMAP), "a" (0xe820)); 39 40 /* Some BIOSes stop returning SMAP in the middle of 41 the search loop. We don't know exactly how the BIOS