Skip to contentSkip to conversation

ARM: keystone: remove SECTION_SIZE_BITS/MAX_PHYSMEM_BITS

PATCH Applied Arnd Bergmann 3 participants 4 messages Dec 3, 2020 – Dec 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: keystone: remove SECTION_SIZE_BITS/MAX_PHYSMEM_BITS

From: Arnd Bergmann <[email protected]>

These definitions are evidently left over from the days when sparsemem settings were platform specific. This was no longer the case when the platform got merged.

There was no warning in the past, but now the asm/sparsemem.h header ends up being included indirectly, causing this warning:

In file included from /git/arm-soc/arch/arm/mach-keystone/keystone.c:24:
arch/arm/mach-keystone/memory.h:10:9: warning: 'SECTION_SIZE_BITS' macro redefined [-Wmacro-redefined]

 #define SECTION_SIZE_BITS       34
        ^
arch/arm/include/asm/sparsemem.h:23:9: note: previous definition is here
 #define SECTION_SIZE_BITS       28
        ^

Clearly the definitions never had any effect here, so remove them.

---
 arch/arm/mach-keystone/memory.h | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/mach-keystone/memory.h +0 -3
index 9147565d0581..1b9ed1271e05 100644
@@ -6,9 +6,6 @@
 #ifndef __MEMORY_H
 #define __MEMORY_H
 
-#define MAX_PHYSMEM_BITS	36
-#define SECTION_SIZE_BITS	34
-
 #define KEYSTONE_LOW_PHYS_START		0x80000000ULL
 #define KEYSTONE_LOW_PHYS_SIZE		0x80000000ULL /* 2G */
 #define KEYSTONE_LOW_PHYS_END		(KEYSTONE_LOW_PHYS_START + \
Signature · 1 line
2.27.0
Acked-by Santosh Shilimkar on v1 1/1
#1 lore raw
Quoted 17 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

These definitions are evidently left over from the days when sparsemem settings were platform specific. This was no longer the case when the platform got merged.

There was no warning in the past, but now the asm/sparsemem.h header ends up being included indirectly, causing this warning:

In file included from /git/arm-soc/arch/arm/mach-keystone/keystone.c:24:
arch/arm/mach-keystone/memory.h:10:9: warning: 'SECTION_SIZE_BITS' macro redefined [-Wmacro-redefined]

  #define SECTION_SIZE_BITS       34
         ^
arch/arm/include/asm/sparsemem.h:23:9: note: previous definition is here
  #define SECTION_SIZE_BITS       28
         ^
Quoted 4 lines

Clearly the definitions never had any effect here, so remove them.

---

author Applied
#2 lore raw
In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Quoted 8 lines · Arnd Bergmann

These definitions are evidently left over from the days when sparsemem settings were platform specific. This was no longer the case when the platform got merged.

There was no warning in the past, but now the asm/sparsemem.h header ends up being included indirectly, causing this warning:

[...]

Applied to arm/fixes, thanks!

[1/1] ARM: keystone: remove SECTION_SIZE_BITS/MAX_PHYSMEM_BITS

      commit: 9280f726097b436c8c907825131cd346d7eb0c0f

       Arnd
#3 lore raw
In reply to Arnd Bergmann
This patch was applied to soc/soc.git (refs/heads/arm/fixes):

Hello:

This patch was applied to soc/soc.git (refs/heads/arm/fixes):

Quoted 10 lines · On Fri, 4 Dec 2020 00:18:40 +0100 you wrote:

From: Arnd Bergmann <[email protected]>

These definitions are evidently left over from the days when sparsemem settings were platform specific. This was no longer the case when the platform got merged.

There was no warning in the past, but now the asm/sparsemem.h header ends up being included indirectly, causing this warning:

[...]

Here is the summary with links:
- ARM: keystone: remove SECTION_SIZE_BITS/MAX_PHYSMEM_BITS

    https://git.kernel.org/soc/soc/c/9280f726097b

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html