* [PATCH 20/23] s390: Use HAVE_MEMBLOCK_NODE_MAP [not found] <1322508685-32532-1-git-send-email-tj@kernel.org> @ 2011-11-28 19:31 ` Tejun Heo 0 siblings, 0 replies; 3+ messages in thread From: Tejun Heo @ 2011-11-28 19:31 UTC (permalink / raw) To: benh, yinghai, hpa, tony.luck, ralf, schwidefsky, liqin.chen, lethal, davem, linux-kernel, linux-arch, mingo, jonas, lennox.wu Cc: Tejun Heo, Heiko Carstens, linux-s390 s390 used early_node_map[] just to prime free_area_init_nodes(). Now memblock can be used for the same purpose and early_node_map[] is scheduled to be dropped. Use memblock instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux-s390@vger.kernel.org --- arch/s390/Kconfig | 3 +++ arch/s390/kernel/setup.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 373679b..e383caf 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -92,6 +92,9 @@ config S390 select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 select HAVE_RCU_TABLE_FREE if SMP select ARCH_SAVE_PAGE_KEYS if HIBERNATION + select HAVE_MEMBLOCK + select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK select ARCH_INLINE_SPIN_TRYLOCK select ARCH_INLINE_SPIN_TRYLOCK_BH select ARCH_INLINE_SPIN_LOCK diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index e58a462..a2850df 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/sched.h> #include <linux/kernel.h> +#include <linux/memblock.h> #include <linux/mm.h> #include <linux/stddef.h> #include <linux/unistd.h> @@ -820,7 +821,8 @@ setup_memory(void) end_chunk = min(end_chunk, end_pfn); if (start_chunk >= end_chunk) continue; - add_active_range(0, start_chunk, end_chunk); + memblock_add_node(PFN_PHYS(start_chunk), + PFN_PHYS(end_chunk - start_chunk), 0); pfn = max(start_chunk, start_pfn); for (; pfn < end_chunk; pfn++) page_set_storage_key(PFN_PHYS(pfn), -- 1.7.3.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <1311694534-5161-1-git-send-email-tj@kernel.org>]
* [PATCH 20/23] s390: Use HAVE_MEMBLOCK_NODE_MAP [not found] <1311694534-5161-1-git-send-email-tj@kernel.org> @ 2011-07-26 15:35 ` Tejun Heo 2011-07-26 15:35 ` Tejun Heo 1 sibling, 0 replies; 3+ messages in thread From: Tejun Heo @ 2011-07-26 15:35 UTC (permalink / raw) To: benh, yinghai, hpa, tony.luck, ralf, schwidefsky, liqin.chen, lethal, davem Cc: mingo, Tejun Heo, Heiko Carstens, linux-s390 s390 used early_node_map[] just to prime free_area_init_nodes(). Now memblock can be used for the same purpose and early_node_map[] is scheduled to be dropped. Use memblock instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux-s390@vger.kernel.org --- Only compile tested. arch/s390/Kconfig | 3 +++ arch/s390/kernel/setup.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c03fef7..e0c3929 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -90,6 +90,9 @@ config S390 select HAVE_ARCH_MUTEX_CPU_RELAX select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 select HAVE_RCU_TABLE_FREE if SMP + select HAVE_MEMBLOCK + select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK select ARCH_INLINE_SPIN_TRYLOCK select ARCH_INLINE_SPIN_TRYLOCK_BH select ARCH_INLINE_SPIN_LOCK diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 0c35dee..5b4e48a 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/sched.h> #include <linux/kernel.h> +#include <linux/memblock.h> #include <linux/mm.h> #include <linux/stddef.h> #include <linux/unistd.h> @@ -596,7 +597,8 @@ setup_memory(void) end_chunk = min(end_chunk, end_pfn); if (start_chunk >= end_chunk) continue; - add_active_range(0, start_chunk, end_chunk); + memblock_add_node(PFN_PHYS(start_chunk), + PFN_PHYS(end_chunk - start_chunk), 0); pfn = max(start_chunk, start_pfn); for (; pfn < end_chunk; pfn++) page_set_storage_key(PFN_PHYS(pfn), -- 1.7.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 20/23] s390: Use HAVE_MEMBLOCK_NODE_MAP [not found] <1311694534-5161-1-git-send-email-tj@kernel.org> 2011-07-26 15:35 ` Tejun Heo @ 2011-07-26 15:35 ` Tejun Heo 1 sibling, 0 replies; 3+ messages in thread From: Tejun Heo @ 2011-07-26 15:35 UTC (permalink / raw) To: benh, yinghai, hpa, tony.luck, ralf, schwidefsky, liqin.chen, lethal, davem, linux-kernel, linux-arch Cc: mingo, Tejun Heo, Heiko Carstens, linux-s390 s390 used early_node_map[] just to prime free_area_init_nodes(). Now memblock can be used for the same purpose and early_node_map[] is scheduled to be dropped. Use memblock instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux-s390@vger.kernel.org --- Only compile tested. arch/s390/Kconfig | 3 +++ arch/s390/kernel/setup.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c03fef7..e0c3929 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -90,6 +90,9 @@ config S390 select HAVE_ARCH_MUTEX_CPU_RELAX select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 select HAVE_RCU_TABLE_FREE if SMP + select HAVE_MEMBLOCK + select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK select ARCH_INLINE_SPIN_TRYLOCK select ARCH_INLINE_SPIN_TRYLOCK_BH select ARCH_INLINE_SPIN_LOCK diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 0c35dee..5b4e48a 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/sched.h> #include <linux/kernel.h> +#include <linux/memblock.h> #include <linux/mm.h> #include <linux/stddef.h> #include <linux/unistd.h> @@ -596,7 +597,8 @@ setup_memory(void) end_chunk = min(end_chunk, end_pfn); if (start_chunk >= end_chunk) continue; - add_active_range(0, start_chunk, end_chunk); + memblock_add_node(PFN_PHYS(start_chunk), + PFN_PHYS(end_chunk - start_chunk), 0); pfn = max(start_chunk, start_pfn); for (; pfn < end_chunk; pfn++) page_set_storage_key(PFN_PHYS(pfn), -- 1.7.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-28 19:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1322508685-32532-1-git-send-email-tj@kernel.org>
2011-11-28 19:31 ` [PATCH 20/23] s390: Use HAVE_MEMBLOCK_NODE_MAP Tejun Heo
[not found] <1311694534-5161-1-git-send-email-tj@kernel.org>
2011-07-26 15:35 ` Tejun Heo
2011-07-26 15:35 ` Tejun Heo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox