diff options
| author | Pekka Paalanen <pq@iki.fi> | 2008-05-12 15:21:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-24 05:27:36 -0400 |
| commit | dee310d0adf41019aca476052ac3085ff286d9be (patch) | |
| tree | 8e5b7982b787fc4036ad01a8a4a58accf9e15127 /kernel/trace | |
| 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/trace')
| -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 3c1dacdc2d85..b13dc19dcbb4 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) | |||
| 184 | switch (entry->mmiorw.opcode) { | 184 | switch (entry->mmiorw.opcode) { |
| 185 | case MMIO_READ: | 185 | case MMIO_READ: |
| 186 | ret = trace_seq_printf(s, | 186 | ret = trace_seq_printf(s, |
| 187 | "R %d %lu.%06lu %d 0x%lx 0x%lx 0x%lx %d\n", | 187 | "R %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", |
| 188 | rw->width, secs, usec_rem, rw->map_id, rw->phys, | 188 | rw->width, secs, usec_rem, rw->map_id, |
| 189 | (unsigned long long)rw->phys, | ||
| 189 | rw->value, rw->pc, 0); | 190 | rw->value, rw->pc, 0); |
| 190 | break; | 191 | break; |
| 191 | case MMIO_WRITE: | 192 | case MMIO_WRITE: |
| 192 | ret = trace_seq_printf(s, | 193 | ret = trace_seq_printf(s, |
| 193 | "W %d %lu.%06lu %d 0x%lx 0x%lx 0x%lx %d\n", | 194 | "W %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", |
| 194 | rw->width, secs, usec_rem, rw->map_id, rw->phys, | 195 | rw->width, secs, usec_rem, rw->map_id, |
| 196 | (unsigned long long)rw->phys, | ||
| 195 | rw->value, rw->pc, 0); | 197 | rw->value, rw->pc, 0); |
| 196 | break; | 198 | break; |
| 197 | case MMIO_UNKNOWN_OP: | 199 | case MMIO_UNKNOWN_OP: |
| 198 | ret = trace_seq_printf(s, | 200 | ret = trace_seq_printf(s, |
| 199 | "UNKNOWN %lu.%06lu %d 0x%lx %02x,%02x,%02x 0x%lx %d\n", | 201 | "UNKNOWN %lu.%06lu %d 0x%llx %02x,%02x,%02x 0x%lx %d\n", |
| 200 | secs, usec_rem, rw->map_id, rw->phys, | 202 | secs, usec_rem, rw->map_id, |
| 203 | (unsigned long long)rw->phys, | ||
| 201 | (rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff, | 204 | (rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff, |
| 202 | (rw->value >> 0) & 0xff, rw->pc, 0); | 205 | (rw->value >> 0) & 0xff, rw->pc, 0); |
| 203 | break; | 206 | break; |
| @@ -223,8 +226,9 @@ static int mmio_print_map(struct trace_iterator *iter) | |||
| 223 | switch (entry->mmiorw.opcode) { | 226 | switch (entry->mmiorw.opcode) { |
| 224 | case MMIO_PROBE: | 227 | case MMIO_PROBE: |
| 225 | ret = trace_seq_printf(s, | 228 | ret = trace_seq_printf(s, |
| 226 | "MAP %lu.%06lu %d 0x%lx 0x%lx 0x%lx 0x%lx %d\n", | 229 | "MAP %lu.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n", |
| 227 | secs, usec_rem, m->map_id, m->phys, m->virt, m->len, | 230 | secs, usec_rem, m->map_id, |
| 231 | (unsigned long long)m->phys, m->virt, m->len, | ||
| 228 | 0UL, 0); | 232 | 0UL, 0); |
| 229 | break; | 233 | break; |
| 230 | case MMIO_UNPROBE: | 234 | case MMIO_UNPROBE: |