diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:55:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:55:13 -0400 |
commit | 00170fdd0846df7cdb5ad421d3a340440f930b8f (patch) | |
tree | 1883cfbda846cd65faed011bda54a52c1d40ecdd /arch/tile | |
parent | d09cc3659db494aca4b3bb2393c533fb4946b794 (diff) | |
parent | 3ff6db3287e8a5e8f5bb9529b8e1259ca6b10def (diff) |
Merge branch 'akpm' (patchbomb from Andrew) into next
Merge misc updates from Andrew Morton:
- a few fixes for 3.16. Cc'ed to stable so they'll get there somehow.
- various misc fixes and cleanups
- most of the ocfs2 queue. Review is slow...
- most of MM. The MM queue is pretty huge this time, but not much in
the way of feature work.
- some tweaks under kernel/
- printk maintenance work
- updates to lib/
- checkpatch updates
- tweaks to init/
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (276 commits)
fs/autofs4/dev-ioctl.c: add __init to autofs_dev_ioctl_init
fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul
init/main.c: remove an ifdef
kthreads: kill CLONE_KERNEL, change kernel_thread(kernel_init) to avoid CLONE_SIGHAND
init/main.c: add initcall_blacklist kernel parameter
init/main.c: don't use pr_debug()
fs/binfmt_flat.c: make old_reloc() static
fs/binfmt_elf.c: fix bool assignements
fs/efs: convert printk(KERN_DEBUG to pr_debug
fs/efs: add pr_fmt / use __func__
fs/efs: convert printk to pr_foo()
scripts/checkpatch.pl: device_initcall is not the only __initcall substitute
checkpatch: check stable email address
checkpatch: warn on unnecessary void function return statements
checkpatch: prefer kstrto<foo> to sscanf(buf, "%<lhuidx>", &bar);
checkpatch: add warning for kmalloc/kzalloc with multiply
checkpatch: warn on #defines ending in semicolon
checkpatch: make --strict a default for files in drivers/net and net/
checkpatch: always warn on missing blank line after variable declaration block
checkpatch: fix wildcard DT compatible string checking
...
Diffstat (limited to 'arch/tile')
-rw-r--r-- | arch/tile/mm/homecache.c | 2 | ||||
-rw-r--r-- | arch/tile/mm/hugetlbpage.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/tile/mm/homecache.c b/arch/tile/mm/homecache.c index 004ba568d93f..33294fdc402e 100644 --- a/arch/tile/mm/homecache.c +++ b/arch/tile/mm/homecache.c | |||
@@ -417,7 +417,7 @@ void __homecache_free_pages(struct page *page, unsigned int order) | |||
417 | if (put_page_testzero(page)) { | 417 | if (put_page_testzero(page)) { |
418 | homecache_change_page_home(page, order, PAGE_HOME_HASH); | 418 | homecache_change_page_home(page, order, PAGE_HOME_HASH); |
419 | if (order == 0) { | 419 | if (order == 0) { |
420 | free_hot_cold_page(page, 0); | 420 | free_hot_cold_page(page, false); |
421 | } else { | 421 | } else { |
422 | init_page_count(page); | 422 | init_page_count(page); |
423 | __free_pages(page, order); | 423 | __free_pages(page, order); |
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c index 0cb3bbaa580c..e514899e1100 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c | |||
@@ -166,11 +166,6 @@ int pud_huge(pud_t pud) | |||
166 | return !!(pud_val(pud) & _PAGE_HUGE_PAGE); | 166 | return !!(pud_val(pud) & _PAGE_HUGE_PAGE); |
167 | } | 167 | } |
168 | 168 | ||
169 | int pmd_huge_support(void) | ||
170 | { | ||
171 | return 1; | ||
172 | } | ||
173 | |||
174 | struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address, | 169 | struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address, |
175 | pmd_t *pmd, int write) | 170 | pmd_t *pmd, int write) |
176 | { | 171 | { |