Commit 0c6be871 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 

Pull additional x86 fixes from Peter Anvin.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, amd, xen: Avoid NULL pointer paravirt references
  x86, mtrr: Fix a type overflow in range_to_mtrr func
  x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c
  x86/mm/pat: Improve scaling of pat_pagerange_is_ram()
  x86: hpet: Fix copy-and-paste mistake in earlier change
  x86/mce: Fix 32-bit build
  x86/bitops: Move BIT_64() for a wider use
parents 6a445c7f 1ab46fd3

arch/x86/include/asm/acpi.h

+3 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/processor.h>

#include <asm/mmu.h>

#include <asm/mpspec.h>

#include <asm/realmode.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long
@@ -116,10 +117,8 @@ static inline void acpi_disable_pci(void) 
/* Low-level suspend routine. */

extern int acpi_suspend_lowlevel(void);



extern const unsigned char acpi_wakeup_code[];



/* early initialization routine */

extern void acpi_reserve_wakeup_memory(void);

/* Physical address to resume after wakeup */

#define acpi_wakeup_address ((unsigned long)(real_mode_header->wakeup_start))



/*

 * Check if the CPU can handle C2 and deeper

arch/x86/include/asm/bitops.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <linux/compiler.h>

#include <asm/alternative.h>



#define BIT_64(n)			(U64_C(1) << (n))



/*

 * These have to be done with inline assembly: that way the bit-setting

 * is guaranteed to be atomic. All bit operations return 0 if the bit

arch/x86/kernel/cpu/mcheck/mce.c

+3 −3
Original line number Diff line number Diff line
@@ -1472,8 +1472,8 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) 
				 rdmsrl(msrs[i], val);



				 /* CntP bit set? */

				 if (val & BIT(62)) {

					 val &= ~BIT(62);

				 if (val & BIT_64(62)) {

					val &= ~BIT_64(62);

					wrmsrl(msrs[i], val);

				 }

			 }

arch/x86/kernel/cpu/mtrr/cleanup.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ range_to_mtrr(unsigned int reg, unsigned long range_startk, 
		if (align > max_align)

			align = max_align;



		sizek = 1 << align;

		sizek = 1UL << align;

		if (debug_print) {

			char start_factor = 'K', size_factor = 'K';

			unsigned long start_base, size_base;

arch/x86/kernel/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ int __init hpet_enable(void) 
	else

		pr_warn("HPET initial state will not be saved\n");

	cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);

	hpet_writel(cfg, HPET_Tn_CFG(i));

	hpet_writel(cfg, HPET_CFG);

	if (cfg)

		pr_warn("HPET: Unrecognized bits %#x set in global cfg\n",

			cfg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE