diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-25 07:19:19 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-09-25 07:19:19 +0300 |
| commit | 8c1c6c7588b2faf9dd45fb3cfb7497fd09bbfe7c (patch) | |
| tree | 50a7ddcfd7e7b1a7e4fb656bb88a036dbcff4bd6 /arch/ia64/kernel | |
| parent | 38225f2ef2f4263fc65acae63fdd4e8489c9ffcf (diff) | |
| parent | 171d4ff79f965c1f164705ef0aaea102a6ad238b (diff) | |
| download | linux-8c1c6c7588b2faf9dd45fb3cfb7497fd09bbfe7c.tar.xz | |
Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into dma-mapping-for-next
Pull in the latest 5.9 tree for the commit to revert the
V4L2_FLAG_MEMORY_NON_CONSISTENT uapi addition.
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/ia64_ksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index b49fe6f618ed..f8150ee74f29 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c @@ -3,7 +3,7 @@ * Architecture-specific kernel symbols */ -#ifdef CONFIG_VIRTUAL_MEM_MAP +#if defined(CONFIG_VIRTUAL_MEM_MAP) || defined(CONFIG_DISCONTIGMEM) #include <linux/compiler.h> #include <linux/export.h> #include <linux/memblock.h> |