diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-20 19:37:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-20 19:37:09 -0700 |
| commit | 778a33959a8ad4cb1ea2f4c5119f9e1e8b9f9d9b (patch) | |
| tree | a5de7c25f129ca823fb578c8c35868993558b7c8 /arch/ia64/Kconfig | |
| parent | 6b2edf27fe26c73cd67b6bf5ffb23dce882e1455 (diff) | |
| parent | f62800992e5917f2bed143dbcdce2501bc6933a9 (diff) | |
| download | linux-778a33959a8ad4cb1ea2f4c5119f9e1e8b9f9d9b.tar.gz linux-778a33959a8ad4cb1ea2f4c5119f9e1e8b9f9d9b.tar.bz2 linux-778a33959a8ad4cb1ea2f4c5119f9e1e8b9f9d9b.zip | |
Merge tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 NO_BOOTMEM conversion from Tony Luck:
"Mike Rapoport kindly fixed up ia64 to work with NO_BOOTMEM"
* tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: switch to NO_BOOTMEM
ia64: use mem_data to detect nodes' minimal and maximal PFNs
ia64: remove unused num_dma_physpages member from 'struct early_node_data'
ia64: contig/paging_init: reduce code duplication
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2bf4ef792f2c..8b4a0c1748c0 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -28,6 +28,7 @@ config IA64 select HAVE_ARCH_TRACEHOOK select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP + select NO_BOOTMEM select HAVE_VIRT_CPU_ACCOUNTING select ARCH_HAS_DMA_MARK_CLEAN select ARCH_HAS_SG_CHAIN |