diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/calibrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index 1d87891b6fcd..ecb3822d4f70 100644 --- a/init/calibrate.c +++ b/init/calibrate.c | |||
@@ -28,7 +28,7 @@ __setup("lpj=", lpj_setup); | |||
28 | #define DELAY_CALIBRATION_TICKS ((HZ < 100) ? 1 : (HZ/100)) | 28 | #define DELAY_CALIBRATION_TICKS ((HZ < 100) ? 1 : (HZ/100)) |
29 | #define MAX_DIRECT_CALIBRATION_RETRIES 5 | 29 | #define MAX_DIRECT_CALIBRATION_RETRIES 5 |
30 | 30 | ||
31 | static unsigned long __devinit calibrate_delay_direct(void) | 31 | static unsigned long __cpuinit calibrate_delay_direct(void) |
32 | { | 32 | { |
33 | unsigned long pre_start, start, post_start; | 33 | unsigned long pre_start, start, post_start; |
34 | unsigned long pre_end, end, post_end; | 34 | unsigned long pre_end, end, post_end; |
@@ -101,7 +101,7 @@ static unsigned long __devinit calibrate_delay_direct(void) | |||
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | #else | 103 | #else |
104 | static unsigned long __devinit calibrate_delay_direct(void) {return 0;} | 104 | static unsigned long __cpuinit calibrate_delay_direct(void) {return 0;} |
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | /* | 107 | /* |
@@ -111,7 +111,7 @@ static unsigned long __devinit calibrate_delay_direct(void) {return 0;} | |||
111 | */ | 111 | */ |
112 | #define LPS_PREC 8 | 112 | #define LPS_PREC 8 |
113 | 113 | ||
114 | void __devinit calibrate_delay(void) | 114 | void __cpuinit calibrate_delay(void) |
115 | { | 115 | { |
116 | unsigned long ticks, loopbit; | 116 | unsigned long ticks, loopbit; |
117 | int lps_precision = LPS_PREC; | 117 | int lps_precision = LPS_PREC; |