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

Commit faf80d62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix usage of bios intcall()
  x86: Remove unused function lapic_watchdog_ok()
  x86: Remove unused variable disable_x2apic
  x86, kvm: Fix section mismatches in kvm.c
  x86: Add missing annotation to arch/x86/lib/copy_user_64.S::copy_to_user
  x86: Fix fixmap page order for FIX_TEXT_POKE0,1
  amd-iommu: set evt_buf_size correctly
  amd-iommu: handle alias entries correctly in init code
  x86: Fix printk call in print_local_apic()
  x86: Declare check_efer() before it gets used
  x86: Mark device_nb as static and fix NULL noise
  x86: Remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1
  xen: Use kcalloc() in xen_init_IRQ()
  x86: Fix fixmap ordering
  x86: Fix symbol annotation for arch/x86/lib/clear_page_64.S::clear_page_c
parents eca4ee0d febe04de

arch/x86/boot/video-bios.c

+1 −2
Original line number Diff line number Diff line
@@ -37,14 +37,13 @@ static int set_bios_mode(u8 mode) 
	ireg.al = mode;		/* AH=0x00 Set Video Mode */

	intcall(0x10, &ireg, NULL);





	ireg.ah = 0x0f;		/* Get Current Video Mode */

	intcall(0x10, &ireg, &oreg);



	do_restore = 1;		/* Assume video contents were lost */



	/* Not all BIOSes are clean with the top bit */

	new_mode = ireg.al & 0x7f;

	new_mode = oreg.al & 0x7f;



	if (new_mode == mode)

		return 0;	/* Mode change OK */

arch/x86/boot/video-vesa.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int vesa_probe(void) 
	ireg.di = (size_t)&vginfo;

	intcall(0x10, &ireg, &oreg);



	if (ireg.ax != 0x004f ||

	if (oreg.ax != 0x004f ||

	    vginfo.signature != VESA_MAGIC ||

	    vginfo.version < 0x0102)

		return 0;	/* Not present */
@@ -70,7 +70,7 @@ static int vesa_probe(void) 
		ireg.di = (size_t)&vminfo;

		intcall(0x10, &ireg, &oreg);



		if (ireg.ax != 0x004f)

		if (oreg.ax != 0x004f)

			continue;



		if ((vminfo.mode_attr & 0x15) == 0x05) {

arch/x86/include/asm/fixmap.h

+5 −5
Original line number Diff line number Diff line
@@ -111,12 +111,9 @@ enum fixed_addresses { 
#ifdef CONFIG_PARAVIRT

	FIX_PARAVIRT_BOOTMAP,

#endif

	FIX_TEXT_POKE0,	/* reserve 2 pages for text_poke() */

	FIX_TEXT_POKE1,

	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */

	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */

	__end_of_permanent_fixed_addresses,

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

#endif

	/*

	 * 256 temporary boot-time mappings, used by early_ioremap(),

	 * before ioremap() is functional.
@@ -129,6 +126,9 @@ enum fixed_addresses { 
	FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -

			(__end_of_permanent_fixed_addresses & 255),

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

#endif

#ifdef CONFIG_X86_32

	FIX_WP_TEST,

#endif

arch/x86/include/asm/msr-index.h

+0 −4
Original line number Diff line number Diff line
@@ -246,10 +246,6 @@ 
#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE	(1ULL << 38)

#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE	(1ULL << 39)



/* Intel Model 6 */

#define MSR_P6_EVNTSEL0			0x00000186

#define MSR_P6_EVNTSEL1			0x00000187



/* P4/Xeon+ specific */

#define MSR_IA32_MCG_EAX		0x00000180

#define MSR_IA32_MCG_EBX		0x00000181

arch/x86/include/asm/nmi.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ void lapic_watchdog_stop(void); 
int lapic_watchdog_init(unsigned nmi_hz);

int lapic_wd_event(unsigned nmi_hz);

unsigned lapic_adjust_nmi_hz(unsigned hz);

int lapic_watchdog_ok(void);

void disable_lapic_nmi_watchdog(void);

void enable_lapic_nmi_watchdog(void);

void stop_nmi(void);