diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:20:01 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:20:01 +0200 |
commit | 3cb9bc85029f2ceb7a5babadcab445c7cb861da8 (patch) | |
tree | 6453e9ebb9ad3b3cab07ff31dc9a90ea9f7951bc /include/linux/swiotlb.h | |
parent | f1a5b53570001b1bcbf890ac6c4be1db99f8cc28 (diff) | |
parent | 413d63d71b222108d19703f3fd5cf9108652a730 (diff) | |
download | linux-stable-3cb9bc85029f2ceb7a5babadcab445c7cb861da8.tar.gz linux-stable-3cb9bc85029f2ceb7a5babadcab445c7cb861da8.tar.bz2 linux-stable-3cb9bc85029f2ceb7a5babadcab445c7cb861da8.zip |
Merge branch 'x86/mm' into efi/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/swiotlb.h')
-rw-r--r-- | include/linux/swiotlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 4ee479f2f355..15e7160751a8 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -35,6 +35,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 void __init swiotlb_update_mem_attributes(void); /* * Enumeration for sync targets |