diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 01:36:46 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 01:36:46 +0200 |
commit | e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (patch) | |
tree | c676609730533fc1b7c5e01992e46b6eaf75f99b /kernel/stop_machine.c | |
parent | Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | DOC: A couple corrections and clarifications in USB doc. (diff) | |
download | linux-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.tar.xz linux-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
DOC: A couple corrections and clarifications in USB doc.
Generate a slightly more informative error msg for bad HZ
fix typo "is" -> "if" in Makefile
ext*: spelling fix prefered -> preferred
DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs.
KEYS: Fix the comment to match the file name in rxrpc-type.h.
RAID: remove trailing space from printk line
DMA engine: typo fixes
Remove unused MAX_NODES_SHIFT
MAINTAINERS: Clarify access to OCFS2 development mailing list.
V4L: Storage class should be before const qualifier (sn9c102)
V4L: Storage class should be before const qualifier
sonypi: Storage class should be before const qualifier
intel_menlow: Storage class should be before const qualifier
DVB: Storage class should be before const qualifier
arm: Storage class should be before const qualifier
ALSA: Storage class should be before const qualifier
acpi: Storage class should be before const qualifier
firmware_sample_driver.c: fix coding style
MAINTAINERS: Add ati_remote2 driver
...
Fixed up trivial conflicts in firmware_sample_driver.c
Diffstat (limited to 'kernel/stop_machine.c')
-rw-r--r-- | kernel/stop_machine.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index dc25b0baaa96..0101aeef7ed7 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -134,8 +134,7 @@ static void restart_machine(void) preempt_enable_no_resched(); } -struct stop_machine_data -{ +struct stop_machine_data { int (*fn)(void *); void *data; struct completion done; |