6 files changed, 49 insertions, 40 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig
index efae3b22a0ff..65792c2cc462 100644
--- a/arch/x86/kernel/cpu/cpufreq/Kconfig
+++ b/arch/x86/kernel/cpu/cpufreq/Kconfig
@@ -245,17 +245,6 @@ config X86_E_POWERSAVER
 comment "shared options"
-config X86_ACPI_CPUFREQ_PROC_INTF
-        bool "/proc/acpi/processor/../performance interface (deprecated)"
-        depends on PROC_FS
-        depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI
-        help
-          This enables the deprecated /proc/acpi/processor/../performance
-          interface. While it is helpful for debugging, the generic,
-          cross-architecture cpufreq interfaces should be used.
-          If in doubt, say N.
 config X86_SPEEDSTEP_LIB
        tristate
        default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD)
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 6f11e029e8c5..4b1c319d30c3 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -145,13 +145,14 @@ typedef union {
 struct drv_cmd {
        unsigned int type;
-        cpumask_var_t mask;
+        const struct cpumask *mask;
        drv_addr_union addr;
        u32 val;
 };
-static void do_drv_read(struct drv_cmd *cmd)
+static long do_drv_read(void *_cmd)
 {
+        struct drv_cmd *cmd = _cmd;
        u32 h;
        switch (cmd->type) {
@@ -166,10 +167,12 @@ static void do_drv_read(struct drv_cmd *cmd)
        default:
                break;
        }
+        return 0;
 }
-static void do_drv_write(struct drv_cmd *cmd)
+static long do_drv_write(void *_cmd)
 {
+        struct drv_cmd *cmd = _cmd;
        u32 lo, hi;
        switch (cmd->type) {
@@ -186,30 +189,23 @@ static void do_drv_write(struct drv_cmd *cmd)
        default:
                break;
        }
+        return 0;
 }
 static void drv_read(struct drv_cmd *cmd)
 {
-        cpumask_t saved_mask = current->cpus_allowed;
        cmd->val = 0;
-        set_cpus_allowed_ptr(current, cmd->mask);
+        work_on_cpu(cpumask_any(cmd->mask), do_drv_read, cmd);
-        do_drv_read(cmd);
-        set_cpus_allowed_ptr(current, &saved_mask);
 }
 static void drv_write(struct drv_cmd *cmd)
 {
-        cpumask_t saved_mask = current->cpus_allowed;
        unsigned int i;
        for_each_cpu(i, cmd->mask) {
-                set_cpus_allowed_ptr(current, cpumask_of(i));
+                work_on_cpu(i, do_drv_write, cmd);
-                do_drv_write(cmd);
        }
-        set_cpus_allowed_ptr(current, &saved_mask);
-        return;
 }
 static u32 get_cur_val(const struct cpumask *mask)
@@ -235,8 +231,7 @@ static u32 get_cur_val(const struct cpumask *mask)
                return 0;
        }
-        cpumask_copy(cmd.mask, mask);
+        cmd.mask = mask;
        drv_read(&cmd);
        dprintk("get_cur_val = %u\n", cmd.val);
@@ -368,7 +363,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
        return freq;
 }
