Commit d8470596 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B 

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/apic_64.c
	arch/x86/kernel/setup.c
	drivers/pci/intel-iommu.c
	include/asm-x86/cpufeature.h
	include/asm-x86/dma-mapping.h
parents 725c2581 11494547

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,12 @@ and is between 256 and 4096 characters. It is defined in the file 


	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.



	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.



	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of

			default x2apic cluster mode on platforms

			supporting x2apic.



	noltlbs		[PPC] Do not use large page/tlb entries for kernel

			lowmem mapping on PPC40x.

arch/um/sys-x86_64/syscall_table.c

+2 −2
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ 
#define stub_rt_sigreturn sys_rt_sigreturn



#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;

#undef _ASM_X86_64_UNISTD_H_

#undef ASM_X86__UNISTD_64_H

#include <asm-x86/unistd_64.h>



#undef __SYSCALL

#define __SYSCALL(nr, sym) [ nr ] = sym,

#undef _ASM_X86_64_UNISTD_H_

#undef ASM_X86__UNISTD_64_H



typedef void (*sys_call_ptr_t)(void);

arch/x86/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -1689,6 +1689,14 @@ config DMAR_FLOPPY_WA 
	 workaround will setup a 1:1 mapping for the first

	 16M to make floppy (an ISA device) work.



config INTR_REMAP

	bool "Support for Interrupt Remapping (EXPERIMENTAL)"

	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL

	help

	 Supports Interrupt remapping for IO-APIC and MSI devices.

	 To use x2apic mode in the CPU's which support x2APIC enhancements or

	 to support platforms with CPU's having > 8 bit APIC ID, say Y.



source "drivers/pci/pcie/Kconfig"



source "drivers/pci/Kconfig"

arch/x86/mach-es7000/es7000.h→arch/x86/es7000/es7000.h

+9 −9

File changed and moved.

Contains only whitespace changes.