Commit 8e4029ee authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/urgent' into core/memblock 



Reason for merge:

Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree.

Resolved Conflicts:
	arch/x86/mm/srat_64.c

Originally-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents cd79481d 73cf624d

Documentation/vm/page-types.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void) 
	}



	if (opt_unpoison && !hwpoison_forget_fd) {

		sprintf(buf, "%s/renew-pfn", hwpoison_debug_fs);

		sprintf(buf, "%s/unpoison-pfn", hwpoison_debug_fs);

		hwpoison_forget_fd = checked_open(buf, O_WRONLY);

	}

}

MAINTAINERS

+11 −1
Original line number Diff line number Diff line
@@ -969,6 +969,16 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-s5p*/



ARM/SAMSUNG S5P SERIES FIMC SUPPORT

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

S:	Maintained

F:	arch/arm/plat-s5p/dev-fimc*

F:	arch/arm/plat-samsung/include/plat/*fimc*

F:	drivers/media/video/s5p-fimc/



ARM/SHMOBILE ARM ARCHITECTURE

M:	Paul Mundt <lethal@linux-sh.org>

M:	Magnus Damm <magnus.damm@gmail.com>
@@ -2535,7 +2545,7 @@ S: Supported 
F:	drivers/scsi/gdt*



GENERIC GPIO I2C DRIVER

M:	Haavard Skinnemoen <hskinnemoen@atmel.com>

M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

S:	Supported

F:	drivers/i2c/busses/i2c-gpio.c

F:	include/linux/i2c-gpio.h

arch/x86/kernel/cpu/mcheck/mce_amd.c

+3 −6
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) 
				address = (low & MASK_BLKPTR_LO) >> 21;

				if (!address)

					break;



				address += MCG_XBLK_ADDR;

			} else

				++address;
@@ -148,12 +149,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) 
			if (rdmsr_safe(address, &low, &high))

				break;



			if (!(high & MASK_VALID_HI)) {

				if (block)

			if (!(high & MASK_VALID_HI))

				continue;

				else

					break;

			}



			if (!(high & MASK_CNTP_HI)  ||

			     (high & MASK_LOCKED_HI))

arch/x86/kernel/cpu/mcheck/therm_throt.c

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev, 
		err = sysfs_add_file_to_group(&sys_dev->kobj,

					      &attr_core_power_limit_count.attr,

					      thermal_attr_group.name);

	if (cpu_has(c, X86_FEATURE_PTS))

	if (cpu_has(c, X86_FEATURE_PTS)) {

		err = sysfs_add_file_to_group(&sys_dev->kobj,

					      &attr_package_throttle_count.attr,

					      thermal_attr_group.name);
@@ -224,6 +224,7 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev, 
			err = sysfs_add_file_to_group(&sys_dev->kobj,

					&attr_package_power_limit_count.attr,

					thermal_attr_group.name);

	}



	return err;

}

arch/x86/mm/srat_64.c

+5 −3
Original line number Diff line number Diff line
@@ -421,9 +421,11 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) 
		return -1;

	}



	for_each_node_mask(i, nodes_parsed)

		memblock_x86_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,

						nodes[i].end >> PAGE_SHIFT);

	for (i = 0; i < num_node_memblks; i++)

		memblock_x86_register_active_regions(memblk_nodeid[i],

				node_memblk_range[i].start >> PAGE_SHIFT,

				node_memblk_range[i].end >> PAGE_SHIFT);



	/* for out of order entries in SRAT */

	sort_node_map();

	if (!nodes_cover_memory(nodes)) {