Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c8e30d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: numa: mark huge PTEs young when clearing NUMA hinting faults
  mm: numa: slow PTE scan rate if migration failures occur
  mm: numa: preserve PTE write permissions across a NUMA hinting fault
  mm: numa: group related processes based on VMA flags instead of page table flags
  hfsplus: fix B-tree corruption after insertion at position 0
  MAINTAINERS: add Jan as DMI/SMBIOS support maintainer
  fs/affs/file.c: unlock/release page on error
  mm/page_alloc.c: call kernel_map_pages in unset_migrateype_isolate
  mm/slub: fix lockups on PREEMPT && !SMP kernels
  mm/memory hotplug: postpone the reset of obsolete pgdat
  MAINTAINERS: correct rtc armada38x pattern entry
  mm/pagewalk.c: prevent positive return value of walk_page_test() from being passed to callers
  mm: fix anon_vma->degree underflow in anon_vma endless growing prevention
  drivers/rtc/rtc-mrst: fix suspend/resume
  aoe: update aoe maintainer information
parents b8517e98 b7b04004

MAINTAINERS

+10 −3
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/armada38x-rtc

F:	drivers/rtc/rtc-armada38x.c



ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -1675,8 +1675,8 @@ F: drivers/misc/eeprom/at24.c 
F:	include/linux/platform_data/at24.h



ATA OVER ETHERNET (AOE) DRIVER

M:	"Ed L. Cashin" <ecashin@coraid.com>

W:	http://support.coraid.com/support/linux

M:	"Ed L. Cashin" <ed.cashin@acm.org>

W:	http://www.openaoe.org/

S:	Supported

F:	Documentation/aoe/

F:	drivers/block/aoe/
@@ -3252,6 +3252,13 @@ S: Maintained 
F:	Documentation/hwmon/dme1737

F:	drivers/hwmon/dme1737.c



DMI/SMBIOS SUPPORT

M:	Jean Delvare <jdelvare@suse.de>

S:	Maintained

F:	drivers/firmware/dmi-id.c

F:	drivers/firmware/dmi_scan.c

F:	include/linux/dmi.h



DOCKING STATION DRIVER

M:	Shaohua Li <shaohua.li@intel.com>

L:	linux-acpi@vger.kernel.org

drivers/rtc/rtc-mrst.c

+9 −8
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ static void rtc_mrst_do_remove(struct device *dev) 
	mrst->dev = NULL;

}



#ifdef	CONFIG_PM

static int mrst_suspend(struct device *dev, pm_message_t mesg)

#ifdef CONFIG_PM_SLEEP

static int mrst_suspend(struct device *dev)

