summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/mmu_context.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-17 16:29:06 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 16:29:06 +0100
commitea9b395fe20ac74be788f415af2622ac8f0c35c7 (patch)
treed1653e1a4cbe360aa7132ea4e29ab92a02038224 /include/asm-powerpc/mmu_context.h
parentMerge branch 'upstream' (diff)
parent[PATCH] libata: add a function to decide if we need iordy (diff)
downloadlinux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.tar.xz
linux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.zip
Merge branch 'upstream'
Diffstat (limited to 'include/asm-powerpc/mmu_context.h')
-rw-r--r--include/asm-powerpc/mmu_context.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/mmu_context.h b/include/asm-powerpc/mmu_context.h
index ea6798c7d5fc..1b8a25fd48f3 100644
--- a/include/asm-powerpc/mmu_context.h
+++ b/include/asm-powerpc/mmu_context.h
@@ -1,5 +1,6 @@
#ifndef __ASM_POWERPC_MMU_CONTEXT_H
#define __ASM_POWERPC_MMU_CONTEXT_H
+#ifdef __KERNEL__
#ifndef CONFIG_PPC64
#include <asm-ppc/mmu_context.h>
@@ -86,4 +87,5 @@ static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
}
#endif /* CONFIG_PPC64 */
+#endif /* __KERNEL__ */
#endif /* __ASM_POWERPC_MMU_CONTEXT_H */