aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:09:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:09:16 -0700
commit8f2a0029b8aaed9fb37d775dbe527e163920b129 (patch)
tree771b9ce7983e36452a480340984f6e06fcc5eceb
parent06f01e73ef1064d81b010e84941b01a15e2745ed (diff)
parent42537eff861baccf3912e16ac4fd15a10fda2136 (diff)
downloadnovena-linux-8f2a0029b8aaed9fb37d775dbe527e163920b129.tar.gz
novena-linux-8f2a0029b8aaed9fb37d775dbe527e163920b129.tar.bz2
novena-linux-8f2a0029b8aaed9fb37d775dbe527e163920b129.zip
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra: arm: tegra: VMALLOC_END should be unsigned long arm: tegra: fix compilation of board-harmony.c
-rw-r--r--arch/arm/mach-tegra/board-harmony.c2
-rw-r--r--arch/arm/mach-tegra/include/mach/vmalloc.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 05e78dd9b50..9e305de56be 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -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;
}
diff --git a/arch/arm/mach-tegra/include/mach/vmalloc.h b/arch/arm/mach-tegra/include/mach/vmalloc.h
index 267a141730d..fd6aa65b2dc 100644
--- a/arch/arm/mach-tegra/include/mach/vmalloc.h
+++ b/arch/arm/mach-tegra/include/mach/vmalloc.h
@@ -23,6 +23,6 @@
#include <asm/sizes.h>
-#define VMALLOC_END 0xFE000000
+#define VMALLOC_END 0xFE000000UL
#endif