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 /include/asm-i386 | |
| 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 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/voyager.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-i386/voyager.h b/include/asm-i386/voyager.h index 5b27838905b..91a9932937a 100644 --- a/include/asm-i386/voyager.h +++ b/include/asm-i386/voyager.h @@ -487,15 +487,11 @@ extern struct voyager_qic_cpi *voyager_quad_cpi_addr[NR_CPUS]; extern struct voyager_SUS *voyager_SUS; /* variables exported always */ +extern struct task_struct *voyager_thread; extern int voyager_level; -extern int kvoyagerd_running; -extern struct semaphore kvoyagerd_sem; extern struct voyager_status voyager_status; - - /* functions exported by the voyager and voyager_smp modules */ - extern int voyager_cat_readb(__u8 module, __u8 asic, int reg); extern void voyager_cat_init(void); extern void voyager_detect(struct voyager_bios_info *); |