system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2010-08-28 14:09:16 -07:00
commit 8f2a0029b8
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-tegra/board-harmony.c
View file

@ -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;
}

2
arch/arm/mach-tegra/include/mach/vmalloc.h
View file

@ -23,6 +23,6 @@
#include <asm/sizes.h>
#define VMALLOC_END 0xFE000000
#define VMALLOC_END 0xFE000000UL
#endif