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

Commit 47935a73 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus',... 

Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for-linus', 'x86-paravirt-for-linus', 'core-locking-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume

* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-64, asm: Use fxsaveq/fxrestorq in more places

* 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hwmon: Add core threshold notification to therm_throt.c

* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, paravirt: Use native_halt on a halt, not native_safe_halt

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  locking, lockdep: Convert sprintf_symbol to %pS

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  irq: Better struct irqaction layout
parents 77a0dd54 3fb82d56 fd35fbcd 9e76a97e c8217b83 3cf9b85b f6cd2477

arch/x86/include/asm/alternative.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ extern void alternatives_smp_module_add(struct module *mod, char *name, 
extern void alternatives_smp_module_del(struct module *mod);

extern void alternatives_smp_switch(int smp);

extern int alternatives_text_reserved(void *start, void *end);

extern bool skip_smp_alternatives;

#else

static inline void alternatives_smp_module_add(struct module *mod, char *name,

					       void *locks, void *locks_end,

arch/x86/include/asm/i387.h

+24 −0
Original line number Diff line number Diff line
@@ -93,6 +93,17 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx) 
	int err;



	/* See comment in fxsave() below. */

#ifdef CONFIG_AS_FXSAVEQ

	asm volatile("1:  fxrstorq %[fx]\n\t"

		     "2:\n"

		     ".section .fixup,\"ax\"\n"

		     "3:  movl $-1,%[err]\n"

		     "    jmp  2b\n"

		     ".previous\n"

		     _ASM_EXTABLE(1b, 3b)

		     : [err] "=r" (err)

		     : [fx] "m" (*fx), "0" (0));

#else

	asm volatile("1:  rex64/fxrstor (%[fx])\n\t"

		     "2:\n"

		     ".section .fixup,\"ax\"\n"
@@ -102,6 +113,7 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx) 
		     _ASM_EXTABLE(1b, 3b)

		     : [err] "=r" (err)

		     : [fx] "R" (fx), "m" (*fx), "0" (0));

#endif

	return err;

}
@@ -119,6 +131,17 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx) 
		return -EFAULT;



	/* See comment in fxsave() below. */

#ifdef CONFIG_AS_FXSAVEQ

	asm volatile("1:  fxsaveq %[fx]\n\t"

		     "2:\n"

		     ".section .fixup,\"ax\"\n"

		     "3:  movl $-1,%[err]\n"

		     "    jmp  2b\n"

		     ".previous\n"

		     _ASM_EXTABLE(1b, 3b)

		     : [err] "=r" (err), [fx] "=m" (*fx)

		     : "0" (0));

#else

	asm volatile("1:  rex64/fxsave (%[fx])\n\t"

		     "2:\n"

		     ".section .fixup,\"ax\"\n"
@@ -128,6 +151,7 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx) 
		     _ASM_EXTABLE(1b, 3b)

		     : [err] "=r" (err), "=m" (*fx)

		     : [fx] "R" (fx), "0" (0));

#endif

	if (unlikely(err) &&

	    __clear_user(fx, sizeof(struct i387_fxsave_struct)))

		err = -EFAULT;

arch/x86/include/asm/mce.h

+3 −0
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ void intel_init_thermal(struct cpuinfo_x86 *c); 


void mce_log_therm_throt_event(__u64 status);



/* Interrupt Handler for core thermal thresholds */

extern int (*platform_thermal_notify)(__u64 msr_val);



#ifdef CONFIG_X86_THERMAL_VECTOR

extern void mcheck_intel_therm_init(void);

#else

arch/x86/include/asm/msr-index.h

+12 −0
Original line number Diff line number Diff line
@@ -257,6 +257,18 @@ 
#define PACKAGE_THERM_INT_LOW_ENABLE		(1 << 1)

#define PACKAGE_THERM_INT_PLN_ENABLE		(1 << 24)



/* Thermal Thresholds Support */

#define THERM_INT_THRESHOLD0_ENABLE    (1 << 15)

#define THERM_SHIFT_THRESHOLD0        8

#define THERM_MASK_THRESHOLD0          (0x7f << THERM_SHIFT_THRESHOLD0)

#define THERM_INT_THRESHOLD1_ENABLE    (1 << 23)

#define THERM_SHIFT_THRESHOLD1        16

#define THERM_MASK_THRESHOLD1          (0x7f << THERM_SHIFT_THRESHOLD1)

#define THERM_STATUS_THRESHOLD0        (1 << 6)

#define THERM_LOG_THRESHOLD0           (1 << 7)

#define THERM_STATUS_THRESHOLD1        (1 << 8)

#define THERM_LOG_THRESHOLD1           (1 << 9)



/* MISC_ENABLE bits: architectural */

#define MSR_IA32_MISC_ENABLE_FAST_STRING	(1ULL << 0)

#define MSR_IA32_MISC_ENABLE_TCC		(1ULL << 1)

arch/x86/include/asm/paravirt.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static inline void arch_safe_halt(void) 


static inline void halt(void)

{

	PVOP_VCALL0(pv_irq_ops.safe_halt);

	PVOP_VCALL0(pv_irq_ops.halt);

}



static inline void wbinvd(void)