From 90e7de08945e54654ebf2156d78a1d85b5b50120 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 2 Aug 2007 14:08:53 -0700 Subject: [PATCH] --- yaml --- r: 63600 b: refs/heads/master c: 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/Changes | 1 + trunk/arch/i386/boot/edd.c | 2 +- trunk/arch/i386/boot/video-vesa.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3e94f01c3493..f04966ae6f9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 515495a1da9abf339b922b7919c4950e85b87b42 +refs/heads/master: 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes index 73a8617f1861..cb2b141b1c3e 100644 --- a/trunk/Documentation/Changes +++ b/trunk/Documentation/Changes @@ -45,6 +45,7 @@ o nfs-utils 1.0.5 # showmount --version o procps 3.2.0 # ps --version o oprofile 0.9 # oprofiled --version o udev 081 # udevinfo -V +o grub 0.93 # grub --version Kernel compilation ================== diff --git a/trunk/arch/i386/boot/edd.c b/trunk/arch/i386/boot/edd.c index 77d92daf7923..658834d9f92a 100644 --- a/trunk/arch/i386/boot/edd.c +++ b/trunk/arch/i386/boot/edd.c @@ -127,7 +127,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei) ax = 0x4800; dx = devno; asm("pushfl; int $0x13; popfl" - : "+a" (ax), "+d" (dx) + : "+a" (ax), "+d" (dx), "=m" (ei->params) : "S" (&ei->params) : "ebx", "ecx", "edi"); diff --git a/trunk/arch/i386/boot/video-vesa.c b/trunk/arch/i386/boot/video-vesa.c index e6aa9eb8d93a..f1bc71e948cf 100644 --- a/trunk/arch/i386/boot/video-vesa.c +++ b/trunk/arch/i386/boot/video-vesa.c @@ -268,7 +268,7 @@ void vesa_store_edid(void) dx = 0; /* EDID block number */ di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */ asm(INT10 - : "+a" (ax), "+b" (bx), "+d" (dx) + : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info) : "c" (cx), "D" (di) : "esi"); #endif /* CONFIG_FIRMWARE_EDID */