git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
32d3d5b
..
a29fac1
100644
(file)
--- a/
include/asm-arm/arch-sa1100/memory.h
+++ b/
include/asm-arm/arch-sa1100/memory.h
@@
-13,25
+13,15
@@
/*
* Physical DRAM offset is 0xc0000000 on the SA1100
*/
/*
* Physical DRAM offset is 0xc0000000 on the SA1100
*/
-#define PHYS_OFFSET
(0xc0000000UL
)
+#define PHYS_OFFSET
UL(0xc0000000
)
#ifndef __ASSEMBLY__
#ifdef CONFIG_SA1111
#ifndef __ASSEMBLY__
#ifdef CONFIG_SA1111
-static inline void
-__arch_adjust_zones(int node, unsigned long *size, unsigned long *holes)
-{
- unsigned int sz = SZ_1M >> PAGE_SHIFT;
-
- if (node != 0)
- sz = 0;
-
- size[1] = size[0] - sz;
- size[0] = sz;
-}
+void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
#define arch_adjust_zones(node, size, holes) \
#define arch_adjust_zones(node, size, holes) \
-
__arch
_adjust_zones(node, size, holes)
+
sa1111
_adjust_zones(node, size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1)
@@
-99,10
+89,13
@@
__arch_adjust_zones(int node, unsigned long *size, unsigned long *holes)
#define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT)
#define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT)
-#else
-
-#define PFN_TO_NID(addr) (0)
-
#endif
#endif
+/*
+ * Cache flushing area - SA1100 zero bank
+ */
+#define FLUSH_BASE_PHYS 0xe0000000
+#define FLUSH_BASE 0xf5000000
+#define FLUSH_BASE_MINICACHE 0xf5100000
+
#endif
#endif