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