Skip to contentSkip to conversation

arm: tegra: fix compilation of board-harmony.c

PATCH New Olof Johansson 2 participants 2 messages Aug 18, 2010 – Aug 22, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Tegra architecture support
lore
Share & tools
lore

Olof Johansson

author
#0 lore raw

PATCH 1/1 arm: tegra: fix compilation of board-harmony.c

The patch "ARM: Remove DISCONTIGMEM support" removed the node id from the meminfo struct and the PHYS_TO_NID macro, causing compilation errors:

arch/arm/mach-tegra/board-harmony.c: In function 'tegra_harmony_fixup':
arch/arm/mach-tegra/board-harmony.c:94: error: 'struct membank' has no member named 'node' arch/arm/mach-tegra/board-harmony.c:94: error: implicit declaration of function 'PHYS_TO_NID' arch/arm/mach-tegra/board-harmony.c:97: error: 'struct membank' has no member named 'node'

Signed-off-by Olof Johansson <[email protected]>
---
 arch/arm/mach-tegra/board-harmony.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-tegra/board-harmony.c +0 -2
index 05e78dd..9e305de 100644
@@ -91,10 +91,8 @@ static void __init tegra_harmony_fixup(struct machine_desc *desc,
 {
 	mi->nr_banks = 2;
 	mi->bank[0].start = PHYS_OFFSET;
-	mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET);
 	mi->bank[0].size = 448 * SZ_1M;
 	mi->bank[1].start = SZ_512M;
-	mi->bank[1].node = PHYS_TO_NID(SZ_512M);
 	mi->bank[1].size = SZ_512M;
 }
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 arm: tegra: fix compilation of board-harmony.c

Quoted 29 lines · Olof Johansson

The patch "ARM: Remove DISCONTIGMEM support" removed the node id from the meminfo struct and the PHYS_TO_NID macro, causing compilation errors:

arch/arm/mach-tegra/board-harmony.c: In function 'tegra_harmony_fixup':
arch/arm/mach-tegra/board-harmony.c:94: error: 'struct membank' has no member named 'node' arch/arm/mach-tegra/board-harmony.c:94: error: implicit declaration of function 'PHYS_TO_NID' arch/arm/mach-tegra/board-harmony.c:97: error: 'struct membank' has no member named 'node'

Signed-off-by Olof Johansson <[email protected]>

---
?arch/arm/mach-tegra/board-harmony.c | ? ?2 --
?1 files changed, 0 insertions(+), 2 deletions(-)

arch/arm/mach-tegra/board-harmony.c +0 -3
index 05e78dd..9e305de 100644
@@ -91,10 +91,8 @@ static void __init tegra_harmony_fixup(struct machine_desc *desc,
 ?{
 ? ? ? ?mi->nr_banks = 2;
 ? ? ? ?mi->bank[0].start = PHYS_OFFSET;
- ? ? ? mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET);
 ? ? ? ?mi->bank[0].size = 448 * SZ_1M;
 ? ? ? ?mi->bank[1].start = SZ_512M;
- ? ? ? mi->bank[1].node = PHYS_TO_NID(SZ_512M);
 ? ? ? ?mi->bank[1].size = SZ_512M;
 ?}
 
--
Quoted 3 lines

1.5.6.5

Ack, queued for an rc pull request