diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
| commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
| tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /arch/sh | |
| parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
| parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8d50d527c595..2d52b515c241 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -640,10 +640,10 @@ config GUSA_RB | |||
| 640 | depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A) | 640 | depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A) |
| 641 | help | 641 | help |
| 642 | Enabling this option will allow the kernel to implement some | 642 | Enabling this option will allow the kernel to implement some |
| 643 | atomic operations using a software implemention of load-locked/ | 643 | atomic operations using a software implementation of load-locked/ |
| 644 | store-conditional (LLSC). On machines which do not have hardware | 644 | store-conditional (LLSC). On machines which do not have hardware |
| 645 | LLSC, this should be more efficient than the other alternative of | 645 | LLSC, this should be more efficient than the other alternative of |
| 646 | disabling insterrupts around the atomic sequence. | 646 | disabling interrupts around the atomic sequence. |
| 647 | 647 | ||
| 648 | endmenu | 648 | endmenu |
| 649 | 649 | ||