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

Commit 78f28b7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
  x86: Move get/set_wallclock to x86_platform_ops
  x86: platform: Fix section annotations
  x86: apic namespace cleanup
  x86: Distangle ioapic and i8259
  x86: Add Moorestown early detection
  x86: Add hardware_subarch ID for Moorestown
  x86: Add early platform detection
  x86: Move tsc_init to late_time_init
  x86: Move tsc_calibration to x86_init_ops
  x86: Replace the now identical time_32/64.c by time.c
  x86: time_32/64.c unify profile_pc
  x86: Move calibrate_cpu to tsc.c
  x86: Make timer setup and global variables the same in time_32/64.c
  x86: Remove mca bus ifdef from timer interrupt
  x86: Simplify timer_ack magic in time_32.c
  x86: Prepare unification of time_32/64.c
  x86: Remove do_timer hook
  x86: Add timer_init to x86_init_ops
  x86: Move percpu clockevents setup to x86_init_ops
  x86: Move xen_post_allocator_init into xen_pagetable_setup_done
  ...

Fix up conflicts in arch/x86/include/asm/io_apic.h
parents 3240a77b 7bd867df

Documentation/x86/boot.txt

+1 −0
Original line number Diff line number Diff line
@@ -599,6 +599,7 @@ Protocol: 2.07+ 
  0x00000000	The default x86/PC environment

  0x00000001	lguest

  0x00000002	Xen

  0x00000003	Moorestown MID



Field name:	hardware_subarch_data

Type:		write (subarch-dependent)

arch/x86/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ config X86_EXTENDED_PLATFORM 
		SGI 320/540 (Visual Workstation)

		Summit/EXA (IBM x440)

		Unisys ES7000 IA32 series

		Moorestown MID devices



	  If you have one of these systems, or if you want to build a

	  generic distribution kernel, say Y here - otherwise say N.
@@ -384,6 +385,18 @@ config X86_ELAN 


	  If unsure, choose "PC-compatible" instead.



config X86_MRST

       bool "Moorestown MID platform"

	depends on X86_32

	depends on X86_EXTENDED_PLATFORM

	---help---

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

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

	  Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.

	  Unlike standard x86 PCs, Moorestown does not have many legacy devices

	  nor standard legacy replacement devices/features. e.g. Moorestown does

	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.



config X86_RDC321X

	bool "RDC R-321x SoC"

	depends on X86_32

arch/x86/include/asm/apic.h

+9 −10
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ static inline void default_inquire_remote_apic(int apicid) 
 */

#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else

#define setup_boot_clock setup_boot_APIC_clock

#define setup_secondary_clock setup_secondary_APIC_clock

#endif



#ifdef CONFIG_X86_64
@@ -252,6 +249,8 @@ static inline void lapic_shutdown(void) { } 
static inline void init_apic_mappings(void) { }

static inline void disable_local_APIC(void) { }

static inline void apic_disable(void) { }

# define setup_boot_APIC_clock x86_init_noop

# define setup_secondary_APIC_clock x86_init_noop

#endif /* !CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_X86_64
@@ -300,7 +299,7 @@ struct apic { 
	int (*cpu_present_to_apicid)(int mps_cpu);

	physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);

	void (*setup_portio_remap)(void);

	int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);

	int (*check_phys_apicid_present)(int phys_apicid);

	void (*enable_apic_mode)(void);

	int (*phys_pkg_id)(int cpuid_apic, int index_msb);
@@ -434,7 +433,7 @@ extern struct apic apic_x2apic_uv_x; 
DECLARE_PER_CPU(int, x2apic_extra_bits);



extern int default_cpu_present_to_apicid(int mps_cpu);

extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);

extern int default_check_phys_apicid_present(int phys_apicid);

#endif



static inline void default_wait_for_init_deassert(atomic_t *deassert)
@@ -550,9 +549,9 @@ static inline int __default_cpu_present_to_apicid(int mps_cpu) 
}



static inline int

__default_check_phys_apicid_present(int boot_cpu_physical_apicid)

__default_check_phys_apicid_present(int phys_apicid)

{

	return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);

	return physid_isset(phys_apicid, phys_cpu_present_map);

}



#ifdef CONFIG_X86_32
@@ -562,13 +561,13 @@ static inline int default_cpu_present_to_apicid(int mps_cpu) 
}



static inline int

default_check_phys_apicid_present(int boot_cpu_physical_apicid)

default_check_phys_apicid_present(int phys_apicid)

{

	return __default_check_phys_apicid_present(boot_cpu_physical_apicid);

	return __default_check_phys_apicid_present(phys_apicid);

}

#else

extern int default_cpu_present_to_apicid(int mps_cpu);

extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);

extern int default_check_phys_apicid_present(int phys_apicid);

#endif



static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)

arch/x86/include/asm/bootparam.h

+10 −0
Original line number Diff line number Diff line
@@ -110,4 +110,14 @@ struct boot_params { 
	__u8  _pad9[276];				/* 0xeec */

} __attribute__((packed));



enum {

	X86_SUBARCH_PC = 0,

	X86_SUBARCH_LGUEST,

	X86_SUBARCH_XEN,

	X86_SUBARCH_MRST,

	X86_NR_SUBARCHS,

};







#endif /* _ASM_X86_BOOTPARAM_H */

arch/x86/include/asm/do_timer.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* defines for inline arch setup functions */

#include <linux/clockchips.h>



#include <asm/i8259.h>

#include <asm/i8253.h>



/**

 * do_timer_interrupt_hook - hook into timer tick

 *

 * Call the pit clock event handler. see asm/i8253.h

 **/



static inline void do_timer_interrupt_hook(void)

{

	global_clock_event->event_handler(global_clock_event);

}