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 416320d95419579178b82ea6aba75a381be7e706..63d12f0244c50d09ab60c89d56159196440fb024 100644
(file)
--- a/
include/asm-arm/page.h
+++ b/
include/asm-arm/page.h
@@
-10,7
+10,6
@@
#ifndef _ASMARM_PAGE_H
#define _ASMARM_PAGE_H
#ifndef _ASMARM_PAGE_H
#define _ASMARM_PAGE_H
-#include <linux/config.h>
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
@@
-24,6
+23,12
@@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
+#ifndef CONFIG_MMU
+
+#include "page-nommu.h"
+
+#else
+
#include <asm/glue.h>
/*
#include <asm/glue.h>
/*
@@
-40,6
+45,7
@@
* v4wb - ARMv4 with writeback cache, without minicache
* v4_mc - ARMv4 with minicache
* xscale - Xscale
* v4wb - ARMv4 with writeback cache, without minicache
* v4_mc - ARMv4 with minicache
* xscale - Xscale
+ * xsc3 - XScalev3
*/
#undef _USER
#undef MULTI_USER
*/
#undef _USER
#undef MULTI_USER
@@
-84,6
+90,14
@@
# endif
#endif
# endif
#endif
+#ifdef CONFIG_CPU_XSC3
+# ifdef _USER
+# define MULTI_USER 1
+# else
+# define _USER xsc3_mc
+# endif
+#endif
+
#ifdef CONFIG_CPU_COPY_V6
# define MULTI_USER 1
#endif
#ifdef CONFIG_CPU_COPY_V6
# define MULTI_USER 1
#endif
@@
-163,6
+177,8
@@
typedef unsigned long pgprot_t;
/* the upper-most page table pointer */
extern pmd_t *top_pmd;
/* the upper-most page table pointer */
extern pmd_t *top_pmd;
+#endif /* CONFIG_MMU */
+
#include <asm/memory.h>
#endif /* !__ASSEMBLY__ */
#include <asm/memory.h>
#endif /* !__ASSEMBLY__ */