powerpc: Merge in 64-bit powermac support.

This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to
arch/powerpc/platforms/powermac/*.c and makes various minor tweaks
elsewhere.  On the powermac we now initialize ppc_md by copying
the whole pmac_md structure into it, which required some changes in
the ordering of initializations of individual fields of it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 8a0969b6243c..b3a93b476d97 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -119,6 +119,8 @@ struct machdep_calls {
         /* Interface for platform error logging */
         void            (*log_error)(char *buf, unsigned int err_type, int fatal);
 
+        unsigned char   (*nvram_read_val)(int addr);
+        void            (*nvram_write_val)(int addr, unsigned char val);
         ssize_t         (*nvram_write)(char *buf, size_t count, loff_t *index);
         ssize_t         (*nvram_read)(char *buf, size_t count, loff_t *index);  
         ssize_t         (*nvram_size)(void);            
@@ -165,15 +167,11 @@ struct machdep_calls {
         unsigned long   heartbeat_reset;
         unsigned long   heartbeat_count;
 
-        unsigned long   (*find_end_of_memory)(void);
         void            (*setup_io_mappings)(void);
 
         void            (*early_serial_map)(void);
         void            (*kgdb_map_scc)(void);
 
-        unsigned char   (*nvram_read_val)(int addr);
-        void            (*nvram_write_val)(int addr, unsigned char val);
-
         /*
          * optional PCI "hooks"
          */