Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"8 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
MAINTAINERS: demote ARM port to "odd fixes"
MAINTAINERS: correct rmk's email address
mm/kmemleak.c: wait for scan completion before disabling free
mm/memcontrol.c: fix parameter description mismatch
mm/vmstat.c: fix vmstat_update() preemption BUG
mm/page_owner: fix recursion bug after changing skip entries
ipc/shm.c: add split function to shm_vm_ops
mm, slab: memcg_link the SLAB's kmem_cache
+51
-20
+23
-9
MAINTAINERS
+23
-9
MAINTAINERS
···
1060
1060
M: Russell King <linux@armlinux.org.uk>
1061
1061
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1062
1062
W: http://www.armlinux.org.uk/
1063
-
S: Maintained
1063
+
S: Odd Fixes
1064
1064
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git
1065
1065
F: arch/arm/
1066
+
X: arch/arm/boot/dts/
1066
1067
1067
1068
ARM PRIMECELL AACI PL041 DRIVER
1068
1069
M: Russell King <linux@armlinux.org.uk>
1069
-
S: Maintained
1070
+
S: Odd Fixes
1070
1071
F: sound/arm/aaci.*
1071
1072
1072
1073
ARM PRIMECELL BUS SUPPORT
1073
1074
M: Russell King <linux@armlinux.org.uk>
1074
-
S: Maintained
1075
+
S: Odd Fixes
1075
1076
F: drivers/amba/
1076
1077
F: include/linux/amba/bus.h
1077
1078
1078
1079
ARM PRIMECELL CLCD PL110 DRIVER
1079
1080
M: Russell King <linux@armlinux.org.uk>
1080
-
S: Maintained
1081
+
S: Odd Fixes
1081
1082
F: drivers/video/fbdev/amba-clcd.*
1082
1083
1083
1084
ARM PRIMECELL KMI PL050 DRIVER
1084
1085
M: Russell King <linux@armlinux.org.uk>
1085
-
S: Maintained
1086
+
S: Odd Fixes
1086
1087
F: drivers/input/serio/ambakmi.*
1087
1088
F: include/linux/amba/kmi.h
1088
1089
1089
1090
ARM PRIMECELL MMCI PL180/1 DRIVER
1090
1091
M: Russell King <linux@armlinux.org.uk>
1091
-
S: Maintained
1092
+
S: Odd Fixes
1092
1093
F: drivers/mmc/host/mmci.*
1093
1094
F: include/linux/amba/mmci.h
1094
1095
1095
1096
ARM PRIMECELL UART PL010 AND PL011 DRIVERS
1096
1097
M: Russell King <linux@armlinux.org.uk>
1097
-
S: Maintained
1098
+
S: Odd Fixes
1098
1099
F: drivers/tty/serial/amba-pl01*.c
1099
1100
F: include/linux/amba/serial.h
1100
1101
···
8435
8434
F: drivers/net/wireless/marvell/libertas/
8436
8435
8437
8436
MARVELL MACCHIATOBIN SUPPORT
8438
-
M: Russell King <rmk@armlinux.org.uk>
8437
+
M: Russell King <linux@armlinux.org.uk>
8439
8438
L: linux-arm-kernel@lists.infradead.org
8440
8439
S: Maintained
8441
8440
F: arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
···
8448
8447
F: include/linux/mv643xx.h
8449
8448
8450
8449
MARVELL MV88X3310 PHY DRIVER
8451
-
M: Russell King <rmk@armlinux.org.uk>
8450
+
M: Russell King <linux@armlinux.org.uk>
8452
8451
L: netdev@vger.kernel.org
8453
8452
S: Maintained
8454
8453
F: drivers/net/phy/marvell10g.c
···
12875
12874
S: Maintained
12876
12875
F: drivers/net/ethernet/socionext/netsec.c
12877
12876
F: Documentation/devicetree/bindings/net/socionext-netsec.txt
12877
+
12878
+
SOLIDRUN CLEARFOG SUPPORT
12879
+
M: Russell King <linux@armlinux.org.uk>
12880
+
S: Maintained
12881
+
F: arch/arm/boot/dts/armada-388-clearfog*
12882
+
F: arch/arm/boot/dts/armada-38x-solidrun-*
12883
+
12884
+
SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
12885
+
M: Russell King <linux@armlinux.org.uk>
12886
+
S: Maintained
12887
+
F: arch/arm/boot/dts/imx6*-cubox-i*
12888
+
F: arch/arm/boot/dts/imx6*-hummingboard*
12889
+
F: arch/arm/boot/dts/imx6*-sr-*
12878
12890
12879
12891
SONIC NETWORK DRIVER
12880
12892
M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+12
ipc/shm.c
+12
ipc/shm.c
···
386
386
return sfd->vm_ops->fault(vmf);
387
387
}
388
388
389
+
static int shm_split(struct vm_area_struct *vma, unsigned long addr)
390
+
{
391
+
struct file *file = vma->vm_file;
392
+
struct shm_file_data *sfd = shm_file_data(file);
393
+
394
+
if (sfd->vm_ops && sfd->vm_ops->split)
395
+
return sfd->vm_ops->split(vma, addr);
396
+
397
+
return 0;
398
+
}
399
+
389
400
#ifdef CONFIG_NUMA
390
401
static int shm_set_policy(struct vm_area_struct *vma, struct mempolicy *new)
391
402
{
···
521
510
.open = shm_open, /* callback for a new vm-area open */
522
511
.close = shm_close, /* callback for when the vm-area is released */
523
512
.fault = shm_fault,
513
+
.split = shm_split,
524
514
#if defined(CONFIG_NUMA)
525
515
.set_policy = shm_set_policy,
526
516
.get_policy = shm_get_policy,
+7
-5
mm/kmemleak.c
+7
-5
mm/kmemleak.c
···
1657
1657
}
1658
1658
1659
1659
/*
1660
-
* Stop the automatic memory scanning thread. This function must be called
1661
-
* with the scan_mutex held.
1660
+
* Stop the automatic memory scanning thread.
1662
1661
*/
1663
1662
static void stop_scan_thread(void)
1664
1663
{
···
1920
1921
{
1921
1922
stop_scan_thread();
1922
1923
1924
+
mutex_lock(&scan_mutex);
1923
1925
/*
1924
-
* Once the scan thread has stopped, it is safe to no longer track
1925
-
* object freeing. Ordering of the scan thread stopping and the memory
1926
-
* accesses below is guaranteed by the kthread_stop() function.
1926
+
* Once it is made sure that kmemleak_scan has stopped, it is safe to no
1927
+
* longer track object freeing. Ordering of the scan thread stopping and
1928
+
* the memory accesses below is guaranteed by the kthread_stop()
1929
+
* function.
1927
1930
*/
1928
1931
kmemleak_free_enabled = 0;
1932
+
mutex_unlock(&scan_mutex);
1929
1933
1930
1934
if (!kmemleak_found_leaks)
1931
1935
__kmemleak_do_cleanup();
+3
-3
mm/memcontrol.c
+3
-3
mm/memcontrol.c
···
714
714
* invocations for reference counting, or use mem_cgroup_iter_break()
715
715
* to cancel a hierarchy walk before the round-trip is complete.
716
716
*
717
-
* Reclaimers can specify a zone and a priority level in @reclaim to
717
+
* Reclaimers can specify a node and a priority level in @reclaim to
718
718
* divide up the memcgs in the hierarchy among all concurrent
719
-
* reclaimers operating on the same zone and priority.
719
+
* reclaimers operating on the same node and priority.
720
720
*/
721
721
struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
722
722
struct mem_cgroup *prev,
···
2299
2299
}
2300
2300
2301
2301
/**
2302
-
* memcg_kmem_charge: charge a kmem page
2302
+
* memcg_kmem_charge_memcg: charge a kmem page
2303
2303
* @page: page to charge
2304
2304
* @gfp: reclaim mode
2305
2305
* @order: allocation order
+3
-3
mm/page_owner.c
+3
-3
mm/page_owner.c
···
123
123
static inline bool check_recursive_alloc(struct stack_trace *trace,
124
124
unsigned long ip)
125
125
{
126
-
int i, count;
126
+
int i;
127
127
128
128
if (!trace->nr_entries)
129
129
return false;
130
130
131
-
for (i = 0, count = 0; i < trace->nr_entries; i++) {
132
-
if (trace->entries[i] == ip && ++count == 2)
131
+
for (i = 0; i < trace->nr_entries; i++) {
132
+
if (trace->entries[i] == ip)
133
133
return true;
134
134
}
135
135
+1
mm/slab.c
+1
mm/slab.c
+2
mm/vmstat.c
+2
mm/vmstat.c
···
1839
1839
* to occur in the future. Keep on running the
1840
1840
* update worker thread.
1841
1841
*/
1842
+
preempt_disable();
1842
1843
queue_delayed_work_on(smp_processor_id(), mm_percpu_wq,
1843
1844
this_cpu_ptr(&vmstat_work),
1844
1845
round_jiffies_relative(sysctl_stat_interval));
1846
+
preempt_enable();
1845
1847
}
1846
1848
}
1847
1849