ppc64: remove __openfirmware and __chrp

arch/ppc64/kernel/LparData.c

@@ -13,7 +13,6 @@
 #include <linux/threads.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
-#include <asm/init.h>
 #include <asm/naca.h>
 #include <asm/abs_addr.h>
 #include <asm/bitops.h>

arch/ppc64/kernel/chrp_setup.c

@@ -56,7 +56,6 @@
 #include <asm/machdep.h>
 #include <asm/irq.h>
 #include <asm/keyboard.h>
-#include <asm/init.h>
 #include <asm/naca.h>
 #include <asm/time.h>
 
@@ -307,7 +306,7 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	ppc_md.progress("Linux ppc64\n", 0x0);
 }
 
-void __chrp
+void
 chrp_progress(char *s, unsigned short hex)
 {
 	struct device_node *root;

arch/ppc64/kernel/htab.c

@@ -35,7 +35,6 @@
 #include <asm/mmu_context.h>
 #include <asm/page.h>
 #include <asm/types.h>
-#include <asm/init.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/naca.h>

arch/ppc64/kernel/iSeries_pci_reset.c

@@ -32,7 +32,6 @@
 #include <linux/irq.h>
 
 #include <asm/io.h>
-#include <asm/init.h>
 #include <asm/iSeries/HvCallPci.h>
 #include <asm/iSeries/HvTypes.h>
 #include <asm/iSeries/mf.h>

arch/ppc64/kernel/pSeries_pci.c

@@ -35,7 +35,6 @@
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
-#include <asm/init.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppcdebug.h>
 #include <asm/naca.h>
@@ -70,7 +69,7 @@ static int s7a_workaround;
  *
  *****************************************************************************/
 #define RTAS_PCI_READ_OP(size, type, nbytes) \
-int __chrp \
+int \
 rtas_read_config_##size(struct device_node *dn, int offset, type val) {  \
 	unsigned long returnval = ~0L; \
 	unsigned long buid; \
@@ -95,7 +94,7 @@ rtas_read_config_##size(struct device_node *dn, int offset, type val) {  \
 	*val = returnval; \
 	return ret; \
 } \
-int __chrp \
+int \
 rtas_pci_read_config_##size(struct pci_dev *dev, int offset, type val) {  \
         struct device_node *dn = pci_device_to_OF_node(dev); \
 	int ret = rtas_read_config_##size(dn, offset, val); \
@@ -104,7 +103,7 @@ rtas_pci_read_config_##size(struct pci_dev *dev, int offset, type val) {  \
 }
 
 #define RTAS_PCI_WRITE_OP(size, type, nbytes) \
-int __chrp \
+int \
 rtas_write_config_##size(struct device_node *dn, int offset, type val) { \
 	unsigned long buid; \
 	unsigned int addr; \
@@ -125,7 +124,7 @@ rtas_write_config_##size(struct device_node *dn, int offset, type val) { \
 	} \
 	return ret; \
 } \
-int __chrp \
+int \
 rtas_pci_write_config_##size(struct pci_dev *dev, int offset, type val) { \
 	struct device_node*  dn = pci_device_to_OF_node(dev); \
 	int  ret = rtas_write_config_##size(dn, offset, val); \

arch/ppc64/kernel/pci_dn.c

@@ -33,7 +33,6 @@
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
-#include <asm/init.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppcdebug.h>
 #include <asm/naca.h>

arch/ppc64/kernel/prom.c

@@ -48,7 +48,6 @@
 #define call_yaboot(FUNC,...) do { ; } while (0)
 #endif
 
-#include <asm/init.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <asm/prom.h>
@@ -2110,7 +2109,7 @@ find_type_devices(const char *type)
 /*
  * Returns all nodes linked together
  */
