projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-arm
/
page.h
diff --git
a/include/asm-arm/page.h
b/include/asm-arm/page.h
index 66cfeb5290ea5c0e077f67db6bd154c5768ab9b1..63d12f0244c50d09ab60c89d56159196440fb024 100644
(file)
--- a/
include/asm-arm/page.h
+++ b/
include/asm-arm/page.h
@@
-23,6
+23,12
@@
#ifndef __ASSEMBLY__
+#ifndef CONFIG_MMU
+
+#include "page-nommu.h"
+
+#else
+
#include <asm/glue.h>
/*
@@
-171,6
+177,8
@@
typedef unsigned long pgprot_t;
/* the upper-most page table pointer */
extern pmd_t *top_pmd;
+#endif /* CONFIG_MMU */
+
#include <asm/memory.h>
#endif /* !__ASSEMBLY__ */