tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 8f2a0029 06f01e73

+1 -3
-2
arch/arm/mach-tegra/board-harmony.c
··· 91 91 { 92 92 mi->nr_banks = 2; 93 93 mi->bank[0].start = PHYS_OFFSET; 94 - mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET); 95 94 mi->bank[0].size = 448 * SZ_1M; 96 95 mi->bank[1].start = SZ_512M; 97 - mi->bank[1].node = PHYS_TO_NID(SZ_512M); 98 96 mi->bank[1].size = SZ_512M; 99 97 } 100 98
+1 -1
arch/arm/mach-tegra/include/mach/vmalloc.h
··· 23 23 24 24 #include <asm/sizes.h> 25 25 26 - #define VMALLOC_END 0xFE000000 26 + #define VMALLOC_END 0xFE000000UL 27 27 28 28 #endif