diff options
| author | Wei Liu <wei.liu@kernel.org> | 2021-10-28 10:45:57 +0000 |
|---|---|---|
| committer | Wei Liu <wei.liu@kernel.org> | 2021-10-28 10:46:03 +0000 |
| commit | e82f2069b52fb350f4ea568957dcc5c9f3649999 (patch) | |
| tree | 218b976bfb985380a301c0317e08124d1e2cc39c /kernel | |
| parent | 7117dccaa014415c1c21e6b13d4b7c8880fb218e (diff) | |
| parent | e9d1d2bb75b2d5d4b426769c5aae0ce8cef3558f (diff) | |
| download | lwn-e82f2069b52fb350f4ea568957dcc5c9f3649999.tar.gz lwn-e82f2069b52fb350f4ea568957dcc5c9f3649999.zip | |
Merge remote-tracking branch 'tip/x86/cc' into hyperv-next
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/swiotlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 87c40517e822..c4ca040fdb05 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -34,7 +34,7 @@ #include <linux/highmem.h> #include <linux/gfp.h> #include <linux/scatterlist.h> -#include <linux/mem_encrypt.h> +#include <linux/cc_platform.h> #include <linux/set_memory.h> #ifdef CONFIG_DEBUG_FS #include <linux/debugfs.h> @@ -552,7 +552,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr, if (!mem) panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer"); - if (mem_encrypt_active()) + if (cc_platform_has(CC_ATTR_MEM_ENCRYPT)) pr_warn_once("Memory encryption is active and system is using DMA bounce buffers\n"); if (mapping_size > alloc_size) { |