aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/mmu.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-01-29 15:57:30 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 15:17:42 +1000
commit54cae79e52d6a72faa3d6993dcaba560bfac8db3 (patch)
treed8661c4f581048d6dd7cc7b00d2ce7a7a08ddf4b /arch/m68k/include/asm/mmu.h
parentbf7058f04ab74061b75a166e30ae0a7e617f0430 (diff)
downloadlinux-linaro-stable-54cae79e52d6a72faa3d6993dcaba560bfac8db3.tar.gz
m68k: merge the mmu and non-mmu versions of mmu.h
Trivial merge of the contents of mmu and non-mmu versions of mmu.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/mmu.h')
-rw-r--r--arch/m68k/include/asm/mmu.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/mmu.h b/arch/m68k/include/asm/mmu.h
index a81d3946675f..8a11a63ee15a 100644
--- a/arch/m68k/include/asm/mmu.h
+++ b/arch/m68k/include/asm/mmu.h
@@ -1,5 +1,13 @@
-#ifdef __uClinux__
-#include "mmu_no.h"
+#ifndef __MMU_H
+#define __MMU_H
+
+#ifdef CONFIG_MMU
+/* Default "unsigned long" context */
+typedef unsigned long mm_context_t;
#else
-#include "mmu_mm.h"
+typedef struct {
+ unsigned long end_brk;
+} mm_context_t;
+#endif
+
#endif