diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /arch/cris | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/include/arch-v10/arch/irq.h | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/irq.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/include/arch-v10/arch/irq.h b/arch/cris/include/arch-v10/arch/irq.h index 7d345947b3ee..ca2675ae08ed 100644 --- a/arch/cris/include/arch-v10/arch/irq.h +++ b/arch/cris/include/arch-v10/arch/irq.h | |||
| @@ -142,7 +142,7 @@ __asm__ ( \ | |||
| 142 | * it here, we would not get the multiple_irq at all. | 142 | * it here, we would not get the multiple_irq at all. |
| 143 | * | 143 | * |
| 144 | * The non-blocking here is based on the knowledge that the timer interrupt is | 144 | * The non-blocking here is based on the knowledge that the timer interrupt is |
| 145 | * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not | 145 | * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not |
| 146 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. | 146 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. |
| 147 | */ | 147 | */ |
| 148 | 148 | ||
diff --git a/arch/cris/include/arch-v32/arch/irq.h b/arch/cris/include/arch-v32/arch/irq.h index b31e9984f849..fe3cdd22bed4 100644 --- a/arch/cris/include/arch-v32/arch/irq.h +++ b/arch/cris/include/arch-v32/arch/irq.h | |||
| @@ -103,7 +103,7 @@ __asm__ ( \ | |||
| 103 | * if we had BLOCK'edit here, we would not get the multiple_irq at all. | 103 | * if we had BLOCK'edit here, we would not get the multiple_irq at all. |
| 104 | * | 104 | * |
| 105 | * The non-blocking here is based on the knowledge that the timer interrupt is | 105 | * The non-blocking here is based on the knowledge that the timer interrupt is |
| 106 | * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not | 106 | * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not |
| 107 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. | 107 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. |
| 108 | */ | 108 | */ |
| 109 | #define BUILD_TIMER_IRQ(nr, mask) \ | 109 | #define BUILD_TIMER_IRQ(nr, mask) \ |