projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[deliverable/linux.git]
/
mm
/
mm_init.c
diff --git
a/mm/mm_init.c
b/mm/mm_init.c
index 5f420f7fafa1c6b6bd74cdf3b6e9cfb5e7874f87..fdadf918de7691a57b3611cd7c45dec250b7c732 100644
(file)
--- a/
mm/mm_init.c
+++ b/
mm/mm_init.c
@@
-11,6
+11,7
@@
#include <linux/export.h>
#include <linux/memory.h>
#include <linux/notifier.h>
#include <linux/export.h>
#include <linux/memory.h>
#include <linux/notifier.h>
+#include <linux/sched.h>
#include "internal.h"
#ifdef CONFIG_DEBUG_MEMORY_INIT
#include "internal.h"
#ifdef CONFIG_DEBUG_MEMORY_INIT
@@
-130,14
+131,6
@@
void __init mminit_verify_pageflags_layout(void)
BUG_ON(or_mask != add_mask);
}
BUG_ON(or_mask != add_mask);
}
-void __meminit mminit_verify_page_links(struct page *page, enum zone_type zone,
- unsigned long nid, unsigned long pfn)
-{
- BUG_ON(page_to_nid(page) != nid);
- BUG_ON(page_zonenum(page) != zone);
- BUG_ON(page_to_pfn(page) != pfn);
-}
-
static __init int set_mminit_loglevel(char *str)
{
get_option(&str, &mminit_loglevel);
static __init int set_mminit_loglevel(char *str)
{
get_option(&str, &mminit_loglevel);
This page took
0.043766 seconds
and
5
git commands to generate.