diff options
author | 2010-08-06 18:13:19 +0100 | |
---|---|---|
committer | 2010-08-06 18:13:19 +0100 | |
commit | 500b9fc922cbec572f4fd1436533bfaed5011262 (patch) | |
tree | aac4b7de0871e66740aeaf3510f7a59280026592 /arch/arm/mach-shmobile/include/mach/vmalloc.h | |
parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable (diff) | |
parent | ARM: mach-shmobile: Fix up ap4evb build for LCDC merge damage. (diff) | |
download | linux-dev-500b9fc922cbec572f4fd1436533bfaed5011262.tar.xz linux-dev-500b9fc922cbec572f4fd1436533bfaed5011262.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/net/irda/sh_irda.c
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/vmalloc.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/vmalloc.h b/arch/arm/mach-shmobile/include/mach/vmalloc.h index fb3c4f1ab252..4aecf6e3a859 100644 --- a/arch/arm/mach-shmobile/include/mach/vmalloc.h +++ b/arch/arm/mach-shmobile/include/mach/vmalloc.h @@ -1,6 +1,7 @@ #ifndef __ASM_MACH_VMALLOC_H #define __ASM_MACH_VMALLOC_H -#define VMALLOC_END (PAGE_OFFSET + 0x24000000) +/* Vmalloc at ... - 0xe5ffffff */ +#define VMALLOC_END 0xe6000000 #endif /* __ASM_MACH_VMALLOC_H */ |