summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/page.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-09-27 19:57:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-27 19:57:54 +0100
commit2dc94310bd94d0906febea7d0f7c188da620c952 (patch)
tree6de4096f1887e2c00966177354b1c378e59bd632 /include/asm-arm/page.h
parentc06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff)
parentfb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff)
downloadop-kernel-dev-2dc94310bd94d0906febea7d0f7c188da620c952.zip
op-kernel-dev-2dc94310bd94d0906febea7d0f7c188da620c952.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'include/asm-arm/page.h')
-rw-r--r--include/asm-arm/page.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index af9c3fe..7e85db7 100644
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -11,13 +11,13 @@
#define _ASMARM_PAGE_H
+#ifdef __KERNEL__
+
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
OpenPOWER on IntegriCloud