Merge tag 'fixes-2021-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

b4459f44 · Linus Torvalds <[email protected]> · 2021-01-18 11:17:18 -08:00

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

Commit: b4459f4413c890a35dfcecaff29d37ac65607d76
Parents: fd3958ea · 32c2bc8f

Merge commit. Changes below are compared with the first parent: fd3958ea.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/ia64/include/asm/sparsemem.h	modified	+1	−0	View file

arch/ia64/include/asm/sparsemem.h

View file

diff --git a/arch/ia64/include/asm/sparsemem.h b/arch/ia64/include/asm/sparsemem.h
index dd8c166..42ed524 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