diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-01-06 16:19:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-06 16:19:28 -0500 |
commit | 9018113649348c689da107166c05d436cd52e7bf (patch) | |
tree | 3ae09643fd0cafdfdb9462575213e060b456ac91 /arch/sparc/kernel/ds.c | |
parent | 0157141ae29d7a0998b9f040e577895980430d89 (diff) |
sparc64: Use unsigned long long for u64.
Andrew Morton wrote:
People keep on doing
printk("%llu", some_u64);
testing it only on x86_64 and this generates a warning storm on
powerpc, sparc64, etc. Because they use `long', not `long long'.
Quite a few 64-bit architectures are using `long' for their
s64/u64 types. We should convert them all to `long long'.
Update types.h so we use unsigned long long for u64 and
fix all warnings in sparc64 code.
Tested with an allnoconfig, defconfig and allmodconfig builds.
This patch introduces additional warnings in several drivers.
These will be dealt with in separate patches.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/ds.c')
-rw-r--r-- | arch/sparc/kernel/ds.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index f52e0534d91d..57c39843fb2a 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c | |||
@@ -286,7 +286,7 @@ static void md_update_data(struct ds_info *dp, | |||
286 | 286 | ||
287 | rp = (struct ds_md_update_req *) (dpkt + 1); | 287 | rp = (struct ds_md_update_req *) (dpkt + 1); |
288 | 288 | ||
289 | printk(KERN_INFO "ds-%lu: Machine description update.\n", dp->id); | 289 | printk(KERN_INFO "ds-%llu: Machine description update.\n", dp->id); |
290 | 290 | ||
291 | mdesc_update(); | 291 | mdesc_update(); |
292 | 292 | ||
@@ -325,7 +325,7 @@ static void domain_shutdown_data(struct ds_info *dp, | |||
325 | 325 | ||
326 | rp = (struct ds_shutdown_req *) (dpkt + 1); | 326 | rp = (struct ds_shutdown_req *) (dpkt + 1); |
327 | 327 | ||
328 | printk(KERN_ALERT "ds-%lu: Shutdown request from " | 328 | printk(KERN_ALERT "ds-%llu: Shutdown request from " |
329 | "LDOM manager received.\n", dp->id); | 329 | "LDOM manager received.\n", dp->id); |
330 | 330 | ||
331 | memset(&pkt, 0, sizeof(pkt)); | 331 | memset(&pkt, 0, sizeof(pkt)); |
@@ -365,7 +365,7 @@ static void domain_panic_data(struct ds_info *dp, | |||
365 | 365 | ||
366 | rp = (struct ds_panic_req *) (dpkt + 1); | 366 | rp = (struct ds_panic_req *) (dpkt + 1); |
367 | 367 | ||
368 | printk(KERN_ALERT "ds-%lu: Panic request from " | 368 | printk(KERN_ALERT "ds-%llu: Panic request from " |
369 | "LDOM manager received.\n", dp->id); | 369 | "LDOM manager received.\n", dp->id); |
370 | 370 | ||
371 | memset(&pkt, 0, sizeof(pkt)); | 371 | memset(&pkt, 0, sizeof(pkt)); |
@@ -549,7 +549,7 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp, | |||
549 | for_each_cpu_mask(cpu, *mask) { | 549 | for_each_cpu_mask(cpu, *mask) { |
550 | int err; | 550 | int err; |
551 | 551 | ||
552 | printk(KERN_INFO "ds-%lu: Starting cpu %d...\n", | 552 | printk(KERN_INFO "ds-%llu: Starting cpu %d...\n", |
553 | dp->id, cpu); | 553 | dp->id, cpu); |
554 | err = cpu_up(cpu); | 554 | err = cpu_up(cpu); |
555 | if (err) { | 555 | if (err) { |
@@ -565,7 +565,7 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp, | |||
565 | res = DR_CPU_RES_CPU_NOT_RESPONDING; | 565 | res = DR_CPU_RES_CPU_NOT_RESPONDING; |
566 | } | 566 | } |
567 | 567 | ||
568 | printk(KERN_INFO "ds-%lu: CPU startup failed err=%d\n", | 568 | printk(KERN_INFO "ds-%llu: CPU startup failed err=%d\n", |
569 | dp->id, err); | 569 | dp->id, err); |
570 | dr_cpu_mark(resp, cpu, ncpus, res, stat); | 570 | dr_cpu_mark(resp, cpu, ncpus, res, stat); |
571 | } | 571 | } |
@@ -605,7 +605,7 @@ static int dr_cpu_unconfigure(struct ds_info *dp, | |||
605 | for_each_cpu_mask(cpu, *mask) { | 605 | for_each_cpu_mask(cpu, *mask) { |
606 | int err; | 606 | int err; |
607 | 607 | ||
608 | printk(KERN_INFO "ds-%lu: Shutting down cpu %d...\n", | 608 | printk(KERN_INFO "ds-%llu: Shutting down cpu %d...\n", |
609 | dp->id, cpu); | 609 | dp->id, cpu); |
610 | err = cpu_down(cpu); | 610 | err = cpu_down(cpu); |
611 | if (err) | 611 | if (err) |
@@ -684,7 +684,7 @@ static void ds_pri_data(struct ds_info *dp, | |||
684 | 684 | ||
685 | rp = (struct ds_pri_msg *) (dpkt + 1); | 685 | rp = (struct ds_pri_msg *) (dpkt + 1); |
686 | 686 | ||
687 | printk(KERN_INFO "ds-%lu: PRI REQ [%lx:%lx], len=%d\n", | 687 | printk(KERN_INFO "ds-%llu: PRI REQ [%llx:%llx], len=%d\n", |
688 | dp->id, rp->req_num, rp->type, len); | 688 | dp->id, rp->req_num, rp->type, len); |
689 | } | 689 | } |
690 | 690 | ||
@@ -816,7 +816,7 @@ void ldom_set_var(const char *var, const char *value) | |||
816 | 816 | ||
817 | if (ds_var_doorbell == 0 || | 817 | if (ds_var_doorbell == 0 || |
818 | ds_var_response != DS_VAR_SUCCESS) | 818 | ds_var_response != DS_VAR_SUCCESS) |
819 | printk(KERN_ERR "ds-%lu: var-config [%s:%s] " | 819 | printk(KERN_ERR "ds-%llu: var-config [%s:%s] " |
820 | "failed, response(%d).\n", | 820 | "failed, response(%d).\n", |
821 | dp->id, var, value, | 821 | dp->id, var, value, |
822 | ds_var_response); | 822 | ds_var_response); |
@@ -850,7 +850,7 @@ void ldom_power_off(void) | |||
850 | 850 | ||
851 | static void ds_conn_reset(struct ds_info *dp) | 851 | static void ds_conn_reset(struct ds_info *dp) |
852 | { | 852 | { |
853 | printk(KERN_ERR "ds-%lu: ds_conn_reset() from %p\n", | 853 | printk(KERN_ERR "ds-%llu: ds_conn_reset() from %p\n", |
854 | dp->id, __builtin_return_address(0)); | 854 | dp->id, __builtin_return_address(0)); |
855 | } | 855 | } |
856 | 856 | ||
@@ -912,11 +912,11 @@ static int ds_handshake(struct ds_info *dp, struct ds_msg_tag *pkt) | |||
912 | struct ds_cap_state *cp = find_cap(dp, ap->handle); | 912 | struct ds_cap_state *cp = find_cap(dp, ap->handle); |
913 | 913 | ||
914 | if (!cp) { | 914 | if (!cp) { |
915 | printk(KERN_ERR "ds-%lu: REG ACK for unknown " | 915 | printk(KERN_ERR "ds-%llu: REG ACK for unknown " |
916 | "handle %lx\n", dp->id, ap->handle); | 916 | "handle %llx\n", dp->id, ap->handle); |
917 | return 0; | 917 | return 0; |
918 | } | 918 | } |
919 | printk(KERN_INFO "ds-%lu: Registered %s service.\n", | 919 | printk(KERN_INFO "ds-%llu: Registered %s service.\n", |
920 | dp->id, cp->service_id); | 920 | dp->id, cp->service_id); |
921 | cp->state = CAP_STATE_REGISTERED; | 921 | cp->state = CAP_STATE_REGISTERED; |
922 | } else if (pkt->type == DS_REG_NACK) { | 922 | } else if (pkt->type == DS_REG_NACK) { |
@@ -924,8 +924,8 @@ static int ds_handshake(struct ds_info *dp, struct ds_msg_tag *pkt) | |||
924 | struct ds_cap_state *cp = find_cap(dp, np->handle); | 924 | struct ds_cap_state *cp = find_cap(dp, np->handle); |
925 | 925 | ||
926 | if (!cp) { | 926 | if (!cp) { |
927 | printk(KERN_ERR "ds-%lu: REG NACK for " | 927 | printk(KERN_ERR "ds-%llu: REG NACK for " |
928 | "unknown handle %lx\n", | 928 | "unknown handle %llx\n", |
929 | dp->id, np->handle); | 929 | dp->id, np->handle); |
930 | return 0; | 930 | return 0; |
931 | } | 931 | } |
@@ -982,8 +982,8 @@ static void process_ds_work(void) | |||
982 | int req_len = qp->req_len; | 982 | int req_len = qp->req_len; |
983 | 983 | ||
984 | if (!cp) { | 984 | if (!cp) { |
985 | printk(KERN_ERR "ds-%lu: Data for unknown " | 985 | printk(KERN_ERR "ds-%llu: Data for unknown " |
986 | "handle %lu\n", | 986 | "handle %llu\n", |
987 | dp->id, dpkt->handle); | 987 | dp->id, dpkt->handle); |
988 | 988 | ||
989 | spin_lock_irqsave(&ds_lock, flags); | 989 | spin_lock_irqsave(&ds_lock, flags); |
@@ -1085,7 +1085,7 @@ static void ds_event(void *arg, int event) | |||
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | if (event != LDC_EVENT_DATA_READY) { | 1087 | if (event != LDC_EVENT_DATA_READY) { |
1088 | printk(KERN_WARNING "ds-%lu: Unexpected LDC event %d\n", | 1088 | printk(KERN_WARNING "ds-%llu: Unexpected LDC event %d\n", |
1089 | dp->id, event); | 1089 | dp->id, event); |
1090 | spin_unlock_irqrestore(&ds_lock, flags); | 1090 | spin_unlock_irqrestore(&ds_lock, flags); |
1091 | return; | 1091 | return; |