From: Tejun Heo <tj@kernel.org> To: mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de, benh@kernel.crashing.org, yinghai@kernel.org, davem@davemloft.net Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, x86@kernel.org Subject: [PATCH UPDATED 12/13] memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option Date: Thu, 14 Jul 2011 11:46:03 +0200 [thread overview] Message-ID: <20110714094603.GH3455@htj.dyndns.org> (raw) In-Reply-To: <1310462166-31469-13-git-send-email-tj@kernel.org> >From 6839454ae63f1eb21e515c10229ca95c22955fec Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Thu, 14 Jul 2011 11:22:17 +0200 Make ARCH_DISCARD_MEMBLOCK a config option so that it can be handled together with other MEMBLOCK options. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> --- Nothing really changed. Just patch context update to resolve conflict from updates earlier in the series. Thanks. arch/x86/Kconfig | 1 + arch/x86/include/asm/memblock.h | 2 -- include/linux/memblock.h | 2 +- mm/Kconfig | 3 +++ mm/memblock.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 97f0894..28116d4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -26,6 +26,7 @@ config X86 select HAVE_KPROBES select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_FRAME_POINTERS select HAVE_DMA_ATTRS diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h index 17a882e..bc56670 100644 --- a/arch/x86/include/asm/memblock.h +++ b/arch/x86/include/asm/memblock.h @@ -1,8 +1,6 @@ #ifndef _X86_MEMBLOCK_H #define _X86_MEMBLOCK_H -#define ARCH_DISCARD_MEMBLOCK - void memblock_x86_reserve_range(u64 start, u64 end, char *name); void memblock_x86_free_range(u64 start, u64 end); diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 31def58..2491355 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -197,7 +197,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo region++) -#ifdef ARCH_DISCARD_MEMBLOCK +#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK #define __init_memblock __meminit #define __initdata_memblock __meminitdata #else diff --git a/mm/Kconfig b/mm/Kconfig index 30a5d47..7c56971 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -134,6 +134,9 @@ config HAVE_MEMBLOCK config HAVE_MEMBLOCK_NODE_MAP boolean +config ARCH_DISCARD_MEMBLOCK + boolean + # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" diff --git a/mm/memblock.c b/mm/memblock.c index c4a8750..ebc6119 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -959,7 +959,7 @@ static int __init early_memblock(char *p) } early_param("memblock", early_memblock); -#if defined(CONFIG_DEBUG_FS) && !defined(ARCH_DISCARD_MEMBLOCK) +#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK) static int memblock_debug_show(struct seq_file *m, void *private) { -- 1.7.6
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org> To: mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de, benh@kernel.crashing.org, yinghai@kernel.org, davem@davemloft.net Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, x86@kernel.org Subject: [PATCH UPDATED 12/13] memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option Date: Thu, 14 Jul 2011 11:46:03 +0200 [thread overview] Message-ID: <20110714094603.GH3455@htj.dyndns.org> (raw) In-Reply-To: <1310462166-31469-13-git-send-email-tj@kernel.org> From 6839454ae63f1eb21e515c10229ca95c22955fec Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Thu, 14 Jul 2011 11:22:17 +0200 Make ARCH_DISCARD_MEMBLOCK a config option so that it can be handled together with other MEMBLOCK options. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> --- Nothing really changed. Just patch context update to resolve conflict from updates earlier in the series. Thanks. arch/x86/Kconfig | 1 + arch/x86/include/asm/memblock.h | 2 -- include/linux/memblock.h | 2 +- mm/Kconfig | 3 +++ mm/memblock.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 97f0894..28116d4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -26,6 +26,7 @@ config X86 select HAVE_KPROBES select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_FRAME_POINTERS select HAVE_DMA_ATTRS diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h index 17a882e..bc56670 100644 --- a/arch/x86/include/asm/memblock.h +++ b/arch/x86/include/asm/memblock.h @@ -1,8 +1,6 @@ #ifndef _X86_MEMBLOCK_H #define _X86_MEMBLOCK_H -#define ARCH_DISCARD_MEMBLOCK - void memblock_x86_reserve_range(u64 start, u64 end, char *name); void memblock_x86_free_range(u64 start, u64 end); diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 31def58..2491355 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -197,7 +197,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo region++) -#ifdef ARCH_DISCARD_MEMBLOCK +#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK #define __init_memblock __meminit #define __initdata_memblock __meminitdata #else diff --git a/mm/Kconfig b/mm/Kconfig index 30a5d47..7c56971 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -134,6 +134,9 @@ config HAVE_MEMBLOCK config HAVE_MEMBLOCK_NODE_MAP boolean +config ARCH_DISCARD_MEMBLOCK + boolean + # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" diff --git a/mm/memblock.c b/mm/memblock.c index c4a8750..ebc6119 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -959,7 +959,7 @@ static int __init early_memblock(char *p) } early_param("memblock", early_memblock); -#if defined(CONFIG_DEBUG_FS) && !defined(ARCH_DISCARD_MEMBLOCK) +#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK) static int memblock_debug_show(struct seq_file *m, void *private) { -- 1.7.6
next prev parent reply other threads:[~2011-07-14 9:46 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-12 9:15 [PATCHSET x86/mm] memblock, x86: Allow node info in memblock and remove x86 specific memblock code Tejun Heo 2011-07-12 9:15 ` [PATCH 01/13] memblock: Remove memblock_memory_can_coalesce() Tejun Heo 2011-07-14 21:31 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:15 ` [PATCH 02/13] memblock: Reimplement memblock_add_region() Tejun Heo 2011-07-14 21:32 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:15 ` [PATCH 03/13] memblock: Add optional region->nid Tejun Heo 2011-07-14 9:43 ` [PATCH UPDATED " Tejun Heo 2011-07-14 9:43 ` Tejun Heo 2011-07-14 21:32 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:15 ` [PATCH 04/13] x86: Use HAVE_MEMBLOCK_NODE_MAP Tejun Heo 2011-07-14 1:35 ` H. Peter Anvin 2011-07-14 9:44 ` [PATCH UPDATED " Tejun Heo 2011-07-14 9:44 ` Tejun Heo 2011-07-14 21:33 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:15 ` [PATCH 05/13] x86: Use __memblock_alloc_base() in early_reserve_e820() Tejun Heo 2011-07-14 21:33 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:15 ` [PATCH 06/13] memblock: Implement for_each_free_mem_range() Tejun Heo 2011-07-14 21:34 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 07/13] x86: Replace memblock_x86_find_in_range_size() with for_each_free_mem_range() Tejun Heo 2011-07-14 21:34 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 08/13] memblock, x86: Make free_all_memory_core_early() explicitly free lowmem only Tejun Heo 2011-07-14 21:35 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 09/13] memblock, x86: Replace __get_free_all_memory_range() with for_each_free_mem_range() Tejun Heo 2011-07-14 21:35 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 10/13] memblock, x86: Reimplement memblock_find_dma_reserve() using iterators Tejun Heo 2011-07-14 21:36 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 11/13] x86: Use absent_pages_in_range() instead of memblock_x86_hole_size() Tejun Heo 2011-07-14 21:36 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 12/13] memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option Tejun Heo 2011-07-14 9:46 ` Tejun Heo [this message] 2011-07-14 9:46 ` [PATCH UPDATED " Tejun Heo 2011-07-14 21:37 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-12 9:16 ` [PATCH 13/13] memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones Tejun Heo 2011-07-14 20:10 ` H. Peter Anvin 2011-07-14 20:20 ` Tejun Heo 2011-07-14 20:23 ` H. Peter Anvin 2011-07-14 20:32 ` Tejun Heo 2011-07-14 20:38 ` H. Peter Anvin 2011-07-14 20:41 ` Tejun Heo 2011-07-14 20:43 ` H. Peter Anvin 2011-07-14 21:38 ` [tip:x86/memblock] memblock: Cast phys_addr_t to unsigned long long for printf use tip-bot for H. Peter Anvin 2011-07-14 21:37 ` [tip:x86/memblock] memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones tip-bot for Tejun Heo 2011-07-26 21:06 ` [PATCH 13/13] " Yinghai Lu 2011-07-26 21:46 ` Tejun Heo 2011-07-27 0:59 ` Yinghai Lu 2011-07-27 8:07 ` Tejun Heo 2011-07-12 23:26 ` [PATCHSET x86/mm] memblock, x86: Allow node info in memblock and remove x86 specific memblock code Yinghai Lu 2011-07-13 3:21 ` H. Peter Anvin 2011-07-13 9:16 ` Tejun Heo 2011-07-13 9:11 ` Tejun Heo 2011-07-13 19:06 ` Yinghai Lu 2011-07-14 9:42 ` [PATCH 2.5/13] memblock: Use __meminit[data] instead of __init[data] Tejun Heo 2011-07-14 9:42 ` Tejun Heo 2011-07-14 21:00 ` Yinghai Lu 2011-07-14 21:24 ` H. Peter Anvin 2011-07-14 21:24 ` H. Peter Anvin 2011-07-15 5:45 ` Tejun Heo 2011-07-14 21:32 ` [tip:x86/memblock] " tip-bot for Tejun Heo 2011-07-14 9:49 ` [PATCHSET x86/mm] memblock, x86: Allow node info in memblock and remove x86 specific memblock code Tejun Heo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110714094603.GH3455@htj.dyndns.org \ --to=tj@kernel.org \ --cc=benh@kernel.crashing.org \ --cc=davem@davemloft.net \ --cc=hpa@zytor.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --cc=yinghai@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.