alpha: convert u64 to unsigned long long
Convert alpha architecture to use u64 as unsigned long long. This is being done so that (a) all arches use u64 as unsigned long long and (b) printk of a u64 as %ll[ux] will not generate format warnings by gcc. The only gcc cross-compiler that I have is 4.0.2, which generates errors about miscompiling __weak references, so I have commented out that line in compiler-gcc4.h so that most of these compile, but more builds and real machine testing would be Real Good. [akpm@linux-foundation.org: fix warning] [akpm@linux-foundation.org: fix build] [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> From: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
a6209d6d71
commit
5f0e3da6e1
@@ -129,7 +129,7 @@ marvel_print_po7_crrct_sym(u64 crrct_sym)
|
||||
|
||||
|
||||
printk("%s Correctable Error Symptoms:\n"
|
||||
"%s Syndrome: 0x%lx\n",
|
||||
"%s Syndrome: 0x%llx\n",
|
||||
err_print_prefix,
|
||||
err_print_prefix, EXTRACT(crrct_sym, IO7__PO7_CRRCT_SYM__SYN));
|
||||
marvel_print_err_cyc(EXTRACT(crrct_sym, IO7__PO7_CRRCT_SYM__ERR_CYC));
|
||||
@@ -186,7 +186,7 @@ marvel_print_po7_uncrr_sym(u64 uncrr_sym, u64 valid_mask)
|
||||
uncrr_sym &= valid_mask;
|
||||
|
||||
if (EXTRACT(valid_mask, IO7__PO7_UNCRR_SYM__SYN))
|
||||
printk("%s Syndrome: 0x%lx\n",
|
||||
printk("%s Syndrome: 0x%llx\n",
|
||||
err_print_prefix,
|
||||
EXTRACT(uncrr_sym, IO7__PO7_UNCRR_SYM__SYN));
|
||||
|
||||
@@ -307,7 +307,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym)
|
||||
sprintf(opcode_str, "BlkIO");
|
||||
break;
|
||||
default:
|
||||
sprintf(opcode_str, "0x%lx\n",
|
||||
sprintf(opcode_str, "0x%llx\n",
|
||||
EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_OPCODE));
|
||||
break;
|
||||
}
|
||||
@@ -321,7 +321,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym)
|
||||
opcode_str);
|
||||
|
||||
if (0xC5 != EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_OPCODE))
|
||||
printk("%s Packet Offset 0x%08lx\n",
|
||||
printk("%s Packet Offset 0x%08llx\n",
|
||||
err_print_prefix,
|
||||
EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_PKT_OFF));
|
||||
}
|
||||
@@ -480,8 +480,8 @@ marvel_print_po7_err_sum(struct ev7_pal_io_subpacket *io)
|
||||
printk("%s Lost Error\n", err_print_prefix);
|
||||
|
||||
printk("%s Failing Packet:\n"
|
||||
"%s Cycle 1: %016lx\n"
|
||||
"%s Cycle 2: %016lx\n",
|
||||
"%s Cycle 1: %016llx\n"
|
||||
"%s Cycle 2: %016llx\n",
|
||||
err_print_prefix,
|
||||
err_print_prefix, io->po7_err_pkt0,
|
||||
err_print_prefix, io->po7_err_pkt1);
|
||||
@@ -515,9 +515,9 @@ marvel_print_pox_tlb_err(u64 tlb_err)
|
||||
if (!(tlb_err & IO7__POX_TLBERR__ERR_VALID))
|
||||
return;
|
||||
|
||||
printk("%s TLB Error on index 0x%lx:\n"
|
||||
printk("%s TLB Error on index 0x%llx:\n"
|
||||
"%s - %s\n"
|
||||
"%s - Addr: 0x%016lx\n",
|
||||
"%s - Addr: 0x%016llx\n",
|
||||
err_print_prefix,
|
||||
EXTRACT(tlb_err, IO7__POX_TLBERR__ERR_TLB_PTR),
|
||||
err_print_prefix,
|
||||
@@ -579,7 +579,7 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt)
|
||||
sprintf(message, "Uncorrectable Split Write Data Error");
|
||||
break;
|
||||
default:
|
||||
sprintf(message, "%08lx\n",
|
||||
sprintf(message, "%08llx\n",
|
||||
EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__MESSAGE));
|
||||
break;
|
||||
}
|
||||
@@ -620,9 +620,9 @@ marvel_print_pox_trans_sum(u64 trans_sum)
|
||||
return;
|
||||
|
||||
printk("%s Transaction Summary:\n"
|
||||
"%s Command: 0x%lx - %s\n"
|
||||
"%s Address: 0x%016lx%s\n"
|
||||
"%s PCI-X Master Slot: 0x%lx\n",
|
||||
"%s Command: 0x%llx - %s\n"
|
||||
"%s Address: 0x%016llx%s\n"
|
||||
"%s PCI-X Master Slot: 0x%llx\n",
|
||||
err_print_prefix,
|
||||
err_print_prefix,
|
||||
EXTRACT(trans_sum, IO7__POX_TRANSUM__PCIX_CMD),
|
||||
@@ -964,12 +964,12 @@ marvel_process_io_error(struct ev7_lf_subpackets *lf_subpackets, int print)
|
||||
|
||||
#if 0
|
||||
printk("%s PORT 7 ERROR:\n"
|
||||
"%s PO7_ERROR_SUM: %016lx\n"
|
||||
"%s PO7_UNCRR_SYM: %016lx\n"
|
||||
"%s PO7_CRRCT_SYM: %016lx\n"
|
||||
"%s PO7_UGBGE_SYM: %016lx\n"
|
||||
"%s PO7_ERR_PKT0: %016lx\n"
|
||||
"%s PO7_ERR_PKT1: %016lx\n",
|
||||
"%s PO7_ERROR_SUM: %016llx\n"
|
||||
"%s PO7_UNCRR_SYM: %016llx\n"
|
||||
"%s PO7_CRRCT_SYM: %016llx\n"
|
||||
"%s PO7_UGBGE_SYM: %016llx\n"
|
||||
"%s PO7_ERR_PKT0: %016llx\n"
|
||||
"%s PO7_ERR_PKT1: %016llx\n",
|
||||
err_print_prefix,
|
||||
err_print_prefix, io->po7_error_sum,
|
||||
err_print_prefix, io->po7_uncrr_sym,
|
||||
@@ -987,12 +987,12 @@ marvel_process_io_error(struct ev7_lf_subpackets *lf_subpackets, int print)
|
||||
if (!MARVEL_IO_ERR_VALID(io->ports[i].pox_err_sum))
|
||||
continue;
|
||||
|
||||
printk("%s PID %u PORT %d POx_ERR_SUM: %016lx\n",
|
||||
printk("%s PID %u PORT %d POx_ERR_SUM: %016llx\n",
|
||||
err_print_prefix,
|
||||
lf_subpackets->io_pid, i, io->ports[i].pox_err_sum);
|
||||
marvel_print_pox_err(io->ports[i].pox_err_sum, &io->ports[i]);
|
||||
|
||||
printk("%s [ POx_FIRST_ERR: %016lx ]\n",
|
||||
printk("%s [ POx_FIRST_ERR: %016llx ]\n",
|
||||
err_print_prefix, io->ports[i].pox_first_err);
|
||||
marvel_print_pox_err(io->ports[i].pox_first_err,
|
||||
&io->ports[i]);
|
||||
|
Reference in New Issue
Block a user