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

[muen/linux.git] / arch / x86 / kernel / cpu / mtrr / mtrr.c

diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c
index 0c4f4fba9ec17ef99ef604f3721d4bb736f941eb..9a19c800fe40095f1c706e4a50d5378339d429b8 100644 (file)
--- a/arch/x86/kernel/cpu/mtrr/mtrr.c
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
@@ -46,6 +46,7 @@
 #include <linux/pci.h>
 #include <linux/smp.h>
 #include <linux/syscore_ops.h>
 #include <linux/pci.h>
 #include <linux/smp.h>
 #include <linux/syscore_ops.h>

+#include <linux/rcupdate.h>

 
 #include <asm/cpufeature.h>
 #include <asm/e820/api.h>
 
 #include <asm/cpufeature.h>
 #include <asm/e820/api.h>


@@ -792,6 +793,9 @@ void mtrr_ap_init(void)
 
        if (!use_intel() || mtrr_aps_delayed_init)
                return;
 
        if (!use_intel() || mtrr_aps_delayed_init)
                return;

+
+       rcu_cpu_starting(smp_processor_id());
+

        /*
         * Ideally we should hold mtrr_mutex here to avoid mtrr entries
         * changed, but this routine will be called in cpu boot time,
        /*
         * Ideally we should hold mtrr_mutex here to avoid mtrr entries
         * changed, but this routine will be called in cpu boot time,