[PATCH] fix compilation for ppc32

[PATCH] fix compilation for ppc32

[Christoph Hellwig]

PPC has an out of line and exported abs() that gives lots of nice and
wierd compilation erorrs.  Also kill the duplicate cpu_online() in
asm-ppc/smp.h.


--- 1.59/arch/ppc/kernel/ppc_ksyms.c	2004-06-18 08:41:08 +02:00
+++ edited/arch/ppc/kernel/ppc_ksyms.c	2004-06-25 14:52:53 +02:00
@@ -68,7 +68,6 @@
 long long __ashrdi3(long long, int);
 long long __ashldi3(long long, int);
 long long __lshrdi3(long long, int);
-int abs(int);
 
 extern unsigned long mm_ptov (unsigned long paddr);
 
@@ -275,8 +274,6 @@
 EXPORT_SYMBOL(memscan);
 EXPORT_SYMBOL(memcmp);
 EXPORT_SYMBOL(memchr);
-
-EXPORT_SYMBOL(abs);
 
 #if defined(CONFIG_FB_VGA16_MODULE)
 EXPORT_SYMBOL(screen_info);
--- 1.15/include/asm-ppc/smp.h	2004-01-19 07:32:52 +01:00
+++ edited/include/asm-ppc/smp.h	2004-06-25 14:51:47 +02:00
@@ -47,8 +47,6 @@
 
 #define smp_processor_id() (current_thread_info()->cpu)
 
-#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
-
 extern int __cpu_up(unsigned int cpu);
 
 extern int smp_hw_index[];
--- 1.24/include/asm-ppc/system.h	2004-06-18 08:41:08 +02:00
+++ edited/include/asm-ppc/system.h	2004-06-25 14:51:29 +02:00
@@ -82,7 +82,6 @@
 extern void cvt_fd(float *from, double *to, unsigned long *fpscr);
 extern void cvt_df(double *from, float *to, unsigned long *fpscr);
 extern int call_rtas(const char *, int, int, unsigned long *, ...);
-extern int abs(int);
 extern void cacheable_memzero(void *p, unsigned int nb);
 extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);
 extern void bad_page_fault(struct pt_regs *, unsigned long, int);

Re: [PATCH] fix compilation for ppc32

[Paul Mackerras]

Christoph Hellwig writes:

> PPC has an out of line and exported abs() that gives lots of nice and
> wierd compilation erorrs.  Also kill the duplicate cpu_online() in
> asm-ppc/smp.h.

Looks good, Andrew or Linus, please apply.  I never understood why we
kept that abs thing floating around.

--- 1.59/arch/ppc/kernel/ppc_ksyms.c	2004-06-18 08:41:08 +02:00
+++ edited/arch/ppc/kernel/ppc_ksyms.c	2004-06-25 14:52:53 +02:00
@@ -68,7 +68,6 @@
 long long __ashrdi3(long long, int);
 long long __ashldi3(long long, int);
 long long __lshrdi3(long long, int);
-int abs(int);
 
 extern unsigned long mm_ptov (unsigned long paddr);
 
@@ -275,8 +274,6 @@
 EXPORT_SYMBOL(memscan);
 EXPORT_SYMBOL(memcmp);
 EXPORT_SYMBOL(memchr);
-
-EXPORT_SYMBOL(abs);
 
 #if defined(CONFIG_FB_VGA16_MODULE)
 EXPORT_SYMBOL(screen_info);
--- 1.15/include/asm-ppc/smp.h	2004-01-19 07:32:52 +01:00
+++ edited/include/asm-ppc/smp.h	2004-06-25 14:51:47 +02:00
@@ -47,8 +47,6 @@
 
 #define smp_processor_id() (current_thread_info()->cpu)
 
-#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
-
 extern int __cpu_up(unsigned int cpu);
 
 extern int smp_hw_index[];
--- 1.24/include/asm-ppc/system.h	2004-06-18 08:41:08 +02:00
+++ edited/include/asm-ppc/system.h	2004-06-25 14:51:29 +02:00
@@ -82,7 +82,6 @@
 extern void cvt_fd(float *from, double *to, unsigned long *fpscr);
 extern void cvt_df(double *from, float *to, unsigned long *fpscr);
 extern int call_rtas(const char *, int, int, unsigned long *, ...);
-extern int abs(int);
 extern void cacheable_memzero(void *p, unsigned int nb);
 extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);
 extern void bad_page_fault(struct pt_regs *, unsigned long, int);