---

yaml --- r: 367966 b: refs/heads/master c: 5c883b4 h: refs/heads/master v: v3
git-mirror · May 1, 2013 · 962d26a · 962d26a
1 parent 1447b7c
commit 962d26a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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