summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-18 20:58:10 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-18 20:58:10 +0100
commitb814469ad515c70d9269d5268607bd6fbfb32533 (patch)
tree680707495159d77825aba7155667b33de97f63cb /arch/m68k/include
parentasm-generic, mm: pgtable: convert my_zero_pfn() to macros to fix build (diff)
parentm68k: fix conditional use of init_pointer_table (diff)
downloadlinux-b814469ad515c70d9269d5268607bd6fbfb32533.tar.xz
linux-b814469ad515c70d9269d5268607bd6fbfb32533.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu arch fixes from Greg Ungerer: "This contains a couple of fixes, both affecting compilation of non-mmu m68k targets." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: fix conditional use of init_pointer_table m68knommu: add KMAP definitions for non-MMU definitions
Diffstat (limited to 'arch/m68k/include')
-rw-r--r--arch/m68k/include/asm/pgtable_no.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h
index bf86b29fe64a..037028f4ab70 100644
--- a/arch/m68k/include/asm/pgtable_no.h
+++ b/arch/m68k/include/asm/pgtable_no.h
@@ -64,6 +64,8 @@ extern unsigned int kobjsize(const void *objp);
*/
#define VMALLOC_START 0
#define VMALLOC_END 0xffffffff
+#define KMAP_START 0
+#define KMAP_END 0xffffffff
#include <asm-generic/pgtable.h>