Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-10
+3
-6
arch/x86/kernel/cpu/mcheck/mce_amd.c
+3
-6
arch/x86/kernel/cpu/mcheck/mce_amd.c
···
141
141
address = (low & MASK_BLKPTR_LO) >> 21;
142
142
if (!address)
143
143
break;
144
+
144
145
address += MCG_XBLK_ADDR;
145
146
} else
146
147
++address;
···
149
148
if (rdmsr_safe(address, &low, &high))
150
149
break;
151
150
152
-
if (!(high & MASK_VALID_HI)) {
153
-
if (block)
154
-
continue;
155
-
else
156
-
break;
157
-
}
151
+
if (!(high & MASK_VALID_HI))
152
+
continue;
158
153
159
154
if (!(high & MASK_CNTP_HI) ||
160
155
(high & MASK_LOCKED_HI))
+2
-1
arch/x86/kernel/cpu/mcheck/therm_throt.c
+2
-1
arch/x86/kernel/cpu/mcheck/therm_throt.c
···
216
216
err = sysfs_add_file_to_group(&sys_dev->kobj,
217
217
&attr_core_power_limit_count.attr,
218
218
thermal_attr_group.name);
219
-
if (cpu_has(c, X86_FEATURE_PTS))
219
+
if (cpu_has(c, X86_FEATURE_PTS)) {
220
220
err = sysfs_add_file_to_group(&sys_dev->kobj,
221
221
&attr_package_throttle_count.attr,
222
222
thermal_attr_group.name);
···
224
224
err = sysfs_add_file_to_group(&sys_dev->kobj,
225
225
&attr_package_power_limit_count.attr,
226
226
thermal_attr_group.name);
227
+
}
227
228
228
229
return err;
229
230
}
+5
-3
arch/x86/mm/srat_64.c
+5
-3
arch/x86/mm/srat_64.c
···
420
420
return -1;
421
421
}
422
422
423
-
for_each_node_mask(i, nodes_parsed)
424
-
e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
425
-
nodes[i].end >> PAGE_SHIFT);
423
+
for (i = 0; i < num_node_memblks; i++)
424
+
e820_register_active_regions(memblk_nodeid[i],
425
+
node_memblk_range[i].start >> PAGE_SHIFT,
426
+
node_memblk_range[i].end >> PAGE_SHIFT);
427
+
426
428
/* for out of order entries in SRAT */
427
429
sort_node_map();
428
430
if (!nodes_cover_memory(nodes)) {