diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 08:45:58 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 08:45:58 -0400 |
| commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch) | |
| tree | b913718405d44a921905ac71044fbde410256865 /lib | |
| parent | 57bdfdd80077addf518a9b90c4a66890efc4f70e (diff) | |
| parent | 89abfab133ef1f5902abafb744df72793213ac19 (diff) | |
Merge branch 'master' into for-next
Conflicts:
include/linux/mmzone.h
Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/swiotlb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 414f46ed1dcd..45bc1f83a5ad 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
| @@ -130,11 +130,9 @@ void swiotlb_print_info(void) | |||
| 130 | pstart = virt_to_phys(io_tlb_start); | 130 | pstart = virt_to_phys(io_tlb_start); |
| 131 | pend = virt_to_phys(io_tlb_end); | 131 | pend = virt_to_phys(io_tlb_end); |
| 132 | 132 | ||
| 133 | printk(KERN_INFO "Placing %luMB software IO TLB between %p - %p\n", | 133 | printk(KERN_INFO "software IO TLB [mem %#010llx-%#010llx] (%luMB) mapped at [%p-%p]\n", |
| 134 | bytes >> 20, io_tlb_start, io_tlb_end); | 134 | (unsigned long long)pstart, (unsigned long long)pend - 1, |
| 135 | printk(KERN_INFO "software IO TLB at phys %#llx - %#llx\n", | 135 | bytes >> 20, io_tlb_start, io_tlb_end - 1); |
| 136 | (unsigned long long)pstart, | ||
| 137 | (unsigned long long)pend); | ||
| 138 | } | 136 | } |
| 139 | 137 | ||
| 140 | void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) | 138 | void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) |