summaryrefslogtreecommitdiff
path: root/arch
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 /arch
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 'arch')
-rw-r--r--arch/x86/pci/sta2x11-fixup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
index c313d784efab..11c0e80b9ed4 100644
--- a/arch/x86/pci/sta2x11-fixup.c
+++ b/arch/x86/pci/sta2x11-fixup.c
@@ -15,7 +15,6 @@
#include <asm/iommu.h>
#define STA2X11_SWIOTLB_SIZE (4*1024*1024)
-extern int swiotlb_late_init_with_default_size(size_t default_size);
/*
* We build a list of bus numbers that are under the ConneXt. The