diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:33:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:33:14 -0700 |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /arch/x86_64/kernel/smp.c | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
| download | lwn-da206c9e68cb93fcab43592d46276c02889c1250.tar.gz lwn-da206c9e68cb93fcab43592d46276c02889c1250.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'arch/x86_64/kernel/smp.c')
| -rw-r--r-- | arch/x86_64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c index 8188bae9c6d5..acee4bc3f6fa 100644 --- a/arch/x86_64/kernel/smp.c +++ b/arch/x86_64/kernel/smp.c @@ -474,7 +474,7 @@ void smp_send_stop(void) return; /* Don't deadlock on the call lock in panic */ if (!spin_trylock(&call_lock)) { - /* ignore locking because we have paniced anyways */ + /* ignore locking because we have panicked anyways */ nolock = 1; } __smp_call_function(smp_really_stop_cpu, NULL, 0, 0); |