diff options
Diffstat (limited to 'arch/parisc/kernel/firmware.c')
| -rw-r--r-- | arch/parisc/kernel/firmware.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index f65fa480c905..22395901d47b 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c | |||
| @@ -150,7 +150,7 @@ static void convert_to_wide(unsigned long *addr) | |||
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | #ifdef CONFIG_64BIT | 152 | #ifdef CONFIG_64BIT |
| 153 | void __cpuinit set_firmware_width_unlocked(void) | 153 | void set_firmware_width_unlocked(void) |
| 154 | { | 154 | { |
| 155 | int ret; | 155 | int ret; |
| 156 | 156 | ||
| @@ -167,7 +167,7 @@ void __cpuinit set_firmware_width_unlocked(void) | |||
| 167 | * This function must be called before any pdc_* function that uses the | 167 | * This function must be called before any pdc_* function that uses the |
| 168 | * convert_to_wide function. | 168 | * convert_to_wide function. |
| 169 | */ | 169 | */ |
| 170 | void __cpuinit set_firmware_width(void) | 170 | void set_firmware_width(void) |
| 171 | { | 171 | { |
| 172 | unsigned long flags; | 172 | unsigned long flags; |
| 173 | spin_lock_irqsave(&pdc_lock, flags); | 173 | spin_lock_irqsave(&pdc_lock, flags); |
| @@ -175,11 +175,13 @@ void __cpuinit set_firmware_width(void) | |||
| 175 | spin_unlock_irqrestore(&pdc_lock, flags); | 175 | spin_unlock_irqrestore(&pdc_lock, flags); |
| 176 | } | 176 | } |
| 177 | #else | 177 | #else |
| 178 | void __cpuinit set_firmware_width_unlocked(void) { | 178 | void set_firmware_width_unlocked(void) |
| 179 | { | ||
| 179 | return; | 180 | return; |
| 180 | } | 181 | } |
| 181 | 182 | ||
| 182 | void __cpuinit set_firmware_width(void) { | 183 | void set_firmware_width(void) |
| 184 | { | ||
| 183 | return; | 185 | return; |
| 184 | } | 186 | } |
| 185 | #endif /*CONFIG_64BIT*/ | 187 | #endif /*CONFIG_64BIT*/ |
| @@ -301,7 +303,7 @@ int pdc_chassis_warn(unsigned long *warn) | |||
| 301 | return retval; | 303 | return retval; |
| 302 | } | 304 | } |
| 303 | 305 | ||
| 304 | int __cpuinit pdc_coproc_cfg_unlocked(struct pdc_coproc_cfg *pdc_coproc_info) | 306 | int pdc_coproc_cfg_unlocked(struct pdc_coproc_cfg *pdc_coproc_info) |
| 305 | { | 307 | { |
| 306 | int ret; | 308 | int ret; |
| 307 | 309 | ||
| @@ -322,7 +324,7 @@ int __cpuinit pdc_coproc_cfg_unlocked(struct pdc_coproc_cfg *pdc_coproc_info) | |||
| 322 | * This PDC call returns the presence and status of all the coprocessors | 324 | * This PDC call returns the presence and status of all the coprocessors |
| 323 | * attached to the processor. | 325 | * attached to the processor. |
| 324 | */ | 326 | */ |
| 325 | int __cpuinit pdc_coproc_cfg(struct pdc_coproc_cfg *pdc_coproc_info) | 327 | int pdc_coproc_cfg(struct pdc_coproc_cfg *pdc_coproc_info) |
| 326 | { | 328 | { |
| 327 | int ret; | 329 | int ret; |
| 328 | unsigned long flags; | 330 | unsigned long flags; |
