Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / mach-bcmring / include / mach / vmalloc.h

diff --git a/arch/arm/mach-bcmring/include/mach/vmalloc.h b/arch/arm/mach-bcmring/include/mach/vmalloc.h
index 35e2ead8395c5f05447bca5efeebd7c4e8d9cafe..7397bd7817d977db8283291d4544aeb2f3d9833d 100644 (file)
--- a/arch/arm/mach-bcmring/include/mach/vmalloc.h
+++ b/arch/arm/mach-bcmring/include/mach/vmalloc.h
@@ -22,4 +22,4 @@
  * 0xe0000000 to 0xefffffff. This gives us 256 MB of vm space and handles
  * larger physical memory designs better.
  */
-#define VMALLOC_END       (PAGE_OFFSET + 0x30000000)
+#define VMALLOC_END       0xf0000000UL