diff options
-rw-r--r-- | Documentation/Changes | 1 | ||||
-rw-r--r-- | arch/i386/boot/edd.c | 2 | ||||
-rw-r--r-- | arch/i386/boot/video-vesa.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/Changes b/Documentation/Changes index 73a8617f1861..cb2b141b1c3e 100644 --- a/Documentation/Changes +++ b/Documentation/Changes | |||
@@ -45,6 +45,7 @@ o nfs-utils 1.0.5 # showmount --version | |||
45 | o procps 3.2.0 # ps --version | 45 | o procps 3.2.0 # ps --version |
46 | o oprofile 0.9 # oprofiled --version | 46 | o oprofile 0.9 # oprofiled --version |
47 | o udev 081 # udevinfo -V | 47 | o udev 081 # udevinfo -V |
48 | o grub 0.93 # grub --version | ||
48 | 49 | ||
49 | Kernel compilation | 50 | Kernel compilation |
50 | ================== | 51 | ================== |
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c index 77d92daf7923..658834d9f92a 100644 --- a/arch/i386/boot/edd.c +++ b/arch/i386/boot/edd.c | |||
@@ -127,7 +127,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei) | |||
127 | ax = 0x4800; | 127 | ax = 0x4800; |
128 | dx = devno; | 128 | dx = devno; |
129 | asm("pushfl; int $0x13; popfl" | 129 | asm("pushfl; int $0x13; popfl" |
130 | : "+a" (ax), "+d" (dx) | 130 | : "+a" (ax), "+d" (dx), "=m" (ei->params) |
131 | : "S" (&ei->params) | 131 | : "S" (&ei->params) |
132 | : "ebx", "ecx", "edi"); | 132 | : "ebx", "ecx", "edi"); |
133 | 133 | ||
diff --git a/arch/i386/boot/video-vesa.c b/arch/i386/boot/video-vesa.c index e6aa9eb8d93a..f1bc71e948cf 100644 --- a/arch/i386/boot/video-vesa.c +++ b/arch/i386/boot/video-vesa.c | |||
@@ -268,7 +268,7 @@ void vesa_store_edid(void) | |||
268 | dx = 0; /* EDID block number */ | 268 | dx = 0; /* EDID block number */ |
269 | di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */ | 269 | di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */ |
270 | asm(INT10 | 270 | asm(INT10 |
271 | : "+a" (ax), "+b" (bx), "+d" (dx) | 271 | : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info) |
272 | : "c" (cx), "D" (di) | 272 | : "c" (cx), "D" (di) |
273 | : "esi"); | 273 | : "esi"); |
274 | #endif /* CONFIG_FIRMWARE_EDID */ | 274 | #endif /* CONFIG_FIRMWARE_EDID */ |