diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 19:49:53 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 19:49:53 -0500 |
| commit | cdb7167db7649de3406c5b7e41210c9d11d573a0 (patch) | |
| tree | 9db7f1523ff4dfa8d294c52ffb03c3ff5b171d5e | |
| parent | 64bc70d68e97a9b264138f0b03660792387d9077 (diff) | |
| download | rt-patches-cdb7167db7649de3406c5b7e41210c9d11d573a0.tar.gz | |
refresh x86-ioapic-lock-section-fix.patchv2.6.33-4438-g9446808v2.6.33-4401-gfb7b096
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | x86-ioapic-lock-section-fix.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x86-ioapic-lock-section-fix.patch b/x86-ioapic-lock-section-fix.patch index ffb924d..67c39a1 100644 --- a/x86-ioapic-lock-section-fix.patch +++ b/x86-ioapic-lock-section-fix.patch @@ -1,4 +1,4 @@ -From 56320dd7735e7ffbe3fc2a1005beb771c849e67b Mon Sep 17 00:00:00 2001 +From 948e9c201377b4a627951a020aa9df25be6f44d1 Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 3 Jul 2009 08:44:44 -0500 Subject: [PATCH] x86: ioapic lock section fix @@ -10,10 +10,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c -index 1c0c655..fe923da 100644 +index 4df458b..7554876 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c -@@ -3208,7 +3208,6 @@ unsigned int create_irq_nr(unsigned int irq_want, int node) +@@ -3256,7 +3256,6 @@ unsigned int create_irq_nr(unsigned int irq_want, int node) if (irq_want < nr_irqs_gsi) irq_want = nr_irqs_gsi; @@ -21,7 +21,7 @@ index 1c0c655..fe923da 100644 for (new = irq_want; new < nr_irqs; new++) { desc_new = irq_to_desc_alloc_node(new, node); if (!desc_new) { -@@ -3220,14 +3219,15 @@ unsigned int create_irq_nr(unsigned int irq_want, int node) +@@ -3268,14 +3267,15 @@ unsigned int create_irq_nr(unsigned int irq_want, int node) if (cfg_new->vector != 0) continue; @@ -36,8 +36,8 @@ index 1c0c655..fe923da 100644 } - raw_spin_unlock_irqrestore(&vector_lock, flags); - if (irq > 0) { - dynamic_irq_init(irq); + if (irq > 0) + dynamic_irq_init_keep_chip_data(irq); -- 1.7.1.1 |