Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 628506c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 370504cf c3887cd7

Documentation/Changes

+1 −0
Original line number Diff line number Diff line
@@ -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

==================

arch/i386/boot/edd.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

arch/i386/boot/video-vesa.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */