Skip to content

Commit

Permalink
Merge tag 'fixes-2021-01-18' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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
  • Loading branch information
Linus Torvalds committed Jan 18, 2021
2 parents fd3958e + 32c2bc8 commit b4459f4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/ia64/include/asm/sparsemem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b4459f4

Please sign in to comment.