{

	struct mrst_rtc	*mrst = dev_get_drvdata(dev);

	unsigned char	tmp;
@@ -453,7 +453,7 @@ static int mrst_suspend(struct device *dev, pm_message_t mesg) 
 */

static inline int mrst_poweroff(struct device *dev)

{

	return mrst_suspend(dev, PMSG_HIBERNATE);

	return mrst_suspend(dev);

}



static int mrst_resume(struct device *dev)
@@ -490,9 +490,11 @@ static int mrst_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(mrst_pm_ops, mrst_suspend, mrst_resume);

#define MRST_PM_OPS (&mrst_pm_ops)



#else

#define	mrst_suspend	NULL

#define	mrst_resume	NULL

#define MRST_PM_OPS NULL



static inline int mrst_poweroff(struct device *dev)

{
@@ -529,9 +531,8 @@ static struct platform_driver vrtc_mrst_platform_driver = { 
	.remove		= vrtc_mrst_platform_remove,

	.shutdown	= vrtc_mrst_platform_shutdown,

	.driver = {

		.name		= (char *) driver_name,

		.suspend	= mrst_suspend,

		.resume		= mrst_resume,

		.name	= driver_name,

		.pm	= MRST_PM_OPS,

	}

};

fs/affs/file.c

+12 −7
Original line number Diff line number Diff line
@@ -699,8 +699,10 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
	boff = tmp % bsize;

	if (boff) {

		bh = affs_bread_ino(inode, bidx, 0);

		if (IS_ERR(bh))

			return PTR_ERR(bh);

		if (IS_ERR(bh)) {

			written = PTR_ERR(bh);

			goto err_first_bh;

		}

		tmp = min(bsize - boff, to - from);

		BUG_ON(boff + tmp > bsize || tmp > bsize);

		memcpy(AFFS_DATA(bh) + boff, data + from, tmp);
@@ -712,14 +714,16 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
		bidx++;

	} else if (bidx) {

		bh = affs_bread_ino(inode, bidx - 1, 0);

		if (IS_ERR(bh))

			return PTR_ERR(bh);

		if (IS_ERR(bh)) {

			written = PTR_ERR(bh);

			goto err_first_bh;

		}

	}

	while (from + bsize <= to) {

		prev_bh = bh;

		bh = affs_getemptyblk_ino(inode, bidx);

		if (IS_ERR(bh))

			goto out;

			goto err_bh;

		memcpy(AFFS_DATA(bh), data + from, bsize);

		if (buffer_new(bh)) {

			AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);
@@ -751,7 +755,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
		prev_bh = bh;

		bh = affs_bread_ino(inode, bidx, 1);

		if (IS_ERR(bh))

			goto out;

			goto err_bh;

		tmp = min(bsize, to - from);

		BUG_ON(tmp > bsize);

		memcpy(AFFS_DATA(bh), data + from, tmp);
@@ -790,12 +794,13 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
	if (tmp > inode->i_size)

		inode->i_size = AFFS_I(inode)->mmu_private = tmp;



err_first_bh:

	unlock_page(page);

	page_cache_release(page);



	return written;



out:

err_bh:

	bh = prev_bh;

	if (!written)

		written = PTR_ERR(bh);

fs/hfsplus/brec.c

+11 −9
Original line number Diff line number Diff line
@@ -131,13 +131,16 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len) 
	hfs_bnode_write(node, entry, data_off + key_len, entry_len);

	hfs_bnode_dump(node);



	if (new_node) {

		/* update parent key if we inserted a key

		 * at the start of the first node

	/*

	 * update parent key if we inserted a key

	 * at the start of the node and it is not the new node

	 */

		if (!rec && new_node != node)

	if (!rec && new_node != node) {

		hfs_bnode_read_key(node, fd->search_key, data_off + size);

		hfs_brec_update_parent(fd);

	}



	if (new_node) {

		hfs_bnode_put(fd->bnode);

		if (!new_node->parent) {

			hfs_btree_inc_height(tree);
@@ -168,9 +171,6 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len) 
		goto again;

	}



	if (!rec)

		hfs_brec_update_parent(fd);



	return 0;

}
@@ -370,6 +370,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) 
	if (IS_ERR(parent))

		return PTR_ERR(parent);

	__hfs_brec_find(parent, fd, hfs_find_rec_by_key);

	if (fd->record < 0)

		return -ENOENT;

	hfs_bnode_dump(parent);

	rec = fd->record;

include/linux/sched.h

+5 −4
Original line number Diff line number Diff line
@@ -1625,11 +1625,11 @@ struct task_struct { 


	/*

	 * numa_faults_locality tracks if faults recorded during the last

	 * scan window were remote/local. The task scan period is adapted

	 * based on the locality of the faults with different weights

	 * depending on whether they were shared or private faults

	 * scan window were remote/local or failed to migrate. The task scan

	 * period is adapted based on the locality of the faults with different

	 * weights depending on whether they were shared or private faults

	 */

	unsigned long numa_faults_locality[2];

	unsigned long numa_faults_locality[3];



	unsigned long numa_pages_migrated;

#endif /* CONFIG_NUMA_BALANCING */
@@ -1719,6 +1719,7 @@ struct task_struct { 
#define TNF_NO_GROUP	0x02

#define TNF_SHARED	0x04

#define TNF_FAULT_LOCAL	0x08

#define TNF_MIGRATE_FAIL 0x10



#ifdef CONFIG_NUMA_BALANCING

extern void task_numa_fault(int last_node, int node, int pages, int flags);