Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f2a0029 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 06f01e73 42537eff

arch/arm/mach-tegra/board-harmony.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/arm/mach-tegra/include/mach/vmalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ 


#include <asm/sizes.h>



#define VMALLOC_END        0xFE000000

#define VMALLOC_END        0xFE000000UL



#endif