Commit 9cf22e80 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'akpm' (incoming from Andrew)

Merge misc fixes from Andrew Morton:
 "4 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, thp: close race between mremap() and split_huge_page()
  mm: postpone the disabling of kmemleak early logging
  MAINTAINERS: update maintainership of LTP
  drivers/rtc/rtc-hym8563.c: set uie_unsupported
parents d6d211db dd18dbc2
...@@ -5490,15 +5490,15 @@ F: Documentation/hwmon/ltc4261 ...@@ -5490,15 +5490,15 @@ F: Documentation/hwmon/ltc4261
F: drivers/hwmon/ltc4261.c F: drivers/hwmon/ltc4261.c
LTP (Linux Test Project) LTP (Linux Test Project)
M: Shubham Goyal <shubham@linux.vnet.ibm.com>
M: Mike Frysinger <vapier@gentoo.org> M: Mike Frysinger <vapier@gentoo.org>
M: Cyril Hrubis <chrubis@suse.cz> M: Cyril Hrubis <chrubis@suse.cz>
M: Caspar Zhang <caspar@casparzhang.com>
M: Wanlong Gao <gaowanlong@cn.fujitsu.com> M: Wanlong Gao <gaowanlong@cn.fujitsu.com>
M: Jan Stancek <jstancek@redhat.com>
M: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
M: Alexey Kodanev <alexey.kodanev@oracle.com>
L: ltp-list@lists.sourceforge.net (subscribers-only) L: ltp-list@lists.sourceforge.net (subscribers-only)
W: http://ltp.sourceforge.net/ W: http://linux-test-project.github.io/
T: git git://github.com/linux-test-project/ltp.git T: git git://github.com/linux-test-project/ltp.git
T: git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
S: Maintained S: Maintained
M32R ARCHITECTURE M32R ARCHITECTURE
......
...@@ -569,6 +569,9 @@ static int hym8563_probe(struct i2c_client *client, ...@@ -569,6 +569,9 @@ static int hym8563_probe(struct i2c_client *client,
if (IS_ERR(hym8563->rtc)) if (IS_ERR(hym8563->rtc))
return PTR_ERR(hym8563->rtc); return PTR_ERR(hym8563->rtc);
/* the hym8563 alarm only supports a minute accuracy */
hym8563->rtc->uie_unsupported = 1;
#ifdef CONFIG_COMMON_CLK #ifdef CONFIG_COMMON_CLK
hym8563_clkout_register_clk(hym8563); hym8563_clkout_register_clk(hym8563);
#endif #endif
......
...@@ -1775,10 +1775,9 @@ void __init kmemleak_init(void) ...@@ -1775,10 +1775,9 @@ void __init kmemleak_init(void)
int i; int i;
unsigned long flags; unsigned long flags;
kmemleak_early_log = 0;
#ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
if (!kmemleak_skip_disable) { if (!kmemleak_skip_disable) {
kmemleak_early_log = 0;
kmemleak_disable(); kmemleak_disable();
return; return;
} }
...@@ -1796,6 +1795,7 @@ void __init kmemleak_init(void) ...@@ -1796,6 +1795,7 @@ void __init kmemleak_init(void)
/* the kernel is still in UP mode, so disabling the IRQs is enough */ /* the kernel is still in UP mode, so disabling the IRQs is enough */
local_irq_save(flags); local_irq_save(flags);
kmemleak_early_log = 0;
if (kmemleak_error) { if (kmemleak_error) {
local_irq_restore(flags); local_irq_restore(flags);
return; return;
......
...@@ -194,10 +194,17 @@ unsigned long move_page_tables(struct vm_area_struct *vma, ...@@ -194,10 +194,17 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
break; break;
if (pmd_trans_huge(*old_pmd)) { if (pmd_trans_huge(*old_pmd)) {
int err = 0; int err = 0;
if (extent == HPAGE_PMD_SIZE) if (extent == HPAGE_PMD_SIZE) {
VM_BUG_ON(vma->vm_file || !vma->anon_vma);
/* See comment in move_ptes() */
if (need_rmap_locks)
anon_vma_lock_write(vma->anon_vma);
err = move_huge_pmd(vma, new_vma, old_addr, err = move_huge_pmd(vma, new_vma, old_addr,
new_addr, old_end, new_addr, old_end,
old_pmd, new_pmd); old_pmd, new_pmd);
if (need_rmap_locks)
anon_vma_unlock_write(vma->anon_vma);
}
if (err > 0) { if (err > 0) {
need_flush = true; need_flush = true;
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment