aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/fixmap.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-29 13:54:52 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-29 13:54:52 +1000
commit435462c6e639065460e91903d6bd2af0f5762fde (patch)
treebf66ccdd613019035ebab535762366aa1026399b /arch/powerpc/include/asm/fixmap.h
parentd7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff)
parentb5c42bc8db17db80917f99205a03c51f17354495 (diff)
downloadkernel_samsung_aries-435462c6e639065460e91903d6bd2af0f5762fde.zip
kernel_samsung_aries-435462c6e639065460e91903d6bd2af0f5762fde.tar.gz
kernel_samsung_aries-435462c6e639065460e91903d6bd2af0f5762fde.tar.bz2
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/include/asm/fixmap.h')
-rw-r--r--arch/powerpc/include/asm/fixmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/fixmap.h b/arch/powerpc/include/asm/fixmap.h
index d60fd18..f1f4e23 100644
--- a/arch/powerpc/include/asm/fixmap.h
+++ b/arch/powerpc/include/asm/fixmap.h
@@ -14,8 +14,6 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
-extern unsigned long FIXADDR_TOP;
-
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
#include <asm/page.h>
@@ -24,6 +22,8 @@ extern unsigned long FIXADDR_TOP;
#include <asm/kmap_types.h>
#endif
+#define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE))
+
/*
* Here we define all the compile-time 'special' virtual
* addresses. The point is to have a constant address at