-static unsigned int check_freqs(const cpumask_t *mask, unsigned int freq,
+static unsigned int check_freqs(const struct cpumask *mask, unsigned int freq,
                                struct acpi_cpufreq_data *data)
 {
        unsigned int cur_freq;
@@ -403,9 +398,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                return -ENODEV;
        }
-        if (unlikely(!alloc_cpumask_var(&cmd.mask, GFP_KERNEL)))
-                return -ENOMEM;
        perf = data->acpi_data;
        result = cpufreq_frequency_table_target(policy,
                                                data->freq_table,
@@ -450,9 +442,9 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        /* cpufreq holds the hotplug lock, so we are safe from here on */
        if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)
-                cpumask_and(cmd.mask, cpu_online_mask, policy->cpus);
+                cmd.mask = policy->cpus;
        else
-                cpumask_copy(cmd.mask, cpumask_of(policy->cpu));
+                cmd.mask = cpumask_of(policy->cpu);
        freqs.old = perf->states[perf->state].core_frequency * 1000;
        freqs.new = data->freq_table[next_state].frequency;
@@ -479,7 +471,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        perf->state = next_perf_state;
 out:
-        free_cpumask_var(cmd.mask);
        return result;
 }
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 8ea6929e974c..430e5c38a544 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -29,6 +29,19 @@
 static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
 {
+        /* Unmask CPUID levels if masked: */
+        if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
+                u64 misc_enable;
+                rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
+                if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) {
+                        misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
+                        wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
+                        c->cpuid_level = cpuid_eax(0);
+                }
+        }
        if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
                (c->x86 == 0x6 && c->x86_model >= 0x0e))
                set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 48533d77be78..da299eb85fc0 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -36,8 +36,11 @@ static struct _cache_table cache_table[] __cpuinitdata =
 {
        { 0x06, LVL_1_INST, 8 },        /* 4-way set assoc, 32 byte line size */
        { 0x08, LVL_1_INST, 16 },       /* 4-way set assoc, 32 byte line size */
+        { 0x09, LVL_1_INST, 32 },       /* 4-way set assoc, 64 byte line size */
        { 0x0a, LVL_1_DATA, 8 },        /* 2 way set assoc, 32 byte line size */
        { 0x0c, LVL_1_DATA, 16 },       /* 4-way set assoc, 32 byte line size */
+        { 0x0d, LVL_1_DATA, 16 },       /* 4-way set assoc, 64 byte line size */
+        { 0x21, LVL_2,      256 },      /* 8-way set assoc, 64 byte line size */
        { 0x22, LVL_3,      512 },      /* 4-way set assoc, sectored cache, 64 byte line size */
        { 0x23, LVL_3,      1024 },     /* 8-way set assoc, sectored cache, 64 byte line size */
        { 0x25, LVL_3,      2048 },     /* 8-way set assoc, sectored cache, 64 byte line size */
@@ -85,6 +88,18 @@ static struct _cache_table cache_table[] __cpuinitdata =
        { 0x85, LVL_2,    2048 },       /* 8-way set assoc, 32 byte line size */
        { 0x86, LVL_2,     512 },       /* 4-way set assoc, 64 byte line size */
        { 0x87, LVL_2,    1024 },       /* 8-way set assoc, 64 byte line size */
+        { 0xd0, LVL_3,     512 },       /* 4-way set assoc, 64 byte line size */
+        { 0xd1, LVL_3,    1024 },       /* 4-way set assoc, 64 byte line size */
+        { 0xd2, LVL_3,    2048 },       /* 4-way set assoc, 64 byte line size */
+        { 0xd6, LVL_3,    1024 },       /* 8-way set assoc, 64 byte line size */
+        { 0xd7, LVL_3,    2038 },       /* 8-way set assoc, 64 byte line size */
+        { 0xd8, LVL_3,    4096 },       /* 12-way set assoc, 64 byte line size */
+        { 0xdc, LVL_3,    2048 },       /* 12-way set assoc, 64 byte line size */
+        { 0xdd, LVL_3,    4096 },       /* 12-way set assoc, 64 byte line size */
+        { 0xde, LVL_3,    8192 },       /* 12-way set assoc, 64 byte line size */
+        { 0xe2, LVL_3,    2048 },       /* 16-way set assoc, 64 byte line size */
+        { 0xe3, LVL_3,    4096 },       /* 16-way set assoc, 64 byte line size */
+        { 0xe4, LVL_3,    8192 },       /* 16-way set assoc, 64 byte line size */
        { 0x00, 0, 0}
 };
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index b59ddcc88cd8..0c0a455fe95c 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -33,11 +33,13 @@ u64 mtrr_tom2;
 struct mtrr_state_type mtrr_state = {};
 EXPORT_SYMBOL_GPL(mtrr_state);
-#undef MODULE_PARAM_PREFIX
+static int __initdata mtrr_show;
-#define MODULE_PARAM_PREFIX "mtrr."
+static int __init mtrr_debug(char *opt)
+{
-static int mtrr_show;
+        mtrr_show = 1;
-module_param_named(show, mtrr_show, bool, 0);
+        return 0;
+}
+early_param("mtrr.show", mtrr_debug);
 /*
 * Returns the effective MTRR type for the region
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index d259e5d2e054..236a401b8259 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -1594,8 +1594,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)
        /* kvm/qemu doesn't have mtrr set right, don't trim them all */
        if (!highest_pfn) {
-                WARN(!kvm_para_available(), KERN_WARNING
+                printk(KERN_INFO "CPU MTRRs all blank - virtualized system.\n");
-                                "WARNING: strange, CPU MTRRs all blank?\n");
                return 0;
        }

