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

Commit ca597a02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: geode: Mark mfgpt irq IRQF_TIMER to prevent resume failure
  x86, amd: Don't probe for extended APIC ID if APICs are disabled
  x86, mce: Rename incorrect macro name "CONFIG_X86_THRESHOLD"
  x86-64: Fix bad_srat() to clear all state
  x86, mce: Fix set_trigger() accessor
  x86: Fix movq immediate operand constraints in uaccess.h
  x86: Fix movq immediate operand constraints in uaccess_64.h
  x86: Add reboot fixup for SBC-fitPC2
  x86: Include all of .data.* sections in _edata on 64-bit
  x86: Add quirk for Intel DG45ID board to avoid low memory corruption
parents b54c3835 d6c585a4

arch/x86/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -212,9 +212,9 @@ extern int __get_user_bad(void); 
		     : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")

#else

#define __put_user_asm_u64(x, ptr, retval, errret) \

	__put_user_asm(x, ptr, retval, "q", "", "Zr", errret)

	__put_user_asm(x, ptr, retval, "q", "", "er", errret)

#define __put_user_asm_ex_u64(x, addr)	\

	__put_user_asm_ex(x, addr, "q", "", "Zr")

	__put_user_asm_ex(x, addr, "q", "", "er")

#define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu)

#endif

arch/x86/include/asm/uaccess_64.h

+5 −5
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size) 
			      ret, "l", "k", "ir", 4);

		return ret;

	case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,

			      ret, "q", "", "ir", 8);

			      ret, "q", "", "er", 8);

		return ret;

	case 10:

		__put_user_asm(*(u64 *)src, (u64 __user *)dst,

			       ret, "q", "", "ir", 10);

			       ret, "q", "", "er", 10);

		if (unlikely(ret))

			return ret;

		asm("":::"memory");
@@ -101,12 +101,12 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size) 
		return ret;

	case 16:

		__put_user_asm(*(u64 *)src, (u64 __user *)dst,

			       ret, "q", "", "ir", 16);

			       ret, "q", "", "er", 16);

		if (unlikely(ret))

			return ret;

		asm("":::"memory");

		__put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,

			       ret, "q", "", "ir", 8);

			       ret, "q", "", "er", 8);

		return ret;

	default:

		return copy_user_generic((__force void *)dst, src, size);
@@ -157,7 +157,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) 
			       ret, "q", "", "=r", 8);

		if (likely(!ret))

			__put_user_asm(tmp, (u64 __user *)dst,

				       ret, "q", "", "ir", 8);

				       ret, "q", "", "er", 8);

		return ret;

	}

	default:

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) 
#endif

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI)

	/* check CPU config space for extended APIC ID */

	if (c->x86 >= 0xf) {

	if (cpu_has_apic && c->x86 >= 0xf) {

		unsigned int val;

		val = read_pci_config(0, 24, 0, 0x68);

		if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18)))

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

+2 −4
Original line number Diff line number Diff line
@@ -1692,17 +1692,15 @@ static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr, 
				const char *buf, size_t siz)

{

	char *p;

	int len;



	strncpy(mce_helper, buf, sizeof(mce_helper));

	mce_helper[sizeof(mce_helper)-1] = 0;

	len = strlen(mce_helper);

	p = strchr(mce_helper, '\n');



	if (*p)

	if (p)

		*p = 0;



	return len;

	return strlen(mce_helper) + !!p;

}



static ssize_t set_ignore_ce(struct sys_device *s,

arch/x86/kernel/irqinit.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void __init apic_intr_init(void) 
#ifdef CONFIG_X86_THERMAL_VECTOR

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

#endif

#ifdef CONFIG_X86_THRESHOLD

#ifdef CONFIG_X86_MCE_THRESHOLD

	alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);

#endif

#if defined(CONFIG_X86_NEW_MCE) && defined(CONFIG_X86_LOCAL_APIC)