Commit d50e8fc7 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/apic-cleanups' into x86/numa

parents a387e95a 0aa002fe

Documentation/x86/boot.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -600,6 +600,7 @@ Protocol: 2.07+ 
  0x00000001	lguest

  0x00000001	lguest

  0x00000002	Xen

  0x00000002	Xen

  0x00000003	Moorestown MID

  0x00000003	Moorestown MID

  0x00000004	CE4100 TV Platform





Field name:	hardware_subarch_data

Field name:	hardware_subarch_data

Type:		write (subarch-dependent)

Type:		write (subarch-dependent)

arch/x86/Kconfig

+29 −0
Original line number Original line Diff line number Diff line
@@ -377,6 +377,18 @@ config X86_ELAN 




	  If unsure, choose "PC-compatible" instead.

	  If unsure, choose "PC-compatible" instead.





config X86_INTEL_CE

	bool "CE4100 TV platform"

	depends on PCI

	depends on PCI_GODIRECT

	depends on X86_32

	depends on X86_EXTENDED_PLATFORM

	select X86_REBOOTFIXUPS

	---help---

	  Select for the Intel CE media processor (CE4100) SOC.

	  This option compiles in support for the CE4100 SOC for settop

	  boxes and media devices.



config X86_MRST

config X86_MRST

       bool "Moorestown MID platform"

       bool "Moorestown MID platform"

	depends on PCI

	depends on PCI
@@ -385,6 +397,10 @@ config X86_MRST 
	depends on X86_EXTENDED_PLATFORM

	depends on X86_EXTENDED_PLATFORM

	depends on X86_IO_APIC

	depends on X86_IO_APIC

	select APB_TIMER

	select APB_TIMER

	select I2C

	select SPI

	select INTEL_SCU_IPC

	select X86_PLATFORM_DEVICES

	---help---

	---help---

	  Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin

	  Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin

	  Internet Device(MID) platform. Moorestown consists of two chips:

	  Internet Device(MID) platform. Moorestown consists of two chips:
@@ -466,6 +482,19 @@ config X86_ES7000 
	  Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is

	  Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is

	  supposed to run on an IA32-based Unisys ES7000 system.

	  supposed to run on an IA32-based Unisys ES7000 system.





config X86_32_IRIS

	tristate "Eurobraille/Iris poweroff module"

	depends on X86_32

	---help---

	  The Iris machines from EuroBraille do not have APM or ACPI support

	  to shut themselves down properly.  A special I/O sequence is

	  needed to do so, which is what this module does at

	  kernel shutdown.



	  This is only for Iris machines from EuroBraille.



	  If unused, say N.



config SCHED_OMIT_FRAME_POINTER

config SCHED_OMIT_FRAME_POINTER

	def_bool y

	def_bool y

	prompt "Single-depth WCHAN output"

	prompt "Single-depth WCHAN output"

arch/x86/include/asm/apic.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -234,16 +234,17 @@ extern void init_bsp_APIC(void); 
extern void setup_local_APIC(void);

extern void setup_local_APIC(void);

extern void end_local_APIC_setup(void);

extern void end_local_APIC_setup(void);

extern void init_apic_mappings(void);

extern void init_apic_mappings(void);

void register_lapic_address(unsigned long address);

extern void setup_boot_APIC_clock(void);

extern void setup_boot_APIC_clock(void);

extern void setup_secondary_APIC_clock(void);

extern void setup_secondary_APIC_clock(void);

extern int APIC_init_uniprocessor(void);

extern int APIC_init_uniprocessor(void);

extern void enable_NMI_through_LVT0(void);

extern void enable_NMI_through_LVT0(void);

extern int apic_force_enable(void);





/*

/*

 * On 32bit this is mach-xxx local

 * On 32bit this is mach-xxx local

 */

 */

#ifdef CONFIG_X86_64

#ifdef CONFIG_X86_64

extern void early_init_lapic_mapping(void);

extern int apic_is_clustered_box(void);

extern int apic_is_clustered_box(void);

#else

#else

static inline int apic_is_clustered_box(void)

static inline int apic_is_clustered_box(void)

arch/x86/include/asm/bootparam.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -124,6 +124,7 @@ enum { 
	X86_SUBARCH_LGUEST,

	X86_SUBARCH_LGUEST,

	X86_SUBARCH_XEN,

	X86_SUBARCH_XEN,

	X86_SUBARCH_MRST,

	X86_SUBARCH_MRST,

	X86_SUBARCH_CE4100,

	X86_NR_SUBARCHS,

	X86_NR_SUBARCHS,

};

};

arch/x86/include/asm/fixmap.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,10 @@ enum fixed_addresses { 
	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */

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

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

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

	__end_of_permanent_fixed_addresses,

	__end_of_permanent_fixed_addresses,



#ifdef	CONFIG_X86_MRST

	FIX_LNW_VRTC,

#endif

	/*

	/*

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

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

	 * before ioremap() is functional.

	 * before ioremap() is functional.