History

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

Linus Torvalds committed 6 years ago

Commit 79db2b72 parents defb53a b51e6273 files · +3 −5Browse files

Showing the changes to kernel (1 of 3 files). Show all

Unified · Split

kernel/dma/swiotlb.c+2−4
@@ -93,7 +93,7 @@ static unsigned int io_tlb_index; · 92 unmodified lines
9393 * Max segment that we can provide which (if pages are contingous) will
9494 * not be bounced (unless SWIOTLB_FORCE is set).
9595 */
96−unsigned int max_segment;
96+static unsigned int max_segment;
9797
9898 /*
9999 * We need to save away the original address corresponding to a mapped entry
@@ -172,9 +172,7 @@ void swiotlb_print_info(void) · 72 unmodified lines
172172 return;
173173 }
174174
175− pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n",
176− (unsigned long long)io_tlb_start,
177− (unsigned long long)io_tlb_end,
175+ pr_info("mapped [mem %pa-%pa] (%luMB)\n", &io_tlb_start, &io_tlb_end,
178176 bytes >> 20);
179177 }
180178

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t