Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (a776878d) · Commits · e / devices / android_kernel_sony_msm8994

arch/x86/Kconfig

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -390,7 +390,7 @@ config X86_INTEL_CE
	This option compiles in support for the CE4100 SOC for settop		This option compiles in support for the CE4100 SOC for settop
	boxes and media devices.		boxes and media devices.

	config X86_INTEL_MID		config X86_WANT_INTEL_MID
	bool "Intel MID platform support"		bool "Intel MID platform support"
	depends on X86_32		depends on X86_32
	depends on X86_EXTENDED_PLATFORM		depends on X86_EXTENDED_PLATFORM
	@@ -399,7 +399,10 @@ config X86_INTEL_MID
	systems which do not have the PCI legacy interfaces (Moorestown,		systems which do not have the PCI legacy interfaces (Moorestown,
	Medfield). If you are building for a PC class system say N here.		Medfield). If you are building for a PC class system say N here.

	if X86_INTEL_MID		if X86_WANT_INTEL_MID

			config X86_INTEL_MID
			bool

	config X86_MRST		config X86_MRST
	bool "Moorestown MID platform"		bool "Moorestown MID platform"
	@@ -411,6 +414,7 @@ config X86_MRST
	select SPI		select SPI
	select INTEL_SCU_IPC		select INTEL_SCU_IPC
	select X86_PLATFORM_DEVICES		select X86_PLATFORM_DEVICES
			select X86_INTEL_MID
	---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:

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,13 @@
	*/		*/
	#define E820_RESERVED_KERN 128		#define E820_RESERVED_KERN 128

			/*
			* Address ranges that need to be mapped by the kernel direct
			* mapping. This is used to make sure regions such as
			* EFI_RUNTIME_SERVICES_DATA are directly mapped. See setup_arch().
			*/
			#define E820_RESERVED_EFI 129

	#ifndef __ASSEMBLY__		#ifndef __ASSEMBLY__
	#include <linux/types.h>		#include <linux/types.h>
	struct e820entry {		struct e820entry {
	@@ -115,6 +122,7 @@ static inline void early_memtest(unsigned long start, unsigned long end)
	}		}
	#endif		#endif

			extern unsigned long e820_end_pfn(unsigned long limit_pfn, unsigned type);
	extern unsigned long e820_end_of_ram_pfn(void);		extern unsigned long e820_end_of_ram_pfn(void);
	extern unsigned long e820_end_of_low_ram_pfn(void);		extern unsigned long e820_end_of_low_ram_pfn(void);
	extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);		extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -33,8 +33,6 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...);
	#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \		#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \
	efi_call_virt(f, a1, a2, a3, a4, a5, a6)		efi_call_virt(f, a1, a2, a3, a4, a5, a6)

	#define efi_ioremap(addr, size, type) ioremap_cache(addr, size)

	#else /* !CONFIG_X86_32 */		#else /* !CONFIG_X86_32 */

	extern u64 efi_call0(void *fp);		extern u64 efi_call0(void *fp);
	@@ -84,9 +82,6 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3,
	efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \		efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
	(u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))		(u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))

	extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
	u32 type);

	#endif /* CONFIG_X86_32 */		#endif /* CONFIG_X86_32 */

	extern int add_efi_memmap;		extern int add_efi_memmap;

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -135,6 +135,7 @@ static void __init e820_print_type(u32 type)
	printk(KERN_CONT "(usable)");		printk(KERN_CONT "(usable)");
	break;		break;
	case E820_RESERVED:		case E820_RESERVED:
			case E820_RESERVED_EFI:
	printk(KERN_CONT "(reserved)");		printk(KERN_CONT "(reserved)");
	break;		break;
	case E820_ACPI:		case E820_ACPI:
	@@ -783,7 +784,7 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align)
	/*		/*
	* Find the highest page frame number we have available		* Find the highest page frame number we have available
	*/		*/
	static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type)		unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type)
	{		{
	int i;		int i;
	unsigned long last_pfn = 0;		unsigned long last_pfn = 0;

+14 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1049,6 +1049,14 @@ int hpet_rtc_timer_init(void)
	}		}
	EXPORT_SYMBOL_GPL(hpet_rtc_timer_init);		EXPORT_SYMBOL_GPL(hpet_rtc_timer_init);

			static void hpet_disable_rtc_channel(void)
			{
			unsigned long cfg;
			cfg = hpet_readl(HPET_T1_CFG);
			cfg &= ~HPET_TN_ENABLE;
			hpet_writel(cfg, HPET_T1_CFG);
			}

	/*		/*
	* The functions below are called from rtc driver.		* The functions below are called from rtc driver.
	* Return 0 if HPET is not being used.		* Return 0 if HPET is not being used.
	@@ -1060,6 +1068,9 @@ int hpet_mask_rtc_irq_bit(unsigned long bit_mask)
	return 0;		return 0;

	hpet_rtc_flags &= ~bit_mask;		hpet_rtc_flags &= ~bit_mask;
			if (unlikely(!hpet_rtc_flags))
			hpet_disable_rtc_channel();

	return 1;		return 1;
	}		}
	EXPORT_SYMBOL_GPL(hpet_mask_rtc_irq_bit);		EXPORT_SYMBOL_GPL(hpet_mask_rtc_irq_bit);
	@@ -1125,15 +1136,11 @@ EXPORT_SYMBOL_GPL(hpet_rtc_dropped_irq);

	static void hpet_rtc_timer_reinit(void)		static void hpet_rtc_timer_reinit(void)
	{		{
	unsigned int cfg, delta;		unsigned int delta;
	int lost_ints = -1;		int lost_ints = -1;

	if (unlikely(!hpet_rtc_flags)) {		if (unlikely(!hpet_rtc_flags))
	cfg = hpet_readl(HPET_T1_CFG);		hpet_disable_rtc_channel();
	cfg &= ~HPET_TN_ENABLE;
	hpet_writel(cfg, HPET_T1_CFG);
	return;
	}

	if (!(hpet_rtc_flags & RTC_PIE) \|\| hpet_pie_limit)		if (!(hpet_rtc_flags & RTC_PIE) \|\| hpet_pie_limit)
	delta = hpet_default_delta;		delta = hpet_default_delta;