Commit 3e1b83ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: rdc: leds build/config fix
  x86: sysfs cpu?/topology is empty in 2.6.25 (32-bit Intel system)
  x86: revert commit 709f744f ("x86: bitops asm constraint fixes")
  x86: restrict keyboard io ports reservation to make ipmi driver work
  x86: fix fpu restore from sig return
  x86: remove spew print out about bus to node mapping
  x86: revert printk format warning change which is for linux-next
  x86: cleanup PAT cpu validation
  x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set
  x86: GEODE: cache results from geode_has_vsa2() and uninline
  x86: revert geode config dependency
parents 8e3e076c 82fd8667

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ config X86_RDC321X 
	select GENERIC_GPIO

	select LEDS_CLASS

	select LEDS_GPIO

	select NEW_LEDS

	help

	  This option is needed for RDC R-321x system-on-chip, also known

	  as R-8610-(G).
@@ -1662,7 +1663,6 @@ config GEODE_MFGPT_TIMER 


config OLPC

	bool "One Laptop Per Child support"

	depends on MGEODE_LX

	default n

	help

	  Add support for detecting the unique features of the OLPC

arch/x86/kernel/cpu/addon_cpuid_features.c

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


#include <linux/cpu.h>



#include <asm/pat.h>

#include <asm/processor.h>



struct cpuid_bit {
@@ -48,3 +49,23 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, cb->feature);

	}

}



#ifdef CONFIG_X86_PAT

void __cpuinit validate_pat_support(struct cpuinfo_x86 *c)

{

	switch (c->x86_vendor) {

	case X86_VENDOR_AMD:

		if (c->x86 >= 0xf && c->x86 <= 0x11)

			return;

		break;

	case X86_VENDOR_INTEL:

		if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15))

			return;

		break;

	}



	pat_disable(cpu_has_pat ?

		    "PAT disabled. Not yet verified on this CPU type." :

		    "PAT not supported by CPU.");

}

#endif

arch/x86/kernel/cpu/common.c

+2 −25
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/mmu_context.h>

#include <asm/mtrr.h>

#include <asm/mce.h>

#include <asm/pat.h>

#ifdef CONFIG_X86_LOCAL_APIC

#include <asm/mpspec.h>

#include <asm/apic.h>
@@ -308,19 +309,6 @@ static void __cpuinit early_get_cap(struct cpuinfo_x86 *c) 


	}



	clear_cpu_cap(c, X86_FEATURE_PAT);



	switch (c->x86_vendor) {

	case X86_VENDOR_AMD:

		if (c->x86 >= 0xf && c->x86 <= 0x11)

			set_cpu_cap(c, X86_FEATURE_PAT);

		break;

	case X86_VENDOR_INTEL:

		if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15))

			set_cpu_cap(c, X86_FEATURE_PAT);

		break;

	}



}



/*
@@ -409,18 +397,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) 
		init_scattered_cpuid_features(c);

	}



	clear_cpu_cap(c, X86_FEATURE_PAT);



	switch (c->x86_vendor) {

	case X86_VENDOR_AMD:

		if (c->x86 >= 0xf && c->x86 <= 0x11)

			set_cpu_cap(c, X86_FEATURE_PAT);

		break;

	case X86_VENDOR_INTEL:

		if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15))

			set_cpu_cap(c, X86_FEATURE_PAT);

		break;

	}

}



static void __cpuinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
@@ -651,6 +627,7 @@ void __init early_cpu_init(void) 
		cpu_devs[cvdev->vendor] = cvdev->cpu_dev;



	early_cpu_detect();

	validate_pat_support(&boot_cpu_data);

}



/* Make sure %fs is initialized properly in idle threads */

arch/x86/kernel/geode_32.c

+19 −0
Original line number Diff line number Diff line
@@ -161,6 +161,25 @@ void geode_gpio_setup_event(unsigned int gpio, int pair, int pme) 
}

EXPORT_SYMBOL_GPL(geode_gpio_setup_event);



int geode_has_vsa2(void)

{

	static int has_vsa2 = -1;



	if (has_vsa2 == -1) {

		/*

		 * The VSA has virtual registers that we can query for a

		 * signature.

		 */

		outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);

		outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);



		has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG);

	}



	return has_vsa2;

}

EXPORT_SYMBOL_GPL(geode_has_vsa2);



static int __init geode_southbridge_init(void)

{

	if (!is_geode())

arch/x86/kernel/i387.c

+10 −2
Original line number Diff line number Diff line
@@ -450,7 +450,6 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf) 
{

	struct task_struct *tsk = current;



	clear_fpu(tsk);

	return __copy_from_user(&tsk->thread.xstate->fsave, buf,

				sizeof(struct i387_fsave_struct));

}
@@ -461,7 +460,6 @@ static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf) 
	struct user_i387_ia32_struct env;

	int err;



	clear_fpu(tsk);

	err = __copy_from_user(&tsk->thread.xstate->fxsave, &buf->_fxsr_env[0],

			       sizeof(struct i387_fxsave_struct));

	/* mxcsr reserved bits must be masked to zero for security reasons */
@@ -478,6 +476,16 @@ int restore_i387_ia32(struct _fpstate_ia32 __user *buf) 
	int err;



	if (HAVE_HWFP) {

		struct task_struct *tsk = current;



		clear_fpu(tsk);



		if (!used_math()) {

			err = init_fpu(tsk);

			if (err)

				return err;

		}



		if (cpu_has_fxsr)

			err = restore_i387_fxsave(buf);

		else

CRA Git | Maintained and supported by SUSTech CRA and CCSE