diff options
| author | Pekka Paalanen <pq@iki.fi> | 2008-05-12 21:21:03 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-24 11:27:36 +0200 | 
| commit | dee310d0adf41019aca476052ac3085ff286d9be (patch) | |
| tree | 8e5b7982b787fc4036ad01a8a4a58accf9e15127 /kernel | |
| parent | 87e547fe41a8b57d6d80afc67a0031fbe477eb0d (diff) | |
x86 mmiotrace: use resource_size_t for phys addresses
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_mmiotrace.c | 20 | 
1 files changed, 12 insertions, 8 deletions
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c index 3c1dacdc2d8..b13dc19dcbb 100644 --- a/kernel/trace/trace_mmiotrace.c +++ b/kernel/trace/trace_mmiotrace.c @@ -184,20 +184,23 @@ static int mmio_print_rw(struct trace_iterator *iter)  	switch (entry->mmiorw.opcode) {  	case MMIO_READ:  		ret = trace_seq_printf(s, -			"R %d %lu.%06lu %d 0x%lx 0x%lx 0x%lx %d\n", -			rw->width, secs, usec_rem, rw->map_id, rw->phys, +			"R %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", +			rw->width, secs, usec_rem, rw->map_id, +			(unsigned long long)rw->phys,  			rw->value, rw->pc, 0);  		break;  	case MMIO_WRITE:  		ret = trace_seq_printf(s, -			"W %d %lu.%06lu %d 0x%lx 0x%lx 0x%lx %d\n", -			rw->width, secs, usec_rem, rw->map_id, rw->phys, +			"W %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", +			rw->width, secs, usec_rem, rw->map_id, +			(unsigned long long)rw->phys,  			rw->value, rw->pc, 0);  		break;  	case MMIO_UNKNOWN_OP:  		ret = trace_seq_printf(s, -			"UNKNOWN %lu.%06lu %d 0x%lx %02x,%02x,%02x 0x%lx %d\n", -			secs, usec_rem, rw->map_id, rw->phys, +			"UNKNOWN %lu.%06lu %d 0x%llx %02x,%02x,%02x 0x%lx %d\n", +			secs, usec_rem, rw->map_id, +			(unsigned long long)rw->phys,  			(rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff,  			(rw->value >> 0) & 0xff, rw->pc, 0);  		break; @@ -223,8 +226,9 @@ static int mmio_print_map(struct trace_iterator *iter)  	switch (entry->mmiorw.opcode) {  	case MMIO_PROBE:  		ret = trace_seq_printf(s, -			"MAP %lu.%06lu %d 0x%lx 0x%lx 0x%lx 0x%lx %d\n", -			secs, usec_rem, m->map_id, m->phys, m->virt, m->len, +			"MAP %lu.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n", +			secs, usec_rem, m->map_id, +			(unsigned long long)m->phys, m->virt, m->len,  			0UL, 0);  		break;  	case MMIO_UNPROBE:  | 
