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

Commit d7c764c4 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, UV: Fix kdump reboot
  x86, amd-nb: Rename CPU PCI id define for F4
  sound: Add delay.h to sound/soc/codecs/sn95031.c
  x86, mtrr, pat: Fix one cpu getting out of sync during resume
  x86, microcode: Unregister syscore_ops after microcode unloaded
  x86: Stop including <linux/delay.h> in two asm header files
parents 148086bb 818987e9

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _ASM_X86_APIC_H



#include <linux/cpumask.h>

#include <linux/delay.h>

#include <linux/pm.h>



#include <asm/alternative.h>

arch/x86/include/asm/dma.h

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/spinlock.h>	/* And spinlocks */

#include <asm/io.h>		/* need byte IO */

#include <linux/delay.h>



#ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER

#define dma_outb	outb_p

arch/x86/kernel/amd_nb.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { 
EXPORT_SYMBOL(amd_nb_misc_ids);



static struct pci_device_id amd_nb_link_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },

	{}

};

arch/x86/kernel/apic/hw_nmi.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/kprobes.h>

#include <linux/nmi.h>

#include <linux/module.h>

#include <linux/delay.h>



#ifdef CONFIG_HARDLOCKUP_DETECTOR

u64 hw_nmi_get_sample_period(void)

arch/x86/kernel/apic/x2apic_uv_x.c

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/io.h>

#include <linux/pci.h>

#include <linux/kdebug.h>

#include <linux/delay.h>

#include <linux/crash_dump.h>



#include <asm/uv/uv_mmrs.h>

#include <asm/uv/uv_hub.h>
@@ -34,6 +36,7 @@ 
#include <asm/ipi.h>

#include <asm/smp.h>

#include <asm/x86_init.h>

#include <asm/emergency-restart.h>



DEFINE_PER_CPU(int, x2apic_extra_bits);
@@ -810,4 +813,11 @@ void __init uv_system_init(void) 


	/* register Legacy VGA I/O redirection handler */

	pci_register_set_vga_state(uv_set_vga_state);



	/*

	 * For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as

	 * EFI is not enabled in the kdump kernel.

	 */

	if (is_kdump_kernel())

		reboot_type = BOOT_ACPI;

}