OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a4c1c9
)
ARM: mach-prima2: don't define SIRFSOC_VA in terms of VMALLOC_END
author
Nicolas Pitre
<nicolas.pitre@linaro.org>
Wed, 14 Sep 2011 19:14:19 +0000
(15:14 -0400)
committer
Nicolas Pitre
<nico@fluxnic.net>
Wed, 16 Nov 2011 03:30:38 +0000
(22:30 -0500)
... since it is going to change.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Barry Song <baohua.song@csr.com>
arch/arm/mach-prima2/include/mach/map.h
patch
|
blob
|
history
diff --git
a/arch/arm/mach-prima2/include/mach/map.h
b/arch/arm/mach-prima2/include/mach/map.h
index
66b1ae2
..
6f24353
100644
(file)
--- a/
arch/arm/mach-prima2/include/mach/map.h
+++ b/
arch/arm/mach-prima2/include/mach/map.h
@@
-9,8
+9,10
@@
#ifndef __MACH_PRIMA2_MAP_H__
#define __MACH_PRIMA2_MAP_H__
-#include <
mach/vmalloc
.h>
+#include <
linux/const
.h>
-#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000))
+#define SIRFSOC_VA_BASE _AC(0xFEC00000, UL)
+
+#define SIRFSOC_VA(x) (SIRFSOC_VA_BASE + ((x) & 0x00FFF000))
#endif