From 962d26af3306511b4d1300456787b7b43ff188f7 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Mon, 8 Apr 2013 19:03:05 -0500 Subject: [PATCH] --- yaml --- r: 367966 b: refs/heads/master c: 5c883b462aa5ecde3da6cabdca00f6abac22aa74 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/hexagon/include/asm/mem-layout.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6bc1565b4770..60f8067b488c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e1150542fd1d75fe2b6c3491415c860cdc06be2 +refs/heads/master: 5c883b462aa5ecde3da6cabdca00f6abac22aa74 diff --git a/trunk/arch/hexagon/include/asm/mem-layout.h b/trunk/arch/hexagon/include/asm/mem-layout.h index 2cb7a706208f..60556f8c45d8 100644 --- a/trunk/arch/hexagon/include/asm/mem-layout.h +++ b/trunk/arch/hexagon/include/asm/mem-layout.h @@ -72,8 +72,7 @@ extern int max_kernel_seg; * supposed to be based on the amount of physical memory available */ -#define VMALLOC_START (PAGE_OFFSET + VMALLOC_OFFSET + \ - (unsigned long)high_memory) +#define VMALLOC_START ((unsigned long) __va(high_memory + VMALLOC_OFFSET)) /* Gap between physical ram and vmalloc space for guard purposes. */ #define VMALLOC_OFFSET PAGE_SIZE