patch x86-fix-smp-alternatives-use-mutex-instead-of-spinlock-text_poke-is-sleepable.patch added to 2.6.26-stable tree
This is a note to let you know that we have just queued up the patch titled
Subject: x86: fix SMP alternatives: use mutex instead of spinlock, text_poke is sleepable
to the 2.6.26-stable tree. Its filename is
x86-fix-smp-alternatives-use-mutex-instead-of-spinlock-text_poke-is-sleepable.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
Quoted 1 line
From [email protected] Wed Oct 1 16:51:38 2008
From: Pekka Paalanen <[email protected]>
Date: Mon, 12 May 2008 21:21:01 +0200
Subject: x86: fix SMP alternatives: use mutex instead of spinlock, text_poke is sleepable
To: Raz <[email protected]>, [email protected]
Cc: the arch/x86 maintainers <[email protected]>, Mathieu Desnoyers <[email protected]>, Vegard Nossum <[email protected]>, [email protected], Pekka Paalanen <[email protected]>, Linux Kernel <[email protected]>, [email protected]
Message-ID: <[email protected]>
Content-Disposition: inline
From: Pekka Paalanen <[email protected]>
commit 2f1dafe50cc4e58a239fd81bd47f87f32042a1ee upstream
text_poke is sleepable.
The original fix by Mathieu Desnoyers <[email protected]>.
--- arch/x86/kernel/alternative.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
arch/x86/kernel/alternative.c +9 -9
@@ -1,6 +1,6 @@#include <linux/module.h> #include <linux/sched.h> -#include <linux/spinlock.h> +#include <linux/mutex.h> #include <linux/list.h> #include <linux/kprobes.h> #include <linux/mm.h>
@@ -279,7 +279,7 @@ struct smp_alt_module {struct list_head next; };static LIST_HEAD (smp_alt_modules); -static DEFINE_SPINLOCK (smp_alt); +static DEFINE_MUTEX (smp_alt);static int smp_mode =1 ;/* protected by smp_alt */ void alternatives_smp_module_add(struct module *mod, char *name,
@@ -312,12 +312,12 @@ void alternatives_smp_module_add(struct __func__, smp->locks, smp->locks_end, smp->text, smp->text_end, smp->name); -spin_lock (&smp_alt); +mutex_lock (&smp_alt);list_add_tail (&smp->next, &smp_alt_modules);if (boot_cpu_has (X86_FEATURE_UP ))alternatives_smp_unlock (smp->locks, smp->locks_end, smp->text, smp->text_end); -spin_unlock (&smp_alt); +mutex_unlock (&smp_alt); }void alternatives_smp_module_del (struct module *mod)
@@ -327,17 +327,17 @@ void alternatives_smp_module_del(structif (smp_alt_once || noreplace_smp)return ; -spin_lock (&smp_alt); +mutex_lock (&smp_alt);list_for_each_entry (item, &smp_alt_modules, next) {if (mod != item->mod)continue ;list_del (&item->next); -spin_unlock (&smp_alt); +mutex_unlock (&smp_alt);DPRINTK ("%s: %s\n" , __func__, item->name);kfree (item);return ; } -spin_unlock (&smp_alt); +mutex_unlock (&smp_alt); }void alternatives_smp_switch (int smp)
@@ -359,7 +359,7 @@ void alternatives_smp_switch(int smp)return ;BUG_ON (!smp && (num_online_cpus () >1 )); -spin_lock (&smp_alt); +mutex_lock (&smp_alt);/* * Avoid unnecessary switches because it forces JIT based VMs to
@@ -383,7 +383,7 @@ void alternatives_smp_switch(int smp) mod->text, mod->text_end); } smp_mode = smp; -spin_unlock (&smp_alt); +mutex_unlock (&smp_alt); }#endif
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.26/x86-fix-smp-alternatives-use-mutex-instead-of-spinlock-text_poke-is-sleepable.patch