diff --git a/arch/x86/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig index efae3b22a0ff..65792c2cc462 100644 --- a/arch/x86/kernel/cpu/cpufreq/Kconfig +++ b/arch/x86/kernel/cpu/cpufreq/Kconfig
@@ -245,17 +245,6 @@ config X86_E_POWERSAVER
245		245
246	comment "shared options"	246	comment "shared options"
247		247
248	config X86_ACPI_CPUFREQ_PROC_INTF
249	bool "/proc/acpi/processor/../performance interface (deprecated)"
250	depends on PROC_FS
251	depends on X86_ACPI_CPUFREQ \|\| X86_POWERNOW_K7_ACPI \|\| X86_POWERNOW_K8_ACPI
252	help
253	This enables the deprecated /proc/acpi/processor/../performance
254	interface. While it is helpful for debugging, the generic,
255	cross-architecture cpufreq interfaces should be used.
256
257	If in doubt, say N.
258
259	config X86_SPEEDSTEP_LIB	248	config X86_SPEEDSTEP_LIB
260	tristate	249	tristate
261	default (X86_SPEEDSTEP_ICH \|\| X86_SPEEDSTEP_SMI \|\| X86_P4_CLOCKMOD)	250	default (X86_SPEEDSTEP_ICH \|\| X86_SPEEDSTEP_SMI \|\| X86_P4_CLOCKMOD)


diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index 6f11e029e8c5..4b1c319d30c3 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -145,13 +145,14 @@ typedef union {
145		145
146	struct drv_cmd {	146	struct drv_cmd {
147	unsigned int type;	147	unsigned int type;
148	cpumask_var_t mask;	148	const struct cpumask *mask;
149	drv_addr_union addr;	149	drv_addr_union addr;
150	u32 val;	150	u32 val;
151	};	151	};
152		152
153	static void do_drv_read(struct drv_cmd *cmd)	153	static long do_drv_read(void *_cmd)
154	{	154	{
		155	struct drv_cmd *cmd = _cmd;
155	u32 h;	156	u32 h;
156		157
157	switch (cmd->type) {	158	switch (cmd->type) {
@@ -166,10 +167,12 @@ static void do_drv_read(struct drv_cmd *cmd)
166	default:	167	default:
167	break;	168	break;
168	}	169	}
		170	return 0;
169	}	171	}
170		172
171	static void do_drv_write(struct drv_cmd *cmd)	173	static long do_drv_write(void *_cmd)
172	{	174	{
		175	struct drv_cmd *cmd = _cmd;
173	u32 lo, hi;	176	u32 lo, hi;
174		177
175	switch (cmd->type) {	178	switch (cmd->type) {
@@ -186,30 +189,23 @@ static void do_drv_write(struct drv_cmd *cmd)
186	default:	189	default:
187	break;	190	break;
188	}	191	}
		192	return 0;
189	}	193	}
190		194
191	static void drv_read(struct drv_cmd *cmd)	195	static void drv_read(struct drv_cmd *cmd)
192	{	196	{
193	cpumask_t saved_mask = current->cpus_allowed;
194	cmd->val = 0;	197	cmd->val = 0;
195		198
196	set_cpus_allowed_ptr(current, cmd->mask);	199	work_on_cpu(cpumask_any(cmd->mask), do_drv_read, cmd);
197	do_drv_read(cmd);
198	set_cpus_allowed_ptr(current, &saved_mask);
199	}	200	}
200		201
201	static void drv_write(struct drv_cmd *cmd)	202	static void drv_write(struct drv_cmd *cmd)
202	{	203	{
203	cpumask_t saved_mask = current->cpus_allowed;
204	unsigned int i;	204	unsigned int i;
205		205
206	for_each_cpu(i, cmd->mask) {	206	for_each_cpu(i, cmd->mask) {
207	set_cpus_allowed_ptr(current, cpumask_of(i));	207	work_on_cpu(i, do_drv_write, cmd);
208	do_drv_write(cmd);
209	}	208	}
210
211	set_cpus_allowed_ptr(current, &saved_mask);
212	return;
213	}	209	}
214		210
215	static u32 get_cur_val(const struct cpumask *mask)	211	static u32 get_cur_val(const struct cpumask *mask)
@@ -235,8 +231,7 @@ static u32 get_cur_val(const struct cpumask *mask)
235	return 0;	231	return 0;
236	}	232	}
237		233
238	cpumask_copy(cmd.mask, mask);	234	cmd.mask = mask;
239
240	drv_read(&cmd);	235	drv_read(&cmd);
241		236
242	dprintk("get_cur_val = %u\n", cmd.val);	237	dprintk("get_cur_val = %u\n", cmd.val);
@@ -368,7 +363,7 @@ static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
368	return freq;	363	return freq;
369	}	364	}
370		365
371	static unsigned int check_freqs(const cpumask_t *mask, unsigned int freq,	366	static unsigned int check_freqs(const struct cpumask *mask, unsigned int freq,
372	struct acpi_cpufreq_data *data)	367	struct acpi_cpufreq_data *data)
373	{	368	{
374	unsigned int cur_freq;	369	unsigned int cur_freq;
@@ -403,9 +398,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
403	return -ENODEV;	398	return -ENODEV;
404	}	399	}
405		400
406	if (unlikely(!alloc_cpumask_var(&cmd.mask, GFP_KERNEL)))
407	return -ENOMEM;
408
409	perf = data->acpi_data;	401	perf = data->acpi_data;
410	result = cpufreq_frequency_table_target(policy,	402	result = cpufreq_frequency_table_target(policy,
411	data->freq_table,	403	data->freq_table,
@@ -450,9 +442,9 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
450		442
451	/* cpufreq holds the hotplug lock, so we are safe from here on */	443	/* cpufreq holds the hotplug lock, so we are safe from here on */
452	if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)	444	if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)
453	cpumask_and(cmd.mask, cpu_online_mask, policy->cpus);	445	cmd.mask = policy->cpus;
454	else	446	else
455	cpumask_copy(cmd.mask, cpumask_of(policy->cpu));	447	cmd.mask = cpumask_of(policy->cpu);
456		448
457	freqs.old = perf->states[perf->state].core_frequency * 1000;	449	freqs.old = perf->states[perf->state].core_frequency * 1000;
458	freqs.new = data->freq_table[next_state].frequency;	450	freqs.new = data->freq_table[next_state].frequency;
@@ -479,7 +471,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
479	perf->state = next_perf_state;	471	perf->state = next_perf_state;
480		472
481	out:	473	out:
482	free_cpumask_var(cmd.mask);
483	return result;	474	return result;
484	}	475	}
485		476


diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 8ea6929e974c..430e5c38a544 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c
@@ -29,6 +29,19 @@
29		29
30	static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)	30	static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
31	{	31	{
		32	/* Unmask CPUID levels if masked: */
		33	if (c->x86 > 6 \|\| (c->x86 == 6 && c->x86_model >= 0xd)) {
		34	u64 misc_enable;
		35
		36	rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
		37
		38	if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) {
		39	misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
		40	wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
		41	c->cpuid_level = cpuid_eax(0);
		42	}
		43	}
		44
32	if ((c->x86 == 0xf && c->x86_model >= 0x03) \|\|	45	if ((c->x86 == 0xf && c->x86_model >= 0x03) \|\|
33	(c->x86 == 0x6 && c->x86_model >= 0x0e))	46	(c->x86 == 0x6 && c->x86_model >= 0x0e))
34	set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);	47	set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);


diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 48533d77be78..da299eb85fc0 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -36,8 +36,11 @@ static struct _cache_table cache_table[] __cpuinitdata =
36	{	36	{
37	{ 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */	37	{ 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */
38	{ 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */	38	{ 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */
		39	{ 0x09, LVL_1_INST, 32 }, /* 4-way set assoc, 64 byte line size */
39	{ 0x0a, LVL_1_DATA, 8 }, /* 2 way set assoc, 32 byte line size */	40	{ 0x0a, LVL_1_DATA, 8 }, /* 2 way set assoc, 32 byte line size */
40	{ 0x0c, LVL_1_DATA, 16 }, /* 4-way set assoc, 32 byte line size */	41	{ 0x0c, LVL_1_DATA, 16 }, /* 4-way set assoc, 32 byte line size */
		42	{ 0x0d, LVL_1_DATA, 16 }, /* 4-way set assoc, 64 byte line size */
		43	{ 0x21, LVL_2, 256 }, /* 8-way set assoc, 64 byte line size */
41	{ 0x22, LVL_3, 512 }, /* 4-way set assoc, sectored cache, 64 byte line size */	44	{ 0x22, LVL_3, 512 }, /* 4-way set assoc, sectored cache, 64 byte line size */
42	{ 0x23, LVL_3, 1024 }, /* 8-way set assoc, sectored cache, 64 byte line size */	45	{ 0x23, LVL_3, 1024 }, /* 8-way set assoc, sectored cache, 64 byte line size */
43	{ 0x25, LVL_3, 2048 }, /* 8-way set assoc, sectored cache, 64 byte line size */	46	{ 0x25, LVL_3, 2048 }, /* 8-way set assoc, sectored cache, 64 byte line size */
@@ -85,6 +88,18 @@ static struct _cache_table cache_table[] __cpuinitdata =
85	{ 0x85, LVL_2, 2048 }, /* 8-way set assoc, 32 byte line size */	88	{ 0x85, LVL_2, 2048 }, /* 8-way set assoc, 32 byte line size */
86	{ 0x86, LVL_2, 512 }, /* 4-way set assoc, 64 byte line size */	89	{ 0x86, LVL_2, 512 }, /* 4-way set assoc, 64 byte line size */
87	{ 0x87, LVL_2, 1024 }, /* 8-way set assoc, 64 byte line size */	90	{ 0x87, LVL_2, 1024 }, /* 8-way set assoc, 64 byte line size */
		91	{ 0xd0, LVL_3, 512 }, /* 4-way set assoc, 64 byte line size */
		92	{ 0xd1, LVL_3, 1024 }, /* 4-way set assoc, 64 byte line size */
		93	{ 0xd2, LVL_3, 2048 }, /* 4-way set assoc, 64 byte line size */
		94	{ 0xd6, LVL_3, 1024 }, /* 8-way set assoc, 64 byte line size */
		95	{ 0xd7, LVL_3, 2038 }, /* 8-way set assoc, 64 byte line size */
		96	{ 0xd8, LVL_3, 4096 }, /* 12-way set assoc, 64 byte line size */
		97	{ 0xdc, LVL_3, 2048 }, /* 12-way set assoc, 64 byte line size */
		98	{ 0xdd, LVL_3, 4096 }, /* 12-way set assoc, 64 byte line size */
		99	{ 0xde, LVL_3, 8192 }, /* 12-way set assoc, 64 byte line size */
		100	{ 0xe2, LVL_3, 2048 }, /* 16-way set assoc, 64 byte line size */
		101	{ 0xe3, LVL_3, 4096 }, /* 16-way set assoc, 64 byte line size */
		102	{ 0xe4, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */
88	{ 0x00, 0, 0}	103	{ 0x00, 0, 0}
89	};	104	};
90		105


diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index b59ddcc88cd8..0c0a455fe95c 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -33,11 +33,13 @@ u64 mtrr_tom2;
33	struct mtrr_state_type mtrr_state = {};	33	struct mtrr_state_type mtrr_state = {};
34	EXPORT_SYMBOL_GPL(mtrr_state);	34	EXPORT_SYMBOL_GPL(mtrr_state);
35		35
36	#undef MODULE_PARAM_PREFIX	36	static int __initdata mtrr_show;
37	#define MODULE_PARAM_PREFIX "mtrr."	37	static int __init mtrr_debug(char *opt)
38		38	{
39	static int mtrr_show;	39	mtrr_show = 1;
40	module_param_named(show, mtrr_show, bool, 0);	40	return 0;
		41	}
		42	early_param("mtrr.show", mtrr_debug);
41		43
42	/*	44	/*
43	* Returns the effective MTRR type for the region	45	* Returns the effective MTRR type for the region


diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index d259e5d2e054..236a401b8259 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -1594,8 +1594,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)
1594		1594
1595	/* kvm/qemu doesn't have mtrr set right, don't trim them all */	1595	/* kvm/qemu doesn't have mtrr set right, don't trim them all */
1596	if (!highest_pfn) {	1596	if (!highest_pfn) {
1597	WARN(!kvm_para_available(), KERN_WARNING	1597	printk(KERN_INFO "CPU MTRRs all blank - virtualized system.\n");
1598	"WARNING: strange, CPU MTRRs all blank?\n");
1599	return 0;	1598	return 0;
1600	}	1599	}
1601		1600