ppc64: fix conflicts

diff --cc arch/ppc64/kernel/irq.c
Simple merge

diff --cc arch/ppc64/kernel/open_pic.c
Simple merge

diff --cc arch/ppc64/kernel/process.c
Simple merge

diff --cc arch/ppc64/kernel/smp.c
Simple merge

diff --cc arch/ppc64/kernel/stab.c
Simple merge

diff --cc arch/ppc64/xmon/xmon.c
Simple merge

diff --cc include/asm-ppc64/system.h
index bd1ef096e1cc7d8366d843c8dbfaa931641e9025,c310eca6c5ef0dc6f24a39eb93061eff2de3e462..c962606c6d43b1ba33edaf76efa15f6e3a5e8991
--- 1/include/asm-ppc64/system.h
--- 2/include/asm-ppc64/system.h
+++ b/include/asm-ppc64/system.h
@@@ -101,22 -116,25 +101,14 @@@ extern void dump_regs(struct pt_regs *)
  
  #ifndef CONFIG_SMP
  
- /*
-  * Compatibility macros - they will be removed after some time.
-  */
- #define cli() __cli()
- #define sti() __sti()
- #define save_flags(flags)     __save_flags(flags)
- #define restore_flags(flags)  __restore_flags(flags)
- #define save_and_cli(flags)   __save_and_cli(flags)
+ #define cli() local_irq_disable()
+ #define sti() local_irq_enable()
+ #define save_flags(flags)     local_save_flags(flags)
+ #define restore_flags(flags)  local_irq_restore(flags)
+ #define save_and_cli(flags)   local_irq_save(flags)
  
 -#else /* CONFIG_SMP */
 -
 -extern void __global_cli(void);
 -extern void __global_sti(void);
 -extern unsigned long __global_save_flags(void);
 -extern void __global_restore_flags(unsigned long);
 -#define cli() __global_cli()
 -#define sti() __global_sti()
 -#define save_flags(x) ((x)=__global_save_flags())
 -#define restore_flags(x) __global_restore_flags(x)
 -
  #endif /* !CONFIG_SMP */
  
- #define local_irq_disable()           __cli()
- #define local_irq_enable()            __sti()
- #define local_irq_save(flags)         __save_and_cli(flags)
- #define local_irq_restore(flags)      __restore_flags(flags)
- 
  static __inline__ int __is_processor(unsigned long pv)
  {
        unsigned long pvr;