Commit 206f18f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and... 

Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 build, cleanup and defconfig updates from Ingo Molnar:
 "A single minor build change to suppress a repetitive build messages,
  misc cleanups and a defconfig update"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/purgatory, build: Suppress kexec-purgatory.c is up to date message

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, CPU, AMD: Move K8 TLB flush filter workaround to K8 code
  x86, espfix: Remove stale ptemask
  x86, msr: Use seek definitions instead of hard-coded values
  x86, msr: Convert printk to pr_foo()
  x86, msr: Use PTR_ERR_OR_ZERO
  x86/simplefb: Use PTR_ERR_OR_ZERO
  x86/sysfb: Use PTR_ERR_OR_ZERO
  x86, cpuid: Use PTR_ERR_OR_ZERO

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kconfig/defconfig: Enable CONFIG_FHANDLE=y
parents b6444bd0 3ea4b8ee 29cc3730 15bae280

arch/x86/configs/i386_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

arch/x86/configs/x86_64_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

arch/x86/kernel/cpu/amd.c

+11 −12
Original line number Diff line number Diff line
@@ -566,6 +566,17 @@ static void init_amd_k8(struct cpuinfo_x86 *c) 


	if (!c->x86_model_id[0])

		strcpy(c->x86_model_id, "Hammer");



#ifdef CONFIG_SMP

	/*

	 * Disable TLB flush filter by setting HWCR.FFDIS on K8

	 * bit 6 of msr C001_0015

	 *

	 * Errata 63 for SH-B3 steppings

	 * Errata 122 for all steppings (F+ have it disabled by default)

	 */

	msr_set_bit(MSR_K7_HWCR, 6);

#endif

}



static void init_amd_gh(struct cpuinfo_x86 *c)
@@ -636,18 +647,6 @@ static void init_amd(struct cpuinfo_x86 *c) 
{

	u32 dummy;



#ifdef CONFIG_SMP

	/*

	 * Disable TLB flush filter by setting HWCR.FFDIS on K8

	 * bit 6 of msr C001_0015

	 *

	 * Errata 63 for SH-B3 steppings

	 * Errata 122 for all steppings (F+ have it disabled by default)

	 */

	if (c->x86 == 0xf)

		msr_set_bit(MSR_K7_HWCR, 6);

#endif



	early_init_amd(c);



	/*

arch/x86/kernel/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int cpuid_device_create(int cpu) 


	dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL,

			    "cpu%d", cpu);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

	return PTR_ERR_OR_ZERO(dev);

}



static void cpuid_device_destroy(int cpu)

arch/x86/kernel/espfix_64.c

+0 −3
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ static void init_espfix_random(void) 
void __init init_espfix_bsp(void)

{

	pgd_t *pgd_p;

	pteval_t ptemask;



	ptemask = __supported_pte_mask;



	/* Install the espfix pud into the kernel page directory */

	pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];

CRA Git | Maintained and supported by SUSTech CRA and CCSE