powerpc: kill non-existent symbols from ksyms and commproc.h

PATCH RESEND Applied Jochen Friedrich 2 participants 2 messages Nov 22, 2007 – Nov 25, 2007 PowerPC

Share & tools

Jochen Friedrich

author

2007-11-22 17:07 UTC #0 lore raw

PATCH RESEND 2/4 powerpc: kill non-existent symbols from ksyms and commproc.h

Remove exports of __res and cpm_install_handler/cpm_free_handler. Remove cpm_install_handler/cpm_free_handler from the commproc.h as well. Both were used for ARCH=ppc and aren't defined for ARCH=powerpc.

CC arch/powerpc/kernel/ppc_ksyms.o
arch/powerpc/kernel/ppc_ksyms.c:180: error: '__res' undeclared here (not in a function) arch/powerpc/kernel/ppc_ksyms.c:180: warning: type defaults to 'int' in declaration of '__res' make[1]: *** [arch/powerpc/kernel/ppc_ksyms.o] Error 1
make: *** [arch/powerpc/kernel] Error 2

LD .tmp_vmlinux1
arch/powerpc/kernel/built-in.o:(__ksymtab+0x198): undefined reference to cpm_free_handler' arch/powerpc/kernel/built-in.o:(__ksymtab+0x1a0): undefined reference to cpm_install_handler'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by Jochen Friedrich <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---
 arch/powerpc/kernel/ppc_ksyms.c |   12 ------------
 include/asm-powerpc/commproc.h  |    3 ---
 2 files changed, 0 insertions(+), 15 deletions(-)

arch/powerpc/kernel/ppc_ksyms.c +0 ~~-12~~

index c6b1aa3..13ebeb2 100644
@@ -45,10 +45,6 @@
 #include <asm/signal.h>
 #include <asm/dcr.h>
 
-#ifdef  CONFIG_8xx
-#include <asm/commproc.h>
-#endif
-
 #ifdef CONFIG_PPC64
 EXPORT_SYMBOL(local_irq_restore);
 #endif

@@ -172,14 +168,6 @@ EXPORT_SYMBOL(console_drivers);
 EXPORT_SYMBOL(cacheable_memcpy);
 #endif
 
-#ifdef  CONFIG_8xx
-EXPORT_SYMBOL(cpm_install_handler);
-EXPORT_SYMBOL(cpm_free_handler);
-#endif /* CONFIG_8xx */
-#if defined(CONFIG_8xx)
-EXPORT_SYMBOL(__res);
-#endif
-
 #ifdef CONFIG_PPC32
 EXPORT_SYMBOL(next_mmu_context);
 EXPORT_SYMBOL(set_context);

include/asm-powerpc/commproc.h +0 -3

index a2328b8..2ee59d7 100644
@@ -698,9 +698,6 @@ typedef struct risc_timer_pram {
 #define CICR_IEN		((uint)0x00000080)	/* Int. enable */
 #define CICR_SPS		((uint)0x00000001)	/* SCC Spread */
 
-extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
-extern void cpm_free_handler(int vec);
-
 #define IMAP_ADDR		(get_immrbase())
 
 #define CPM_PIN_INPUT     0

Signature · 1 line

1.5.3.4

Vitaly Bordug

Applied

2007-11-25 20:39 UTC #1 lore raw

Quoted 12 lines · On Thu, 22 Nov 2007 17:53:54 +0100 Jochen Friedrich wrote:

Remove exports of __res and cpm_install_handler/cpm_free_handler. Remove cpm_install_handler/cpm_free_handler from the commproc.h as well. Both were used for ARCH=ppc and aren't defined for ARCH=powerpc.
CC arch/powerpc/kernel/ppc_ksyms.o
arch/powerpc/kernel/ppc_ksyms.c:180: error: '__res' undeclared here (not in a function) arch/powerpc/kernel/ppc_ksyms.c:180: warning:
type defaults to 'int' in declaration of '__res' make[1]: *** [arch/powerpc/kernel/ppc_ksyms.o] Error 1 make: *** [arch/powerpc/kernel] Error 2

Quoted 8 lines

LD .tmp_vmlinux1
arch/powerpc/kernel/built-in.o:(__ksymtab+0x198): undefined reference to cpm_free_handler' arch/powerpc/kernel/built-in.o:(__ksymtab+0x1a0): undefined reference to cpm_install_handler' make: *** [.tmp_vmlinux1] Error 1
Signed-off-by Jochen Friedrich <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

Applied to linux-2.6-8xx.git, for-paulus branch.

Signature · 1 line

Sincerely, Vitaly