diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-03 03:01:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-04 16:51:35 -0400 |
commit | a3cf5e6b6f2548b036921da5ab6325dc8a76e207 (patch) | |
tree | 4243a783ed4dfc34df8e34e45754ddf0851e7c14 /arch/sparc64/mm | |
parent | 8f616cd5249e03c9e1b371623d85e76d4b86bbc1 (diff) |
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 3547937b17a2..587f8efb2e05 100644 --- a/arch/sparc64/mm/tsb.c +++ b/arch/sparc64/mm/tsb.c | |||
@@ -1,9 +1,10 @@ | |||
1 | /* arch/sparc64/mm/tsb.c | 1 | /* arch/sparc64/mm/tsb.c |
2 | * | 2 | * |
3 | * Copyright (C) 2006 David S. Miller <davem@davemloft.net> | 3 | * Copyright (C) 2006, 2008 David S. Miller <davem@davemloft.net> |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
7 | #include <linux/preempt.h> | ||
7 | #include <asm/system.h> | 8 | #include <asm/system.h> |
8 | #include <asm/page.h> | 9 | #include <asm/page.h> |
9 | #include <asm/tlbflush.h> | 10 | #include <asm/tlbflush.h> |
@@ -415,7 +416,9 @@ retry_tsb_alloc: | |||
415 | tsb_context_switch(mm); | 416 | tsb_context_switch(mm); |
416 | 417 | ||
417 | /* Now force other processors to do the same. */ | 418 | /* Now force other processors to do the same. */ |
419 | preempt_disable(); | ||
418 | smp_tsb_sync(mm); | 420 | smp_tsb_sync(mm); |
421 | preempt_enable(); | ||
419 | 422 | ||
420 | /* Now it is safe to free the old tsb. */ | 423 | /* Now it is safe to free the old tsb. */ |
421 | kmem_cache_free(tsb_caches[old_cache_index], old_tsb); | 424 | kmem_cache_free(tsb_caches[old_cache_index], old_tsb); |