diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-03 00:01:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-04 13:51:35 -0700 |
| commit | a3cf5e6b6f2548b036921da5ab6325dc8a76e207 (patch) | |
| tree | 4243a783ed4dfc34df8e34e45754ddf0851e7c14 /arch/sparc64/mm | |
| parent | 8f616cd5249e03c9e1b371623d85e76d4b86bbc1 (diff) | |
| download | op-kernel-dev-a3cf5e6b6f2548b036921da5ab6325dc8a76e207.zip op-kernel-dev-a3cf5e6b6f2548b036921da5ab6325dc8a76e207.tar.gz | |
sparc64: Need to disable preemption around smp_tsb_sync().
Based upon a bug report by Mariusz Kozlowski
It uses smp_call_function_masked() now, which has a preemption-disabled
requirement.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/mm')
| -rw-r--r-- | arch/sparc64/mm/tsb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c index 3547937..587f8ef 100644 --- a/arch/sparc64/mm/tsb.c +++ b/arch/sparc64/mm/tsb.c @@ -1,9 +1,10 @@ /* arch/sparc64/mm/tsb.c * - * Copyright (C) 2006 David S. Miller <davem@davemloft.net> + * Copyright (C) 2006, 2008 David S. Miller <davem@davemloft.net> */ #include <linux/kernel.h> +#include <linux/preempt.h> #include <asm/system.h> #include <asm/page.h> #include <asm/tlbflush.h> @@ -415,7 +416,9 @@ retry_tsb_alloc: tsb_context_switch(mm); /* Now force other processors to do the same. */ + preempt_disable(); smp_tsb_sync(mm); + preempt_enable(); /* Now it is safe to free the old tsb. */ kmem_cache_free(tsb_caches[old_cache_index], old_tsb); |
