aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/machdep.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-22 02:02:39 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-22 02:02:39 -0400
commit35499c0195e46f479cf6ac16ad8d3f394b5fcc10 (patch)
tree25660acd2425de5236a1eff7a25dc931e6f86492 /include/asm-powerpc/machdep.h
parentb6ba92819dc1304a4e5a0bf06b297c657b58168a (diff)
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>
Diffstat (limited to 'include/asm-powerpc/machdep.h')
-rw-r--r--include/asm-powerpc/machdep.h6
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 {
119 /* Interface for platform error logging */ 119 /* Interface for platform error logging */
120 void (*log_error)(char *buf, unsigned int err_type, int fatal); 120 void (*log_error)(char *buf, unsigned int err_type, int fatal);
121 121
122 unsigned char (*nvram_read_val)(int addr);
123 void (*nvram_write_val)(int addr, unsigned char val);
122 ssize_t (*nvram_write)(char *buf, size_t count, loff_t *index); 124 ssize_t (*nvram_write)(char *buf, size_t count, loff_t *index);
123 ssize_t (*nvram_read)(char *buf, size_t count, loff_t *index); 125 ssize_t (*nvram_read)(char *buf, size_t count, loff_t *index);
124 ssize_t (*nvram_size)(void); 126 ssize_t (*nvram_size)(void);
@@ -165,15 +167,11 @@ struct machdep_calls {
165 unsigned long heartbeat_reset; 167 unsigned long heartbeat_reset;
166 unsigned long heartbeat_count; 168 unsigned long heartbeat_count;
167 169
168 unsigned long (*find_end_of_memory)(void);
169 void (*setup_io_mappings)(void); 170 void (*setup_io_mappings)(void);
170 171
171 void (*early_serial_map)(void); 172 void (*early_serial_map)(void);
172 void (*kgdb_map_scc)(void); 173 void (*kgdb_map_scc)(void);
173 174
174 unsigned char (*nvram_read_val)(int addr);
175 void (*nvram_write_val)(int addr, unsigned char val);
176
177 /* 175 /*
178 * optional PCI "hooks" 176 * optional PCI "hooks"
179 */ 177 */