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] Document grub < 0.93 as broken
[x86 setup] EDD: add missing =m constraint
[x86 setup] video setup: Fix VBE DDC reading

+3 -2
+1
Documentation/Changes
··· 45 45 o procps 3.2.0 # ps --version 46 46 o oprofile 0.9 # oprofiled --version 47 47 o udev 081 # udevinfo -V 48 + o grub 0.93 # grub --version 48 49 49 50 Kernel compilation 50 51 ==================
+1 -1
arch/i386/boot/edd.c
··· 127 127 ax = 0x4800; 128 128 dx = devno; 129 129 asm("pushfl; int $0x13; popfl" 130 - : "+a" (ax), "+d" (dx) 130 + : "+a" (ax), "+d" (dx), "=m" (ei->params) 131 131 : "S" (&ei->params) 132 132 : "ebx", "ecx", "edi"); 133 133
+1 -1
arch/i386/boot/video-vesa.c
··· 268 268 dx = 0; /* EDID block number */ 269 269 di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */ 270 270 asm(INT10 271 - : "+a" (ax), "+b" (bx), "+d" (dx) 271 + : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info) 272 272 : "c" (cx), "D" (di) 273 273 : "esi"); 274 274 #endif /* CONFIG_FIRMWARE_EDID */