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

Commit 15b04042 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Make memtype_seq_ops const
  x86: uv: Clean up uv_ptc_init(), use proc_create()
  x86: Use printk_once()
  x86/cpu: Clean up various files a bit
  x86: Remove duplicated #include
  x86, ipi: Clean up safe_smp_processor_id() by using the cpu_has_apic() macro helper
  x86: Clean up idt_descr and idt_tableby using NR_VECTORS instead of hardcoded number
  x86: Further clean up of mtrr/generic.c
  x86: Clean up mtrr/main.c
  x86: Clean up mtrr/state.c
  x86: Clean up mtrr/mtrr.h
  x86: Clean up mtrr/if.c
  x86: Clean up mtrr/generic.c
  x86: Clean up mtrr/cyrix.c
  x86: Clean up mtrr/cleanup.c
  x86: Clean up mtrr/centaur.c
  x86: Clean up mtrr/amd.c:
  x86: ds.c fix invalid assignment
parents 9b74aec0 d535e431

arch/x86/kernel/apic/ipi.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int safe_smp_processor_id(void) 
{

	int apicid, cpuid;



	if (!boot_cpu_has(X86_FEATURE_APIC))

	if (!cpu_has_apic)

		return 0;



	apicid = hard_smp_processor_id();

arch/x86/kernel/cpu/amd.c

+21 −16
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <linux/bitops.h>

#include <linux/mm.h>



#include <asm/io.h>

#include <linux/io.h>

#include <asm/processor.h>

#include <asm/apic.h>

#include <asm/cpu.h>
@@ -87,9 +87,10 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c) 
		d = d2-d;



		if (d > 20*K6_BUG_LOOP)

			printk("system stability may be impaired when more than 32 MB are used.\n");

			printk(KERN_CONT

				"system stability may be impaired when more than 32 MB are used.\n");

		else

			printk("probably OK (after B9730xxxx).\n");

			printk(KERN_CONT "probably OK (after B9730xxxx).\n");

		printk(KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n");

	}
@@ -219,8 +220,9 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) 
	if ((c->x86_model == 8 && c->x86_mask >= 1) || (c->x86_model > 8)) {

		rdmsr(MSR_K7_CLK_CTL, l, h);

		if ((l & 0xfff00000) != 0x20000000) {

			printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n", l,

				((l & 0x000fffff)|0x20000000));

			printk(KERN_INFO

			    "CPU: CLK_CTL MSR was %x. Reprogramming to %x\n",

					l, ((l & 0x000fffff)|0x20000000));

			wrmsr(MSR_K7_CLK_CTL, (l & 0x000fffff)|0x20000000, h);

		}

	}
@@ -507,14 +509,17 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
}



#ifdef CONFIG_X86_32

static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)

static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,

							unsigned int size)

{

	/* AMD errata T13 (order #21922) */

	if ((c->x86 == 6)) {

		if (c->x86_model == 3 && c->x86_mask == 0)	/* Duron Rev A0 */

		/* Duron Rev A0 */

		if (c->x86_model == 3 && c->x86_mask == 0)

			size = 64;

		/* Tbird rev A1/A2 */

		if (c->x86_model == 4 &&

		    (c->x86_mask == 0 || c->x86_mask == 1))	/* Tbird rev A1/A2 */

			(c->x86_mask == 0 || c->x86_mask == 1))

			size = 256;

	}

	return size;

arch/x86/kernel/cpu/bugs.c

+5 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void __init check_fpu(void) 


	boot_cpu_data.fdiv_bug = fdiv_bug;

	if (boot_cpu_data.fdiv_bug)

		printk("Hmm, FPU with FDIV bug.\n");

		printk(KERN_WARNING "Hmm, FPU with FDIV bug.\n");

}



static void __init check_hlt(void)
@@ -98,7 +98,7 @@ static void __init check_hlt(void) 
	halt();

	halt();

	halt();

	printk("OK.\n");

	printk(KERN_CONT "OK.\n");

}



/*
@@ -122,9 +122,9 @@ static void __init check_popad(void) 
	 * CPU hard. Too bad.

	 */

	if (res != 12345678)

		printk("Buggy.\n");

		printk(KERN_CONT "Buggy.\n");

	else

		printk("OK.\n");

		printk(KERN_CONT "OK.\n");

#endif

}
@@ -156,7 +156,7 @@ void __init check_bugs(void) 
{

	identify_boot_cpu();

#ifndef CONFIG_SMP

	printk("CPU: ");

	printk(KERN_INFO "CPU: ");

	print_cpu_info(&boot_cpu_data);

#endif

	check_config();

arch/x86/kernel/cpu/bugs_64.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ void __init check_bugs(void) 
{

	identify_boot_cpu();

#if !defined(CONFIG_SMP)

	printk("CPU: ");

	printk(KERN_INFO "CPU: ");

	print_cpu_info(&boot_cpu_data);

#endif

	alternative_instructions();

arch/x86/kernel/cpu/common.c

+5 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <asm/hypervisor.h>

#include <asm/processor.h>

#include <asm/sections.h>

#include <asm/topology.h>

#include <asm/cpumask.h>

#include <linux/topology.h>

#include <linux/cpumask.h>

#include <asm/pgtable.h>

#include <asm/atomic.h>

#include <asm/proto.h>
@@ -28,13 +28,13 @@ 
#include <asm/desc.h>

#include <asm/i387.h>

#include <asm/mtrr.h>

#include <asm/numa.h>

#include <linux/numa.h>

#include <asm/asm.h>

#include <asm/cpu.h>

#include <asm/mce.h>

#include <asm/msr.h>

#include <asm/pat.h>

#include <asm/smp.h>

#include <linux/smp.h>



#ifdef CONFIG_X86_LOCAL_APIC

#include <asm/uv/uv.h>
@@ -982,7 +982,7 @@ static __init int setup_disablecpuid(char *arg) 
__setup("clearcpuid=", setup_disablecpuid);



#ifdef CONFIG_X86_64

struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };

struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };



DEFINE_PER_CPU_FIRST(union irq_stack_union,

		     irq_stack_union) __aligned(PAGE_SIZE);