Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-arm / arch-ebsa285 / memory.h

diff --git a/include/asm-arm/arch-ebsa285/memory.h b/include/asm-arm/arch-ebsa285/memory.h
index 42912ef..99181ff 100644 (file)
--- a/include/asm-arm/arch-ebsa285/memory.h
+++ b/include/asm-arm/arch-ebsa285/memory.h
@@ -16,8 +16,8 @@
  *                     Renamed to memory.h
  *                     Moved PAGE_OFFSET and TASK_SIZE here
  */
-#ifndef __ASM_ARCH_MMU_H
-#define __ASM_ARCH_MMU_H
+#ifndef __ASM_ARCH_MEMORY_H
+#define __ASM_ARCH_MEMORY_H
 
 #include <linux/config.h>
 
@@ -34,9 +34,7 @@ extern unsigned long __bus_to_virt(unsigned long);
 
 #elif defined(CONFIG_FOOTBRIDGE_HOST)
 
-#define __virt_to_bus__is_a_macro
 #define __virt_to_bus(x)       ((x) - 0xe0000000)
-#define __bus_to_virt__is_a_macro
 #define __bus_to_virt(x)       ((x) + 0xe0000000)
 
 #else
@@ -48,14 +46,24 @@ extern unsigned long __bus_to_virt(unsigned long);
 #if defined(CONFIG_ARCH_FOOTBRIDGE)
 
 /* Task size and page offset at 3GB */
-#define TASK_SIZE              (0xbf000000UL)
-#define PAGE_OFFSET            (0xc0000000UL)
+#define TASK_SIZE              UL(0xbf000000)
+#define PAGE_OFFSET            UL(0xc0000000)
+
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE             0xf9000000
 
 #elif defined(CONFIG_ARCH_CO285)
 
 /* Task size and page offset at 1.5GB */
-#define TASK_SIZE              (0x5f000000UL)
-#define PAGE_OFFSET            (0x60000000UL)
+#define TASK_SIZE              UL(0x5f000000)
+#define PAGE_OFFSET            UL(0x60000000)
+
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE             0x7e000000
 
 #else
 
@@ -63,8 +71,10 @@ extern unsigned long __bus_to_virt(unsigned long);
 
 #endif
 
-#define TASK_SIZE_26           (0x04000000UL)
-#define PHYS_OFFSET            (0x00000000UL)
+/*
+ * Physical DRAM offset.
+ */
+#define PHYS_OFFSET            UL(0x00000000)
 
 /*
  * This decides where the kernel will search for a free chunk of vm
@@ -72,12 +82,6 @@ extern unsigned long __bus_to_virt(unsigned long);
  */
 #define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)
 
-/*
- * The DRAM is always contiguous.
- */
-#define __virt_to_phys__is_a_macro
-#define __virt_to_phys(vpage) ((unsigned long)(vpage) - PAGE_OFFSET)
-#define __phys_to_virt__is_a_macro
-#define __phys_to_virt(ppage) ((unsigned long)(ppage) + PAGE_OFFSET)
+#define FLUSH_BASE_PHYS                0x50000000
 
 #endif