diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-18 11:17:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-18 11:17:18 -0800 |
| commit | b4459f4413c890a35dfcecaff29d37ac65607d76 (patch) | |
| tree | 63a37e30b6c0403933cda5aae933a5e867028013 | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | ia64: fix build failure caused by memory model changes (diff) | |
| download | linux-dev-b4459f4413c890a35dfcecaff29d37ac65607d76.tar.xz linux-dev-b4459f4413c890a35dfcecaff29d37ac65607d76.zip | |
Merge tag 'fixes-2021-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull ia64 build fix from Mike Rapoport:
"Fix an ia64 build failure caused by memory model changes"
* tag 'fixes-2021-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
ia64: fix build failure caused by memory model changes
| -rw-r--r-- | arch/ia64/include/asm/sparsemem.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/sparsemem.h b/arch/ia64/include/asm/sparsemem.h index dd8c166ffd7b..42ed5248fae9 100644 --- a/arch/ia64/include/asm/sparsemem.h +++ b/arch/ia64/include/asm/sparsemem.h @@ -3,6 +3,7 @@ #define _ASM_IA64_SPARSEMEM_H #ifdef CONFIG_SPARSEMEM +#include <asm/page.h> /* * SECTION_SIZE_BITS 2^N: how big each section will be * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space |