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-lh7a40x
/
memory.h
diff --git
a/include/asm-arm/arch-lh7a40x/memory.h
b/include/asm-arm/arch-lh7a40x/memory.h
index
7e2fea3
..
9f1a58c
100644
(file)
--- a/
include/asm-arm/arch-lh7a40x/memory.h
+++ b/
include/asm-arm/arch-lh7a40x/memory.h
@@
-17,7
+17,7
@@
/*
* Physical DRAM offset.
*/
/*
* Physical DRAM offset.
*/
-#define PHYS_OFFSET
(0xc0000000UL
)
+#define PHYS_OFFSET
UL(0xc0000000
)
/*
* Virtual view <-> DMA view memory address translations
/*
* Virtual view <-> DMA view memory address translations
@@
-31,8
+31,6
@@
#ifdef CONFIG_DISCONTIGMEM
#ifdef CONFIG_DISCONTIGMEM
-#define NODES_SHIFT 4 /* Up to 16 nodes */
-
/*
* Given a kernel address, find the home node of the underlying memory.
*/
/*
* Given a kernel address, find the home node of the underlying memory.
*/
@@
-85,10
+83,6
@@
(((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)
# endif
(((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)
# endif
-#else
-
-# define PFN_TO_NID(addr) (0)
-
#endif
#endif
#endif
#endif