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

Commit 45e713ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  intr_remapping: Fix section mismatch in ir_dev_scope_init()
  intel-iommu: Fix section mismatch in dmar_parse_rmrr_atsr_dev()
  x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions
  x86, AMD: Correct align_va_addr documentation
  x86/rtc, mrst: Don't register a platform RTC device for for Intel MID platforms
  x86/mrst: Battery fixes
  x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
  x86: Fix "Acer Aspire 1" reboot hang
  x86/mtrr: Resolve inconsistency with Intel processor manual
  x86: Document rdmsr_safe restrictions
  x86, microcode: Fix the failure path of microcode update driver init code
  Add TAINT_FIRMWARE_WORKAROUND on MTRR fixup
  x86/mpparse: Account for bus types other than ISA and PCI
  x86, mrst: Change the pmic_gpio device type to IPC
  mrst: Added some platform data for the SFI translations
  x86,mrst: Power control commands update
  x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot
  x86, UV: Fix UV2 hub part number
  x86: Add user_mode_vm check in stack_overflow_check
parents 232ea344 61ed26e3

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -315,8 +315,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			CPU-intensive style benchmark, and it can vary highly in

			a microbenchmark depending on workload and compiler.



			1: only for 32-bit processes

			2: only for 64-bit processes

			32: only for 32-bit processes

			64: only for 64-bit processes

			on: enable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes

arch/x86/include/asm/intel_scu_ipc.h

+9 −5
Original line number Diff line number Diff line
@@ -3,8 +3,12 @@ 


#include <linux/notifier.h>



#define IPCMSG_VRTC	0xFA	 /* Set vRTC device */

#define IPCMSG_WARM_RESET	0xF0

#define IPCMSG_COLD_RESET	0xF1

#define IPCMSG_SOFT_RESET	0xF2

#define IPCMSG_COLD_BOOT	0xF3



#define IPCMSG_VRTC		0xFA	 /* Set vRTC device */

	/* Command id associated with message IPCMSG_VRTC */

	#define IPC_CMD_VRTC_SETTIME      1 /* Set time */

	#define IPC_CMD_VRTC_SETALARM     2 /* Set alarm */

arch/x86/include/asm/mrst.h

+9 −0
Original line number Diff line number Diff line
@@ -31,11 +31,20 @@ enum mrst_cpu_type { 
};



extern enum mrst_cpu_type __mrst_cpu_chip;



#ifdef CONFIG_X86_INTEL_MID



static inline enum mrst_cpu_type mrst_identify_cpu(void)

{

	return __mrst_cpu_chip;

}



#else /* !CONFIG_X86_INTEL_MID */



#define mrst_identify_cpu()    (0)



#endif /* !CONFIG_X86_INTEL_MID */



enum mrst_timer_options {

	MRST_TIMER_DEFAULT,

	MRST_TIMER_APBT_ONLY,

arch/x86/include/asm/msr.h

+8 −1
Original line number Diff line number Diff line
@@ -169,7 +169,14 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high) 
	return native_write_msr_safe(msr, low, high);

}



/* rdmsr with exception handling */

/*

 * rdmsr with exception handling.

 *

 * Please note that the exception handling works only after we've

 * switched to the "smart" #GP handler in trap_init() which knows about

 * exception tables - using this macro earlier than that causes machine

 * hangs on boxes which do not implement the @msr in the first argument.

 */

#define rdmsr_safe(msr, p1, p2)					\

({								\

	int __err;						\

arch/x86/include/asm/uv/uv_mmrs.h

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


#define UV1_HUB_PART_NUMBER	0x88a5

#define UV2_HUB_PART_NUMBER	0x8eb8

#define UV2_HUB_PART_NUMBER_X	0x1111



/* Compat: if this #define is present, UV headers support UV2 */

#define UV2_HUB_IS_SUPPORTED	1