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 branch 'core' of git://amd64.org/linux/rric into perf/core
[firefly-linux-kernel-4.4.55.git]
/
mm
/
mm_init.c
diff --git
a/mm/mm_init.c
b/mm/mm_init.c
index c6af41ea9994e79826c78f75d1d61c01323be63b..1ffd97ae26d7444a6294c1c2e856b8cf8acbac02 100644
(file)
--- a/
mm/mm_init.c
+++ b/
mm/mm_init.c
@@
-8,11
+8,15
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kobject.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kobject.h>
-#include <linux/
module
.h>
+#include <linux/
export
.h>
#include "internal.h"
#ifdef CONFIG_DEBUG_MEMORY_INIT
#include "internal.h"
#ifdef CONFIG_DEBUG_MEMORY_INIT
-int __meminitdata mminit_loglevel;
+int mminit_loglevel;
+
+#ifndef SECTIONS_SHIFT
+#define SECTIONS_SHIFT 0
+#endif
/* The zonelists are simply reported, validation is manual. */
void mminit_verify_zonelist(void)
/* The zonelists are simply reported, validation is manual. */
void mminit_verify_zonelist(void)
@@
-74,11
+78,7
@@
void __init mminit_verify_pageflags_layout(void)
NR_PAGEFLAGS);
mminit_dprintk(MMINIT_TRACE, "pageflags_layout_shifts",
"Section %d Node %d Zone %d\n",
NR_PAGEFLAGS);
mminit_dprintk(MMINIT_TRACE, "pageflags_layout_shifts",
"Section %d Node %d Zone %d\n",
-#ifdef SECTIONS_SHIFT
SECTIONS_SHIFT,
SECTIONS_SHIFT,
-#else
- 0,
-#endif
NODES_SHIFT,
ZONES_SHIFT);
mminit_dprintk(MMINIT_TRACE, "pageflags_layout_offsets",
NODES_SHIFT,
ZONES_SHIFT);
mminit_dprintk(MMINIT_TRACE, "pageflags_layout_offsets",