diff options
author | Olaf Hering <olh@suse.de> | 2006-02-11 12:21:47 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-19 18:44:31 -0500 |
commit | 0728a2f99ef6efd1984f9e0ed59834c1cc602e6f (patch) | |
tree | 5ea69ff5f0b51a36347bcd84f0b7bf13491cbe2a /arch/ppc/xmon | |
parent | 092b8f3488a3e50a4ab5f2f3f7c8bbf56b3144e1 (diff) |
[PATCH] powerpc: remove duplicate exports
A few symbols are exported twice, remove them from ppc_ksyms.c
Remove users of sys_ctrler in arch/ppc/
WARNING: vmlinux: duplicate symbol '__delay' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol '__up' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol '__down' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol '__down_interruptible' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'sys_ctrler' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strncat' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strncmp' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strchr' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strrchr' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strnlen' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strpbrk' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'memscan' previous definition was in vmlinux
WARNING: vmlinux: duplicate symbol 'strstr' previous definition was in vmlinux
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/xmon')
-rw-r--r-- | arch/ppc/xmon/start.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c index 4344cbe9b5c5..484f5bb1aa3e 100644 --- a/arch/ppc/xmon/start.c +++ b/arch/ppc/xmon/start.c | |||
@@ -146,19 +146,6 @@ xmon_map_scc(void) | |||
146 | static int scc_initialized = 0; | 146 | static int scc_initialized = 0; |
147 | 147 | ||
148 | void xmon_init_scc(void); | 148 | void xmon_init_scc(void); |
149 | extern void cuda_poll(void); | ||
150 | |||
151 | static inline void do_poll_adb(void) | ||
152 | { | ||
153 | #ifdef CONFIG_ADB_PMU | ||
154 | if (sys_ctrler == SYS_CTRLER_PMU) | ||
155 | pmu_poll_adb(); | ||
156 | #endif /* CONFIG_ADB_PMU */ | ||
157 | #ifdef CONFIG_ADB_CUDA | ||
158 | if (sys_ctrler == SYS_CTRLER_CUDA) | ||
159 | cuda_poll(); | ||
160 | #endif /* CONFIG_ADB_CUDA */ | ||
161 | } | ||
162 | 149 | ||
163 | int | 150 | int |
164 | xmon_write(void *handle, void *ptr, int nb) | 151 | xmon_write(void *handle, void *ptr, int nb) |
@@ -189,7 +176,7 @@ xmon_write(void *handle, void *ptr, int nb) | |||
189 | ct = 0; | 176 | ct = 0; |
190 | for (i = 0; i < nb; ++i) { | 177 | for (i = 0; i < nb; ++i) { |
191 | while ((*sccc & TXRDY) == 0) | 178 | while ((*sccc & TXRDY) == 0) |
192 | do_poll_adb(); | 179 | ; |
193 | c = p[i]; | 180 | c = p[i]; |
194 | if (c == '\n' && !ct) { | 181 | if (c == '\n' && !ct) { |
195 | c = '\r'; | 182 | c = '\r'; |