summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-14 22:00:02 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-14 22:00:02 +0300
commit79db2b74aa146384dc8a962495f43941e5a91ee6 (patch)
tree7eb7913af3ba11eb2fd9d413c9dd9f68927cb4d7 /include
parentdefb53a7c790f9e37a765de8a5d830ed15e2055b (diff)
parentb51e627158cb0f67569aa46b5a08b568d20a81a4 (diff)
downloadlinux-79db2b74aa146384dc8a962495f43941e5a91ee6.tar.xz
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 'include')
-rw-r--r--include/linux/swiotlb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 046bb94bd4d6..513913ff7486 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -34,6 +34,7 @@ int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
extern unsigned long swiotlb_nr_tbl(void);
unsigned long swiotlb_size_or_default(void);
extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
+extern int swiotlb_late_init_with_default_size(size_t default_size);
extern void __init swiotlb_update_mem_attributes(void);
/*