diff options
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r-- | arch/ppc/kernel/head_8xx.S | 12 | ||||
-rw-r--r-- | arch/ppc/kernel/setup.c | 6 |
2 files changed, 5 insertions, 13 deletions
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S index 5a7a64e91fc5..eb18cadb3755 100644 --- a/arch/ppc/kernel/head_8xx.S +++ b/arch/ppc/kernel/head_8xx.S | |||
@@ -288,13 +288,11 @@ SystemCall: | |||
288 | * For the MPC8xx, this is a software tablewalk to load the instruction | 288 | * For the MPC8xx, this is a software tablewalk to load the instruction |
289 | * TLB. It is modelled after the example in the Motorola manual. The task | 289 | * TLB. It is modelled after the example in the Motorola manual. The task |
290 | * switch loads the M_TWB register with the pointer to the first level table. | 290 | * switch loads the M_TWB register with the pointer to the first level table. |
291 | * If we discover there is no second level table (the value is zero), the | 291 | * If we discover there is no second level table (value is zero) or if there |
292 | * plan was to load that into the TLB, which causes another fault into the | 292 | * is an invalid pte, we load that into the TLB, which causes another fault |
293 | * TLB Error interrupt where we can handle such problems. However, that did | 293 | * into the TLB Error interrupt where we can handle such problems. |
294 | * not work, so if we discover there is no second level table, we restore | 294 | * We have to use the MD_xxx registers for the tablewalk because the |
295 | * registers and branch to the error exception. We have to use the MD_xxx | 295 | * equivalent MI_xxx registers only perform the attribute functions. |
296 | * registers for the tablewalk because the equivalent MI_xxx registers | ||
297 | * only perform the attribute functions. | ||
298 | */ | 296 | */ |
299 | InstructionTLBMiss: | 297 | InstructionTLBMiss: |
300 | #ifdef CONFIG_8xx_CPU6 | 298 | #ifdef CONFIG_8xx_CPU6 |
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index c42f75326939..929e5d1cc7fe 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -121,8 +121,6 @@ void machine_restart(char *cmd) | |||
121 | ppc_md.restart(cmd); | 121 | ppc_md.restart(cmd); |
122 | } | 122 | } |
123 | 123 | ||
124 | EXPORT_SYMBOL(machine_restart); | ||
125 | |||
126 | void machine_power_off(void) | 124 | void machine_power_off(void) |
127 | { | 125 | { |
128 | #ifdef CONFIG_NVRAM | 126 | #ifdef CONFIG_NVRAM |
@@ -131,8 +129,6 @@ void machine_power_off(void) | |||
131 | ppc_md.power_off(); | 129 | ppc_md.power_off(); |
132 | } | 130 | } |
133 | 131 | ||
134 | EXPORT_SYMBOL(machine_power_off); | ||
135 | |||
136 | void machine_halt(void) | 132 | void machine_halt(void) |
137 | { | 133 | { |
138 | #ifdef CONFIG_NVRAM | 134 | #ifdef CONFIG_NVRAM |
@@ -141,8 +137,6 @@ void machine_halt(void) | |||
141 | ppc_md.halt(); | 137 | ppc_md.halt(); |
142 | } | 138 | } |
143 | 139 | ||
144 | EXPORT_SYMBOL(machine_halt); | ||
145 | |||
146 | void (*pm_power_off)(void) = machine_power_off; | 140 | void (*pm_power_off)(void) = machine_power_off; |
147 | 141 | ||
148 | #ifdef CONFIG_TAU | 142 | #ifdef CONFIG_TAU |