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

Commit 97405fe2 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:
  [PATCH] x86: do not recompile boot for each build
  [x86 setup] Save/restore DS around invocations of INT 10h
  [x86 setup] VGA: Clear the Protect bit before setting the vertical height
  [x86 setup] Fix assembly constraints
  [x86 setup] build/tools.c: fix comment
  [x86 setup] MAINTAINERS: document x86 setup code git tree
parents a10d9a71 3fbc5416

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1740,6 +1740,7 @@ S: Maintained 
i386 SETUP CODE / CPU ERRATA WORKAROUNDS

P:	H. Peter Anvin

M:	hpa@zytor.com

T:	git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git

S:	Maintained



IA64 (Itanium) PLATFORM

arch/i386/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ setup-y += printf.o string.o tty.o video.o version.o voyager.o 
setup-y		+= video-vga.o

setup-y		+= video-vesa.o

setup-y		+= video-bios.o



targets		+= $(setup-y)

hostprogs-y	:= tools/build



HOSTCFLAGS_build.o := $(LINUXINCLUDE)

arch/i386/boot/boot.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static inline u16 inw(u16 port) 


static inline void outl(u32 v, u16 port)

{

	asm volatile("outl %0,%1" : : "a" (v), "dn" (port));

	asm volatile("outl %0,%1" : : "a" (v), "dN" (port));

}

static inline u32 inl(u32 port)

{

arch/i386/boot/cpucheck.c

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ static int has_eflag(u32 mask) 
	    "pushfl ; "

	    "popl %1 ; "

	    "popfl"

	    : "=r" (f0), "=r" (f1)

	    : "g" (mask));

	    : "=&r" (f0), "=&r" (f1)

	    : "ri" (mask));



	return !!((f0^f1) & mask);

}

arch/i386/boot/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int query_mca(void) 
	    "setc %0 ; "

	    "movw %%es, %1 ; "

	    "popw %%es"

	    : "=acdSDm" (err), "=acdSDm" (es), "=b" (bx)

	    : "=acd" (err), "=acdSD" (es), "=b" (bx)

	    : "a" (0xc000));



	if (err)