diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-25 12:33:11 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-16 12:03:01 -0500 |
commit | 40d6753e78a602bdf62e7741c0caa36474882f00 (patch) | |
tree | 843f02a4acbaccd88a3b912a3c44f45e110661e4 /arch | |
parent | 942fa3b63eb525aa0512ba28c42e656d8efc6787 (diff) |
x86: Convert set_atomicity_lock to raw_spinlock
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 163e59e272d5..9aa5dc76ff4a 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
@@ -570,7 +570,7 @@ static unsigned long set_mtrr_state(void) | |||
570 | 570 | ||
571 | 571 | ||
572 | static unsigned long cr4; | 572 | static unsigned long cr4; |
573 | static DEFINE_SPINLOCK(set_atomicity_lock); | 573 | static DEFINE_RAW_SPINLOCK(set_atomicity_lock); |
574 | 574 | ||
575 | /* | 575 | /* |
576 | * Since we are disabling the cache don't allow any interrupts, | 576 | * Since we are disabling the cache don't allow any interrupts, |
@@ -590,7 +590,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock) | |||
590 | * changes to the way the kernel boots | 590 | * changes to the way the kernel boots |
591 | */ | 591 | */ |
592 | 592 | ||
593 | spin_lock(&set_atomicity_lock); | 593 | raw_spin_lock(&set_atomicity_lock); |
594 | 594 | ||
595 | /* Enter the no-fill (CD=1, NW=0) cache mode and flush caches. */ | 595 | /* Enter the no-fill (CD=1, NW=0) cache mode and flush caches. */ |
596 | cr0 = read_cr0() | X86_CR0_CD; | 596 | cr0 = read_cr0() | X86_CR0_CD; |
@@ -627,7 +627,7 @@ static void post_set(void) __releases(set_atomicity_lock) | |||
627 | /* Restore value of CR4 */ | 627 | /* Restore value of CR4 */ |
628 | if (cpu_has_pge) | 628 | if (cpu_has_pge) |
629 | write_cr4(cr4); | 629 | write_cr4(cr4); |
630 | spin_unlock(&set_atomicity_lock); | 630 | raw_spin_unlock(&set_atomicity_lock); |
631 | } | 631 | } |
632 | 632 | ||
633 | static void generic_set_all(void) | 633 | static void generic_set_all(void) |