diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 13:49:36 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 13:49:36 -0500 |
| commit | 79c047f2ac8a50f5ee3b1e98aa7a699c585072bb (patch) | |
| tree | 2ecc6b76dcc5a203f7a78c7f54ae6b34ae38a833 | |
| parent | d085ea5a0a027564da77048432d41f4836567e54 (diff) | |
| download | rt-patches-79c047f2ac8a50f5ee3b1e98aa7a699c585072bb.tar.gz | |
rm x86-convert-set_atomicity_lock-to-raw_spinlock.patch; now upstreamv2.6.33-1805-g1eca9acv2.6.33-1800-g0091945
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | x86-convert-set_atomicity_lock-to-raw_spinlock.patch | 44 |
2 files changed, 0 insertions, 45 deletions
@@ -102,7 +102,6 @@ x86-kvm-Convert-i8254-i8259-locks-to-raw_spinlocks.patch trace-Convert-various-locks-to-raw_spinlock.patch printk-Convert-logbuf_lock-to-raw_spinlock.patch ACPI-Convert-c3_lock-to-raw_spinlock.patch -x86-convert-set_atomicity_lock-to-raw_spinlock.patch i8253-Convert-i8253_lock-to-raw_spinlock.patch x86-Convert-pci_config_lock-to-raw_spinlock.patch x86-convert-i8259_lock-to-raw_spinlock.patch diff --git a/x86-convert-set_atomicity_lock-to-raw_spinlock.patch b/x86-convert-set_atomicity_lock-to-raw_spinlock.patch deleted file mode 100644 index 10bdb99..0000000 --- a/x86-convert-set_atomicity_lock-to-raw_spinlock.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c06ba8bcfedf3a8d65eecc94691d387062b013c2 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner <tglx@linutronix.de> -Date: Sat, 25 Jul 2009 18:33:11 +0200 -Subject: [PATCH] x86: convert set_atomicity_lock to raw_spinlock - -commit 11f7e656720b244c062223529e9a8aafeb8d6076 in tip. - -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c -index 55da0c5..46f40f0 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) - - - static unsigned long cr4; --static DEFINE_SPINLOCK(set_atomicity_lock); -+static DEFINE_RAW_SPINLOCK(set_atomicity_lock); - - /* - * Since we are disabling the cache don't allow any interrupts, -@@ -590,7 +590,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock) - * changes to the way the kernel boots - */ - -- spin_lock(&set_atomicity_lock); -+ raw_spin_lock(&set_atomicity_lock); - - /* Enter the no-fill (CD=1, NW=0) cache mode and flush caches. */ - cr0 = read_cr0() | X86_CR0_CD; -@@ -627,7 +627,7 @@ static void post_set(void) __releases(set_atomicity_lock) - /* Restore value of CR4 */ - if (cpu_has_pge) - write_cr4(cr4); -- spin_unlock(&set_atomicity_lock); -+ raw_spin_unlock(&set_atomicity_lock); - } - - static void generic_set_all(void) --- -1.7.1.1 - |