Attachment 117380 Details for Bug 84794 – x86 mttr bogon

[patch] x86 mttr bogon

0001-x86-mtrr-bogon.patch (text/plain), 1.80 KB, created by Chris Wilson on 2015-07-26 10:37:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2015-07-26 10:37:23 UTC

Size: 1.80 KB

patch

obsolete

>From 206e0b5edfa6fbf93263b73979d400287c17b9a9 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 4 Nov 2014 11:06:38 +0000
>Subject: [PATCH] x86-mtrr-bogon
>
>---
> arch/x86/kernel/cpu/mtrr/main.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
>index ea5f363a1948..734ad9ea6e0d 100644
>--- a/arch/x86/kernel/cpu/mtrr/main.c
>+++ b/arch/x86/kernel/cpu/mtrr/main.c
>@@ -35,7 +35,6 @@
> 
> #include <linux/types.h> /* FIXME: kvm_para.h needs this */
> 
>-#include <linux/stop_machine.h>
> #include <linux/kvm_para.h>
> #include <linux/uaccess.h>
> #include <linux/module.h>
>@@ -151,7 +150,7 @@ struct set_mtrr_data {
>  *
>  * Returns nothing.
>  */
>-static int mtrr_rendezvous_handler(void *info)
>+static void mtrr_rendezvous_handler(void *info)
> {
> 	struct set_mtrr_data *data = info;
> 
>@@ -174,7 +173,6 @@ static int mtrr_rendezvous_handler(void *info)
> 	} else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) {
> 		mtrr_if->set_all();
> 	}
>-	return 0;
> }
> 
> static inline int types_compatible(mtrr_type type1, mtrr_type type2)
>@@ -228,7 +226,7 @@ set_mtrr(unsigned int reg, unsigned long base, unsigned long size, mtrr_type typ
> 				      .smp_type = type
> 				    };
> 
>-	stop_machine(mtrr_rendezvous_handler, &data, cpu_online_mask);
>+	on_each_cpu_mask(cpu_online_mask, mtrr_rendezvous_handler, &data, 1);
> }
> 
> static void set_mtrr_from_inactive_cpu(unsigned int reg, unsigned long base,
>@@ -240,8 +238,7 @@ static void set_mtrr_from_inactive_cpu(unsigned int reg, unsigned long base,
> 				      .smp_type = type
> 				    };
> 
>-	stop_machine_from_inactive_cpu(mtrr_rendezvous_handler, &data,
>-				       cpu_callout_mask);
>+	on_each_cpu_mask(cpu_callout_mask, mtrr_rendezvous_handler, &data, 1);
> }
> 
> /**
>-- 
>2.4.6
>

Actions: View | Splinter Review

Attachments on bug 84794: 117380

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.