The Kconfig symbol ARCH_POPULATES_NODE_MAP was killed in v3.3. After
that it popped up again in microblaze and metag. Nobody noticed,
probably because these Kconfig symbols are entirely unused and these
architectures both select HAVE_MEMBLOCK_NODE_MAP. Anyhow, these two
entries can also be killed.
Signed-off-by: Paul Bolle <[email protected]>
---
Untested.
arch/metag/mm/Kconfig | 3 ---
arch/microblaze/Kconfig | 3 ---
2 files changed, 6 deletions(-)
diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig
index 975f2f4..794f26a 100644
--- a/arch/metag/mm/Kconfig
+++ b/arch/metag/mm/Kconfig
@@ -98,9 +98,6 @@ config MAX_ACTIVE_REGIONS
default "2" if SPARSEMEM
default "1"
-config ARCH_POPULATES_NODE_MAP
- def_bool y
-
config ARCH_SELECT_MEMORY_MODEL
def_bool y
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1323fa2..173ab2c 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -38,9 +38,6 @@ config RWSEM_GENERIC_SPINLOCK
config ZONE_DMA
def_bool y
-config ARCH_POPULATES_NODE_MAP
- def_bool y
-
config RWSEM_XCHGADD_ALGORITHM
bool
--
1.7.11.7
On 03/20/2013 11:25 AM, Paul Bolle wrote:
> The Kconfig symbol ARCH_POPULATES_NODE_MAP was killed in v3.3. After
> that it popped up again in microblaze and metag. Nobody noticed,
> probably because these Kconfig symbols are entirely unused and these
> architectures both select HAVE_MEMBLOCK_NODE_MAP. Anyhow, these two
> entries can also be killed.
Ah. We have done the developing on that on earlier version and
to mainline it went in 3.3 merge window that's why I didn't notice it.
If James wants to take this patch through his tree, I am ok with that
and here is my
Acked-by: Michal Simek <[email protected]>
Or if you want to take this through my microblaze tree, I am also ok
with that but please send me your ACK.
Thanks for this patch,
Michal
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
On 20/03/13 11:02, Michal Simek wrote:
> On 03/20/2013 11:25 AM, Paul Bolle wrote:
>> The Kconfig symbol ARCH_POPULATES_NODE_MAP was killed in v3.3. After
>> that it popped up again in microblaze and metag. Nobody noticed,
>> probably because these Kconfig symbols are entirely unused and these
>> architectures both select HAVE_MEMBLOCK_NODE_MAP. Anyhow, these two
>> entries can also be killed.
>
> Ah. We have done the developing on that on earlier version and
> to mainline it went in 3.3 merge window that's why I didn't notice it.
>
> If James wants to take this patch through his tree, I am ok with that
> and here is my
>
> Acked-by: Michal Simek <[email protected]>
>
> Or if you want to take this through my microblaze tree, I am also ok
> with that but please send me your ACK.
Thanks for the patch Paul. This was added to metag when we were on
2.6.34. I spotted the adding of HAVE_MEMBLOCK_NODE_MAP to SH in v3.3 and
did the same for metag, but didn't notice the removal of
ARCH_POPULATES_NODE_MAP.
I'm happy to take this patch for v3.10.
Cheers
James
2013/3/20 James Hogan <[email protected]>:
> On 20/03/13 11:02, Michal Simek wrote:
>> On 03/20/2013 11:25 AM, Paul Bolle wrote:
>>> The Kconfig symbol ARCH_POPULATES_NODE_MAP was killed in v3.3. After
>>> that it popped up again in microblaze and metag. Nobody noticed,
>>> probably because these Kconfig symbols are entirely unused and these
>>> architectures both select HAVE_MEMBLOCK_NODE_MAP. Anyhow, these two
>>> entries can also be killed.
>>
>> Ah. We have done the developing on that on earlier version and
>> to mainline it went in 3.3 merge window that's why I didn't notice it.
>>
>> If James wants to take this patch through his tree, I am ok with that
>> and here is my
>>
>> Acked-by: Michal Simek <[email protected]>
>>
>> Or if you want to take this through my microblaze tree, I am also ok
>> with that but please send me your ACK.
>
> Thanks for the patch Paul. This was added to metag when we were on
> 2.6.34. I spotted the adding of HAVE_MEMBLOCK_NODE_MAP to SH in v3.3 and
> did the same for metag, but didn't notice the removal of
> ARCH_POPULATES_NODE_MAP.
>
> I'm happy to take this patch for v3.10.
Ok. Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform