fix compilation for ppc32
PATCH 1/1 fix compilation for ppc32
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.
arch/ppc/kernel/ppc_ksyms.c +0 -3
@@ -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);
include/asm-ppc/smp.h +0 -2
@@ -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[];
include/asm-ppc/system.h +0 -1
@@ -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 );
Quoted 3 lines · Christoph Hellwig
PPC has an out of line and exported
abs()that gives lots of nice and wierd compilation erorrs. Also kill the duplicatecpu_online()inasm-ppc/smp.h.
Looks good, Andrew or Linus, please apply. I never understood why we kept that abs thing floating around.
arch/ppc/kernel/ppc_ksyms.c +0 -3
@@ -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);
include/asm-ppc/smp.h +0 -2
@@ -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[];
include/asm-ppc/system.h +0 -1
@@ -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 );