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-sa1100 / memory.h

diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h
index 076b3a9..a29fac1 100644 (file)
--- a/include/asm-arm/arch-sa1100/memory.h
+++ b/include/asm-arm/arch-sa1100/memory.h
@@ -8,38 +8,25 @@
 #define __ASM_ARCH_MEMORY_H
 
 #include <linux/config.h>
+#include <asm/sizes.h>
 
 /*
- * Task size: 3GB
+ * Physical DRAM offset is 0xc0000000 on the SA1100
  */
-#define TASK_SIZE      (0xbf000000UL)
-#define TASK_SIZE_26   (0x04000000UL)
+#define PHYS_OFFSET    UL(0xc0000000)
 
-/*
- * This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE (0x40000000)
+#ifndef __ASSEMBLY__
 
-/*
- * Page offset: 3GB
- */
-#define PAGE_OFFSET    (0xc0000000UL)
+#ifdef CONFIG_SA1111
+void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
 
-/*
- * Physical DRAM offset is 0xc0000000 on the SA1100
- */
-#define PHYS_OFFSET    (0xc0000000UL)
+#define arch_adjust_zones(node, size, holes) \
+       sa1111_adjust_zones(node, size, holes)
 
-/*
- * We take advantage of the fact that physical and virtual address can be the
- * same.  The NUMA code is handling the large holes that might exist between
- * all memory banks.
- */
-#define __virt_to_phys__is_a_macro
-#define __phys_to_virt__is_a_macro
-#define __virt_to_phys(x)      (x)
-#define __phys_to_virt(x)      (x)
+#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_1M - 1)
+
+#endif
+#endif
 
 /*
  * Virtual view <-> DMA view memory address translations
@@ -50,8 +37,6 @@
  *
  * On the SA1100, bus addresses are equivalent to physical addresses.
  */
-#define __virt_to_bus__is_a_macro
-#define __bus_to_virt__is_a_macro
 #define __virt_to_bus(x)        __virt_to_phys(x)
 #define __bus_to_virt(x)        __phys_to_virt(x)
 
@@ -104,10 +89,13 @@
 #define LOCAL_MAP_NR(addr) \
        (((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT)
 
-#else
-
-#define PFN_TO_NID(addr)       (0)
-
 #endif
 
+/*
+ * Cache flushing area - SA1100 zero bank
+ */
+#define FLUSH_BASE_PHYS                0xe0000000
+#define FLUSH_BASE             0xf5000000
+#define FLUSH_BASE_MINICACHE   0xf5100000
+
 #endif