From 860d75bb475b9cd1d747c3c5d05b997f36621a12 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 16 Nov 2012 19:39:17 -0800 Subject: [PATCH] --- yaml --- r: 356220 b: refs/heads/master c: 60a8f428320918458a9a21052777eada68eebfd8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/mm_internal.h | 2 ++ trunk/include/linux/mm.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9fe205a89f94..9da2b36ae561 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e37a890474b89ca49ad6b3651b1709a17d7c216 +refs/heads/master: 60a8f428320918458a9a21052777eada68eebfd8 diff --git a/trunk/arch/x86/mm/mm_internal.h b/trunk/arch/x86/mm/mm_internal.h index dc79ac121774..6b563a118891 100644 --- a/trunk/arch/x86/mm/mm_internal.h +++ b/trunk/arch/x86/mm/mm_internal.h @@ -14,4 +14,6 @@ unsigned long kernel_physical_mapping_init(unsigned long start, unsigned long page_size_mask); void zone_sizes_init(void); +extern int after_bootmem; + #endif /* __X86_MM_INTERNAL_H */ diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h index bcaab4e6fe91..64d5271a3d36 100644 --- a/trunk/include/linux/mm.h +++ b/trunk/include/linux/mm.h @@ -1355,7 +1355,6 @@ extern void __init mmap_init(void); extern void show_mem(unsigned int flags); extern void si_meminfo(struct sysinfo * val); extern void si_meminfo_node(struct sysinfo *val, int nid); -extern int after_bootmem; extern __printf(3, 4) void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...);