diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-20 18:23:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-20 18:23:08 -0700 |
| commit | 851b3f3238be80551089cfcc88e97d0cfad1ac5a (patch) | |
| tree | 9338c1e08ea0e152856a5ede1cfda34b00eaaa85 /arch/sparc/include/asm/switch_to_64.h | |
| parent | c437d888c72a9dd5b7bf212ec3ecc824307e846c (diff) | |
| parent | f36391d2790d04993f48da6a45810033a2cdf847 (diff) | |
| download | linux-851b3f3238be80551089cfcc88e97d0cfad1ac5a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
1) Fix race in sparc64 TLB shootdowns, we have to synchronize with the
sibling cpus completing if we are passing them a reference via
pointer to a data structure.
2) Fix cleaning of bitmaps in sparc32, from Akinobu Mita.
3) Fix various sparc header mistakes, some of which resulted in
userland build breakage. From Sam Ravnborg.
4) Kill ghost declarations and defines missed when several bits of code
got deleted recently.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix race in TLB batch processing.
sparc: use asm-generic version of types.h
bbc_i2c: fix section mismatch warning
sparc: use generic headers
sparc:cleanup unused code in smp_32.h
sparc/iommu: fix typo s/265KB/256KB/
sparc/srmmu: clear trailing edge of bitmap properly
sparc:remove unused declaration smp_boot_cpus()
Diffstat (limited to 'arch/sparc/include/asm/switch_to_64.h')
| -rw-r--r-- | arch/sparc/include/asm/switch_to_64.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/switch_to_64.h b/arch/sparc/include/asm/switch_to_64.h index cad36f56fa0..c7de3323819 100644 --- a/arch/sparc/include/asm/switch_to_64.h +++ b/arch/sparc/include/asm/switch_to_64.h @@ -18,8 +18,7 @@ do { \ * and 2 stores in this critical code path. -DaveM */ #define switch_to(prev, next, last) \ -do { flush_tlb_pending(); \ - save_and_clear_fpu(); \ +do { save_and_clear_fpu(); \ /* If you are tempted to conditionalize the following */ \ /* so that ASI is only written if it changes, think again. */ \ __asm__ __volatile__("wr %%g0, %0, %%asi" \ |