diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-02 14:46:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-02 14:46:15 -0700 |
commit | 799b63a4b058c6a48dc6805daad81ba66002c48c (patch) | |
tree | a8247f9b08a5a95731bbd3ca4b11464ddb2e636f | |
parent | d4113f2f174aea83f0871cf5d050e0e08dfb9781 (diff) | |
parent | 43c518d197e7758bc64e0485050de347797faab6 (diff) | |
download | blackbird-op-linux-799b63a4b058c6a48dc6805daad81ba66002c48c.tar.gz blackbird-op-linux-799b63a4b058c6a48dc6805daad81ba66002c48c.zip |
Merge tag 'please-pull-put_kernel_page' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 boot noise reduction fix from Tony Luck:
"Remove some boot noise from a now-invalid check that pages are
reserved"
* tag 'please-pull-put_kernel_page' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Drop debug test/printk that some special pages are marked reserved
-rw-r--r-- | arch/ia64/mm/init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 7f3028965064..97e48b0eefc7 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -215,10 +215,6 @@ put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot) pmd_t *pmd; pte_t *pte; - if (!PageReserved(page)) - printk(KERN_ERR "put_kernel_page: page at 0x%p not in reserved memory\n", - page_address(page)); - pgd = pgd_offset_k(address); /* note: this is NOT pgd_offset()! */ { |