-struct device_node * __openfirmware
+struct device_node *
 find_all_nodes(void)
 {
 	struct device_node *head, **prevp, *np;
@@ -2235,7 +2234,7 @@ get_property(struct device_node *np, const char *name, int *lenp)
 /*
  * Add a property to a node
  */
-void __openfirmware
+void
 prom_add_property(struct device_node* np, struct property* prop)
 {
 	struct property **next = &np->properties;
@@ -2247,7 +2246,7 @@ prom_add_property(struct device_node* np, struct property* prop)
 }
 
 #if 0
-void __openfirmware
+void
 print_properties(struct device_node *np)
 {
 	struct property *pp;

arch/ppc64/kernel/rtas.c

@@ -16,7 +16,6 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 
-#include <asm/init.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/semaphore.h>
@@ -110,7 +109,6 @@ call_rtas_display_status(char c)
 #if 0
 #define DEBUG_RTAS
 #endif
-__openfirmware
 int
 rtas_token(const char *service)
 {
@@ -125,7 +123,6 @@ rtas_token(const char *service)
 	return tokp ? *tokp : RTAS_UNKNOWN_SERVICE;
 }
 
-__openfirmware
 long
 rtas_call(int token, int nargs, int nret,
 	  unsigned long *outputs, ...)
@@ -264,7 +261,7 @@ void rtas_flash_bypass_warning(void)
 }
 
 
-void __chrp
+void
 rtas_restart(char *cmd)
 {
 	if (rtas_firmware_flash_list.next)
@@ -275,7 +272,7 @@ rtas_restart(char *cmd)
         for (;;);
 }
 
-void __chrp
+void
 rtas_power_off(void)
 {
 	if (rtas_firmware_flash_list.next)
@@ -286,7 +283,7 @@ rtas_power_off(void)
         for (;;);
 }
 
-void __chrp
+void
 rtas_halt(void)
 {
 	if (rtas_firmware_flash_list.next)

arch/ppc64/kernel/setup.c

@@ -22,7 +22,6 @@
 #include <linux/seq_file.h>
 #include <linux/ioport.h>
 #include <linux/tty.h>
-#include <asm/init.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
@@ -498,6 +497,7 @@ void __init ppc64_calibrate_delay(void)
 }	
 
 extern void (*calibrate_delay)(void);
+extern void sort_exception_table(void);
 
 /*
  * Called into from start_kernel, after lock_kernel has been called.

arch/ppc64/kernel/smp.c

@@ -40,7 +40,6 @@
 #include <asm/pgtable.h>
 #include <asm/hardirq.h>
 #include <asm/softirq.h>
-#include <asm/init.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/smp.h>

arch/ppc64/kernel/time.c

@@ -53,7 +53,6 @@
 #include <asm/nvram.h>
 #include <asm/cache.h>
 #include <asm/machdep.h>
-#include <asm/init.h>
 #ifdef CONFIG_PPC_ISERIES
 #include <asm/iSeries/HvCallXm.h>
 #endif

arch/ppc64/mm/init.c

@@ -72,8 +72,6 @@ static int boot_mapsize;
 
 extern pgd_t swapper_pg_dir[];
 extern char __init_begin, __init_end;
-extern char __chrp_begin, __chrp_end;
-extern char __openfirmware_begin, __openfirmware_end;
 extern char _start[], _end[];
 extern char _stext[], etext[];
 extern struct task_struct *current_set[NR_CPUS];

arch/ppc64/vmlinux.lds

@@ -117,19 +117,6 @@ SECTIONS
   . = ALIGN(4096);
   __init_end = .;
 
-  __chrp_begin = .;
-  .text.chrp : { *(.text.chrp) }
-  .data.chrp : { *(.data.chrp) }
-  . = ALIGN(4096);
-  __chrp_end = .;
-
-  . = ALIGN(4096);
-  __openfirmware_begin = .;
-  .text.openfirmware : { *(.text.openfirmware) }
-  .data.openfirmware : { *(.data.openfirmware) }
-  . = ALIGN(4096);
-  __openfirmware_end = .;
-
   __toc_start = .;
   .toc       :
   {

include/asm-ppc64/init.h

-#ifndef _PPC64_INIT_H
-#define _PPC64_INIT_H
-
-#include <linux/init.h>
-
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 90 /* egcs */
-/* DRENG add back in when we get section attribute support */
-#define __chrp __attribute__ ((__section__ (".text.chrp")))
-#define __chrpdata __attribute__ ((__section__ (".data.chrp")))
-#define __chrpfunc(__argchrp) \
-	__argchrp __chrp; \
-	__argchrp
-
-/* this is actually just common chrp/pmac code, not OF code -- Cort */
-#define __openfirmware __attribute__ ((__section__ (".text.openfirmware")))
-#define __openfirmwaredata __attribute__ ((__section__ (".data.openfirmware")))
-#define __openfirmwarefunc(__argopenfirmware) \
-	__argopenfirmware __openfirmware; \
-	__argopenfirmware
-	
-#else /* not egcs */
-
-#define __openfirmware
-#define __openfirmwaredata
-#define __openfirmwarefunc(x) x
-
-#endif /* egcs */
-
-#endif /* _PPC64_INIT_H */
+#error "<asm/init.h> should never be used - use <linux/init.h> instead"

include/asm-ppc64/prom.h

@@ -195,8 +195,5 @@ extern void print_properties(struct device_node *node);
 extern int prom_n_addr_cells(struct device_node* np);
 extern int prom_n_size_cells(struct device_node* np);
 extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
-extern void prom_drawstring(const char *c);
-extern void prom_drawhex(unsigned long v);
-extern void prom_drawchar(char c);
 
 #endif /* _PPC64_PROM_H */

include/asm-ppc64/softirq.h

@@ -8,7 +8,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <asm/atomic.h>
 #include <asm/hardirq.h>
 
 #define local_bh_disable()	do { local_bh_count(smp_processor_id())++; barrier(); } while (0)

include/asm-ppc64/system.h

@@ -9,7 +9,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/kdev_t.h>
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/hw_irq.h>
@@ -78,19 +77,13 @@ extern void (*xmon_fault_handler)(struct pt_regs *regs);
 extern void print_backtrace(unsigned long *);
 extern void show_regs(struct pt_regs * regs);
 extern void flush_instruction_cache(void);
-extern void hard_reset_now(void);
-extern void poweroff_now(void);
 extern int _get_PVR(void);
 extern void giveup_fpu(struct task_struct *);
 extern void enable_kernel_fp(void);
-extern void giveup_altivec(struct task_struct *);
-extern void load_up_altivec(struct task_struct *);
 extern void cvt_fd(float *from, double *to, unsigned long *fpscr);
 extern void cvt_df(double *from, float *to, unsigned long *fpscr);
 extern int abs(int);
 
-struct device_node;
-
 struct task_struct;
 #define prepare_to_switch()	do { } while(0)
 #define switch_to(prev,next) _switch_to((prev),(next))