diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-14 12:00:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-14 12:00:02 -0700 |
| commit | 79db2b74aa146384dc8a962495f43941e5a91ee6 (patch) | |
| tree | 7eb7913af3ba11eb2fd9d413c9dd9f68927cb4d7 /kernel | |
| parent | defb53a7c790f9e37a765de8a5d830ed15e2055b (diff) | |
| parent | b51e627158cb0f67569aa46b5a08b568d20a81a4 (diff) | |
| download | linux-79db2b74aa146384dc8a962495f43941e5a91ee6.tar.bz2 | |
Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb updates from Konrad Rzeszutek Wilk:
"Minor enhancement of using %p to print phys_addr_r and also compiler
warnings"
* 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: Mark max_segment with static keyword
swiotlb: Declare swiotlb_late_init_with_default_size() in header
swiotlb: Use %pa to print phys_addr_t variables
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/swiotlb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index c19379fabd20..465a567678d9 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -93,7 +93,7 @@ static unsigned int io_tlb_index; * Max segment that we can provide which (if pages are contingous) will * not be bounced (unless SWIOTLB_FORCE is set). */ -unsigned int max_segment; +static unsigned int max_segment; /* * We need to save away the original address corresponding to a mapped entry @@ -172,9 +172,7 @@ void swiotlb_print_info(void) return; } - pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n", - (unsigned long long)io_tlb_start, - (unsigned long long)io_tlb_end, + pr_info("mapped [mem %pa-%pa] (%luMB)\n", &io_tlb_start, &io_tlb_end, bytes >> 20); } |