diff options
-rw-r--r-- | arch/arm/kernel/time.c | 11 | ||||
-rw-r--r-- | arch/ia64/kernel/time.c | 27 | ||||
-rw-r--r-- | kernel/printk.c | 5 |
3 files changed, 0 insertions, 43 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index f6f3689a86ee..e59b5b84168d 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -79,17 +79,6 @@ static unsigned long dummy_gettimeoffset(void) | |||
79 | } | 79 | } |
80 | #endif | 80 | #endif |
81 | 81 | ||
82 | /* | ||
83 | * An implementation of printk_clock() independent from | ||
84 | * sched_clock(). This avoids non-bootable kernels when | ||
85 | * printk_clock is enabled. | ||
86 | */ | ||
87 | unsigned long long printk_clock(void) | ||
88 | { | ||
89 | return (unsigned long long)(jiffies - INITIAL_JIFFIES) * | ||
90 | (1000000000 / HZ); | ||
91 | } | ||
92 | |||
93 | static unsigned long next_rtc_update; | 82 | static unsigned long next_rtc_update; |
94 | 83 | ||
95 | /* | 84 | /* |
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 2bb84214e5f1..3ab042720970 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -344,33 +344,6 @@ udelay (unsigned long usecs) | |||
344 | } | 344 | } |
345 | EXPORT_SYMBOL(udelay); | 345 | EXPORT_SYMBOL(udelay); |
346 | 346 | ||
347 | static unsigned long long ia64_itc_printk_clock(void) | ||
348 | { | ||
349 | if (ia64_get_kr(IA64_KR_PER_CPU_DATA)) | ||
350 | return sched_clock(); | ||
351 | return 0; | ||
352 | } | ||
353 | |||
354 | static unsigned long long ia64_default_printk_clock(void) | ||
355 | { | ||
356 | return (unsigned long long)(jiffies_64 - INITIAL_JIFFIES) * | ||
357 | (1000000000/HZ); | ||
358 | } | ||
359 | |||
360 | unsigned long long (*ia64_printk_clock)(void) = &ia64_default_printk_clock; | ||
361 | |||
362 | unsigned long long printk_clock(void) | ||
363 | { | ||
364 | return ia64_printk_clock(); | ||
365 | } | ||
366 | |||
367 | void __init | ||
368 | ia64_setup_printk_clock(void) | ||
369 | { | ||
370 | if (!(sal_platform_features & IA64_SAL_PLATFORM_FEATURE_ITC_DRIFT)) | ||
371 | ia64_printk_clock = ia64_itc_printk_clock; | ||
372 | } | ||
373 | |||
374 | /* IA64 doesn't cache the timezone */ | 347 | /* IA64 doesn't cache the timezone */ |
375 | void update_vsyscall_tz(void) | 348 | void update_vsyscall_tz(void) |
376 | { | 349 | { |
diff --git a/kernel/printk.c b/kernel/printk.c index 5f9d053699f9..3b7c968d0ef9 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -573,11 +573,6 @@ static int __init printk_time_setup(char *str) | |||
573 | 573 | ||
574 | __setup("time", printk_time_setup); | 574 | __setup("time", printk_time_setup); |
575 | 575 | ||
576 | __attribute__((weak)) unsigned long long printk_clock(void) | ||
577 | { | ||
578 | return sched_clock(); | ||
579 | } | ||
580 | |||
581 | /* Check if we have any console registered that can be called early in boot. */ | 576 | /* Check if we have any console registered that can be called early in boot. */ |
582 | static int have_callable_console(void) | 577 | static int have_callable_console(void) |
583 | { | 578 | { |