diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:38 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:20 -0500 |
commit | feab6501d84f7e2f75cf0f5c7d43341431904374 (patch) | |
tree | fe1f290b9a49a7553deec2687feffc598adcda4b /arch/s390/kernel/time.c | |
parent | 39f09392498d8ee876bea3ad34f26c447924c818 (diff) |
[S390] convert time printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/time.c')
-rw-r--r-- | arch/s390/kernel/time.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 95620296e1ad..5be981a36c3e 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -12,6 +12,9 @@ | |||
12 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 12 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #define KMSG_COMPONENT "time" | ||
16 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
17 | |||
15 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
16 | #include <linux/module.h> | 19 | #include <linux/module.h> |
17 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
@@ -319,8 +322,8 @@ static unsigned long long adjust_time(unsigned long long old, | |||
319 | } | 322 | } |
320 | sched_clock_base_cc += delta; | 323 | sched_clock_base_cc += delta; |
321 | if (adjust.offset != 0) { | 324 | if (adjust.offset != 0) { |
322 | printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n", | 325 | pr_notice("The ETR interface has adjusted the clock " |
323 | adjust.offset); | 326 | "by %li microseconds\n", adjust.offset); |
324 | adjust.modes = ADJ_OFFSET_SINGLESHOT; | 327 | adjust.modes = ADJ_OFFSET_SINGLESHOT; |
325 | do_adjtimex(&adjust); | 328 | do_adjtimex(&adjust); |
326 | } | 329 | } |
@@ -481,8 +484,8 @@ static void etr_reset(void) | |||
481 | etr_tolec = get_clock(); | 484 | etr_tolec = get_clock(); |
482 | set_bit(CLOCK_SYNC_HAS_ETR, &clock_sync_flags); | 485 | set_bit(CLOCK_SYNC_HAS_ETR, &clock_sync_flags); |
483 | } else if (etr_port0_online || etr_port1_online) { | 486 | } else if (etr_port0_online || etr_port1_online) { |
484 | printk(KERN_WARNING "Running on non ETR capable " | 487 | pr_warning("The real or virtual hardware system does " |
485 | "machine, only local mode available.\n"); | 488 | "not provide an ETR interface\n"); |
486 | etr_port0_online = etr_port1_online = 0; | 489 | etr_port0_online = etr_port1_online = 0; |
487 | } | 490 | } |
488 | } | 491 | } |
@@ -1423,7 +1426,8 @@ static void __init stp_reset(void) | |||
1423 | if (rc == 0) | 1426 | if (rc == 0) |
1424 | set_bit(CLOCK_SYNC_HAS_STP, &clock_sync_flags); | 1427 | set_bit(CLOCK_SYNC_HAS_STP, &clock_sync_flags); |
1425 | else if (stp_online) { | 1428 | else if (stp_online) { |
1426 | printk(KERN_WARNING "Running on non STP capable machine.\n"); | 1429 | pr_warning("The real or virtual hardware system does " |
1430 | "not provide an STP interface\n"); | ||
1427 | free_bootmem((unsigned long) stp_page, PAGE_SIZE); | 1431 | free_bootmem((unsigned long) stp_page, PAGE_SIZE); |
1428 | stp_page = NULL; | 1432 | stp_page = NULL; |
1429 | stp_online = 0; | 1433 | stp_online = 0; |