diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 07:12:10 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 07:12:10 +0400 |
| commit | d0b9706c20ebb4ba181dc26e52ac9a6861abf425 (patch) | |
| tree | 436e89246fd5ebcf737cae27e135a1995155329b /include | |
| parent | 02d929502ce7b57f4835d8bb7c828d36e6d9e8ce (diff) | |
| parent | 54eed6cb16ec315565aaaf8e34252ca253a68b7b (diff) | |
| download | linux-d0b9706c20ebb4ba181dc26e52ac9a6861abf425.tar.xz | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/numa: Add constraints check for nid parameters
mm, x86: Remove debug_pagealloc_enabled
x86/mm: Initialize high mem before free_all_bootmem()
arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
arch/x86/kernel/e820.c: Eliminate bubble sort from sanitize_e820_map()
x86: Fix mmap random address range
x86, mm: Unify zone_sizes_init()
x86, mm: Prepare zone_sizes_init() for unification
x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit
x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32
x86, mm: Use max_pfn instead of highend_pfn
x86, mm: Move zone init from paging_init() on 64-bit
x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 6eba2cc016c9..17b27cd269c4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1540,23 +1540,13 @@ static inline void vm_stat_account(struct mm_struct *mm, #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_DEBUG_PAGEALLOC -extern int debug_pagealloc_enabled; - extern void kernel_map_pages(struct page *page, int numpages, int enable); - -static inline void enable_debug_pagealloc(void) -{ - debug_pagealloc_enabled = 1; -} #ifdef CONFIG_HIBERNATION extern bool kernel_page_present(struct page *page); #endif /* CONFIG_HIBERNATION */ #else static inline void kernel_map_pages(struct page *page, int numpages, int enable) {} -static inline void enable_debug_pagealloc(void) -{ -} #ifdef CONFIG_HIBERNATION static inline bool kernel_page_present(struct page *page) { return true; } #endif /* CONFIG_HIBERNATION */ |