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

Commit 2cf30826 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 x86 fixes from Ingo Molnar:
 "Fixes all around the map: W+X kernel mapping fix, WCHAN fixes, two
  build failure fixes for corner case configs, x32 header fix and a
  speling fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds
  x86/mm: Set NX on gap between __ex_table and rodata
  x86/kexec: Fix kexec crash in syscall kexec_file_load()
  x86/process: Unify 32bit and 64bit implementations of get_wchan()
  x86/process: Add proper bound checks in 64bit get_wchan()
  x86, efi, kasan: Fix build failure on !KASAN && KMEMCHECK=y kernels
  x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case
  x86/cpufeatures: Correct spelling of the HWP_NOTIFY flag
parents 37cc7ab1 f4b4aae1

arch/x86/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ 
#define X86_FEATURE_HW_PSTATE	( 7*32+ 8) /* AMD HW-PState */

#define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */

#define X86_FEATURE_HWP		( 7*32+ 10) /* "hwp" Intel HWP */

#define X86_FEATURE_HWP_NOITFY	( 7*32+ 11) /* Intel HWP_NOTIFY */

#define X86_FEATURE_HWP_NOTIFY	( 7*32+ 11) /* Intel HWP_NOTIFY */

#define X86_FEATURE_HWP_ACT_WINDOW ( 7*32+ 12) /* Intel HWP_ACT_WINDOW */

#define X86_FEATURE_HWP_EPP	( 7*32+13) /* Intel HWP_EPP */

#define X86_FEATURE_HWP_PKG_REQ ( 7*32+14) /* Intel HWP_PKG_REQ */

arch/x86/include/uapi/asm/bitsperlong.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __ASM_X86_BITSPERLONG_H

#define __ASM_X86_BITSPERLONG_H



#ifdef __x86_64__

#if defined(__x86_64__) && !defined(__ILP32__)

# define __BITS_PER_LONG 64

#else

# define __BITS_PER_LONG 32

arch/x86/kernel/cpu/mshyperv.c

+7 −5
Original line number Diff line number Diff line
@@ -34,11 +34,10 @@ 
struct ms_hyperv_info ms_hyperv;

EXPORT_SYMBOL_GPL(ms_hyperv);



static void (*hv_kexec_handler)(void);

static void (*hv_crash_handler)(struct pt_regs *regs);



#if IS_ENABLED(CONFIG_HYPERV)

static void (*vmbus_handler)(void);

static void (*hv_kexec_handler)(void);

static void (*hv_crash_handler)(struct pt_regs *regs);



void hyperv_vector_handler(struct pt_regs *regs)

{
@@ -96,8 +95,8 @@ void hv_remove_crash_handler(void) 
	hv_crash_handler = NULL;

}

EXPORT_SYMBOL_GPL(hv_remove_crash_handler);

#endif



#ifdef CONFIG_KEXEC_CORE

static void hv_machine_shutdown(void)

{

	if (kexec_in_progress && hv_kexec_handler)
@@ -111,7 +110,8 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs) 
		hv_crash_handler(regs);

	native_machine_crash_shutdown(regs);

}



#endif /* CONFIG_KEXEC_CORE */

#endif /* CONFIG_HYPERV */



static uint32_t  __init ms_hyperv_platform(void)

{
@@ -186,8 +186,10 @@ static void __init ms_hyperv_init_platform(void) 
	no_timer_check = 1;

#endif



#if IS_ENABLED(CONFIG_HYPERV) && defined(CONFIG_KEXEC_CORE)

	machine_ops.shutdown = hv_machine_shutdown;

	machine_ops.crash_shutdown = hv_machine_crash_shutdown;

#endif

	mark_tsc_unstable("running on Hyper-V");

}

arch/x86/kernel/cpu/scattered.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ void init_scattered_cpuid_features(struct cpuinfo_x86 *c) 
		{ X86_FEATURE_PLN,		CR_EAX, 4, 0x00000006, 0 },

		{ X86_FEATURE_PTS,		CR_EAX, 6, 0x00000006, 0 },

		{ X86_FEATURE_HWP,		CR_EAX, 7, 0x00000006, 0 },

		{ X86_FEATURE_HWP_NOITFY,	CR_EAX, 8, 0x00000006, 0 },

		{ X86_FEATURE_HWP_NOTIFY,	CR_EAX, 8, 0x00000006, 0 },

		{ X86_FEATURE_HWP_ACT_WINDOW,	CR_EAX, 9, 0x00000006, 0 },

		{ X86_FEATURE_HWP_EPP,		CR_EAX,10, 0x00000006, 0 },

		{ X86_FEATURE_HWP_PKG_REQ,	CR_EAX,11, 0x00000006, 0 },

arch/x86/kernel/crash.c

+3 −4
Original line number Diff line number Diff line
@@ -185,10 +185,9 @@ void native_machine_crash_shutdown(struct pt_regs *regs) 
}



#ifdef CONFIG_KEXEC_FILE

static int get_nr_ram_ranges_callback(unsigned long start_pfn,

				unsigned long nr_pfn, void *arg)

static int get_nr_ram_ranges_callback(u64 start, u64 end, void *arg)

{

	int *nr_ranges = arg;

	unsigned int *nr_ranges = arg;



	(*nr_ranges)++;

	return 0;
@@ -214,7 +213,7 @@ static void fill_up_crash_elf_data(struct crash_elf_data *ced, 


	ced->image = image;



	walk_system_ram_range(0, -1, &nr_ranges,

	walk_system_ram_res(0, -1, &nr_ranges,

				get_nr_ram_ranges_callback);



	ced->max_nr_ranges = nr_ranges;