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

Commit 509d4486 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, numa: For each node, register the memory blocks actually used
  x86, AMD, MCE thresholding: Fix the MCi_MISCj iteration order
  x86, mce, therm_throt.c: Fix missing curly braces in error handling logic
parents 0acc1b2a 73cf624d

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

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

				address = (low & MASK_BLKPTR_LO) >> 21;

				if (!address)

				if (!address)

					break;

					break;



				address += MCG_XBLK_ADDR;

				address += MCG_XBLK_ADDR;

			} else

			} else

				++address;

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

			if (rdmsr_safe(address, &low, &high))

				break;

				break;





			if (!(high & MASK_VALID_HI)) {

			if (!(high & MASK_VALID_HI))

				if (block)

				continue;

				continue;

				else

					break;

			}





			if (!(high & MASK_CNTP_HI)  ||

			if (!(high & MASK_CNTP_HI)  ||

			     (high & MASK_LOCKED_HI))

			     (high & MASK_LOCKED_HI))

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

+2 −1
Original line number Original line 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,

		err = sysfs_add_file_to_group(&sys_dev->kobj,

					      &attr_core_power_limit_count.attr,

					      &attr_core_power_limit_count.attr,

					      thermal_attr_group.name);

					      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,

		err = sysfs_add_file_to_group(&sys_dev->kobj,

					      &attr_package_throttle_count.attr,

					      &attr_package_throttle_count.attr,

					      thermal_attr_group.name);

					      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,

			err = sysfs_add_file_to_group(&sys_dev->kobj,

					&attr_package_power_limit_count.attr,

					&attr_package_power_limit_count.attr,

					thermal_attr_group.name);

					thermal_attr_group.name);

	}





	return err;

	return err;

}

}

arch/x86/mm/srat_64.c

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

		return -1;

	}

	}





	for_each_node_mask(i, nodes_parsed)

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

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

		e820_register_active_regions(memblk_nodeid[i],

						nodes[i].end >> PAGE_SHIFT);

				node_memblk_range[i].start >> PAGE_SHIFT,

				node_memblk_range[i].end >> PAGE_SHIFT);



	/* for out of order entries in SRAT */

	/* for out of order entries in SRAT */

	sort_node_map();

	sort_node_map();

	if (!nodes_cover_memory(nodes)) {

	if (!nodes_cover_memory(nodes)) {