diff options
author | Michael Holzheu <holzheu@de.ibm.com> | 2008-12-25 07:39:51 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:26 -0500 |
commit | 17159dc6fb8769e52edb23d138c2b6bc634397a3 (patch) | |
tree | a81050bd02b72fb35de8a1f548bf950ef5a82261 /drivers/s390 | |
parent | 395d31d40cc38270dd7c024691404e2eddf0678d (diff) |
[S390] convert zfcp dumper printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/zcore.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c index 7fd84be11931..eefc6611412e 100644 --- a/drivers/s390/char/zcore.c +++ b/drivers/s390/char/zcore.c | |||
@@ -9,6 +9,9 @@ | |||
9 | * Author(s): Michael Holzheu | 9 | * Author(s): Michael Holzheu |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #define KMSG_COMPONENT "zdump" | ||
13 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
14 | |||
12 | #include <linux/init.h> | 15 | #include <linux/init.h> |
13 | #include <linux/miscdevice.h> | 16 | #include <linux/miscdevice.h> |
14 | #include <linux/utsname.h> | 17 | #include <linux/utsname.h> |
@@ -24,8 +27,6 @@ | |||
24 | #include "sclp.h" | 27 | #include "sclp.h" |
25 | 28 | ||
26 | #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) | 29 | #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) |
27 | #define MSG(x...) printk( KERN_ALERT x ) | ||
28 | #define ERROR_MSG(x...) printk ( KERN_ALERT "DUMP: " x ) | ||
29 | 30 | ||
30 | #define TO_USER 0 | 31 | #define TO_USER 0 |
31 | #define TO_KERNEL 1 | 32 | #define TO_KERNEL 1 |
@@ -563,19 +564,19 @@ static int __init sys_info_init(enum arch_id arch) | |||
563 | 564 | ||
564 | switch (arch) { | 565 | switch (arch) { |
565 | case ARCH_S390X: | 566 | case ARCH_S390X: |
566 | MSG("DETECTED 'S390X (64 bit) OS'\n"); | 567 | pr_alert("DETECTED 'S390X (64 bit) OS'\n"); |
567 | sys_info.sa_base = SAVE_AREA_BASE_S390X; | 568 | sys_info.sa_base = SAVE_AREA_BASE_S390X; |
568 | sys_info.sa_size = sizeof(struct save_area_s390x); | 569 | sys_info.sa_size = sizeof(struct save_area_s390x); |
569 | set_s390x_lc_mask(&sys_info.lc_mask); | 570 | set_s390x_lc_mask(&sys_info.lc_mask); |
570 | break; | 571 | break; |
571 | case ARCH_S390: | 572 | case ARCH_S390: |
572 | MSG("DETECTED 'S390 (32 bit) OS'\n"); | 573 | pr_alert("DETECTED 'S390 (32 bit) OS'\n"); |
573 | sys_info.sa_base = SAVE_AREA_BASE_S390; | 574 | sys_info.sa_base = SAVE_AREA_BASE_S390; |
574 | sys_info.sa_size = sizeof(struct save_area_s390); | 575 | sys_info.sa_size = sizeof(struct save_area_s390); |
575 | set_s390_lc_mask(&sys_info.lc_mask); | 576 | set_s390_lc_mask(&sys_info.lc_mask); |
576 | break; | 577 | break; |
577 | default: | 578 | default: |
578 | ERROR_MSG("unknown architecture 0x%x.\n",arch); | 579 | pr_alert("0x%x is an unknown architecture.\n",arch); |
579 | return -EINVAL; | 580 | return -EINVAL; |
580 | } | 581 | } |
581 | sys_info.arch = arch; | 582 | sys_info.arch = arch; |
@@ -674,7 +675,8 @@ static int __init zcore_init(void) | |||
674 | 675 | ||
675 | #ifndef __s390x__ | 676 | #ifndef __s390x__ |
676 | if (arch == ARCH_S390X) { | 677 | if (arch == ARCH_S390X) { |
677 | ERROR_MSG("32 bit dumper can't dump 64 bit system!\n"); | 678 | pr_alert("The 32-bit dump tool cannot be used for a " |
679 | "64-bit system\n"); | ||
678 | rc = -EINVAL; | 680 | rc = -EINVAL; |
679 | goto fail; | 681 | goto fail; |
680 | } | 682 | } |