diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 13:30:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 13:30:23 -0700 |
| commit | fabb5c4e4a474ff0f7d6c1d3466a1b79bbce5f49 (patch) | |
| tree | c77845e116145fe4e5f172c39f4da2f87b8476ce /arch/i386/mach-voyager/voyager_cat.c | |
| parent | aa12b2842aba8cc367a2e1ddb5c6ae4fd8ddb1da (diff) | |
| parent | d6444514b89098284099c17b9f168ef6236d3e8f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6:
[VOYAGER] add smp alternatives
[VOYAGER] Use modern techniques to setup and teardown low identiy mappings.
[VOYAGER] Convert the monitor thread to use the kthread API
[VOYAGER] clockevents driver: bring voyager in to line
[VOYAGER] clockevents: correct boot cpu is zero assumption
[VOYAGER] add smp_call_function_single
Diffstat (limited to 'arch/i386/mach-voyager/voyager_cat.c')
| -rw-r--r-- | arch/i386/mach-voyager/voyager_cat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c index 943a9473b13..26a2d4c54b6 100644 --- a/arch/i386/mach-voyager/voyager_cat.c +++ b/arch/i386/mach-voyager/voyager_cat.c @@ -1111,7 +1111,7 @@ voyager_cat_do_common_interrupt(void) printk(KERN_ERR "Voyager front panel switch turned off\n"); voyager_status.switch_off = 1; voyager_status.request_from_kernel = 1; - up(&kvoyagerd_sem); + wake_up_process(voyager_thread); } /* Tell the hardware we're taking care of the * shutdown, otherwise it will power the box off @@ -1157,7 +1157,7 @@ voyager_cat_do_common_interrupt(void) outb(VOYAGER_CAT_END, CAT_CMD); voyager_status.power_fail = 1; voyager_status.request_from_kernel = 1; - up(&kvoyagerd_sem); + wake_up_process(voyager_thread); } |