The patch titled
x86-microcode-add-sysfs-and-hotplug-support-fix
has been removed from the -mm tree. Its filename is
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
This patch was dropped because it was folded into x86-microcode-add-sysfs-and-hotplug-support.patch
------------------------------------------------------
Subject: x86-microcode-add-sysfs-and-hotplug-support-fix
From: Andrew Morton <akpm@xxxxxxxx>
- That code was soooo one-week-ago - try to keep up ;)
- coding style teaks.
Cc: Shaohua Li <shaohua.li@xxxxxxxxx>
Cc: Tigran Aivazian <tigran@xxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/microcode.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff -puN arch/i386/kernel/microcode.c~x86-microcode-add-sysfs-and-hotplug-support-fix arch/i386/kernel/microcode.c
--- a/arch/i386/kernel/microcode.c~x86-microcode-add-sysfs-and-hotplug-support-fix
+++ a/arch/i386/kernel/microcode.c
@@ -219,7 +219,7 @@ static int microcode_sanity_check(void *
/* check extended table checksum */
if (ext_table_size) {
int ext_table_sum = 0;
- int * ext_tablep = (int *)ext_header;
+ int *ext_tablep = (int *)ext_header;
i = ext_table_size / DWSIZE;
while (i--)
@@ -386,7 +386,7 @@ static int do_microcode_update (void)
{
long cursor = 0;
int error = 0;
- void * new_mc;
+ void *new_mc;
int cpu;
cpumask_t old;
@@ -531,7 +531,7 @@ static int cpu_request_microcode(int cpu
char name[30];
struct cpuinfo_x86 *c = cpu_data + cpu;
const struct firmware *firmware;
- void * buf;
+ void *buf;
unsigned long size;
long offset = 0;
int error;
@@ -650,7 +650,7 @@ static SYSDEV_ATTR(reload, 0200, NULL, r
static SYSDEV_ATTR(version, 0400, version_show, NULL);
static SYSDEV_ATTR(processor_flags, 0400, pf_show, NULL);
-static struct attribute * mc_default_attrs[] = {
+static struct attribute *mc_default_attrs[] = {
&attr_reload.attr,
&attr_version.attr,
&attr_processor_flags.attr,
@@ -707,6 +707,7 @@ static struct sysdev_driver mc_sysdev_dr
.resume = mc_sysdev_resume,
};
+#ifdef CONFIG_HOTPLUG_CPU
static __cpuinit int
mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
{
@@ -729,6 +730,7 @@ mc_cpu_callback(struct notifier_block *n
static struct notifier_block mc_cpu_notifier = {
.notifier_call = mc_cpu_callback,
};
+#endif
static int __init microcode_init (void)
{
@@ -753,7 +755,7 @@ static int __init microcode_init (void)
return error;
}
- register_cpu_notifier(&mc_cpu_notifier);
+ register_hotcpu_notifier(&mc_cpu_notifier);
printk(KERN_INFO
"IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@xxxxxxxxxxx>\n");
@@ -764,7 +766,7 @@ static void __exit microcode_exit (void)
{
microcode_dev_exit();
- unregister_cpu_notifier(&mc_cpu_notifier);
+ unregister_hotcpu_notifier(&mc_cpu_notifier);
lock_cpu_hotplug();
sysdev_driver_unregister(&cpu_sysdev_class, &mc_sysdev_driver);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
revert-x86_64-mm-i386-remove-lock-section.patch
fix-x86_64-mm-spinlock-cleanup.patch
have-x86-use-add_active_range-and-free_area_init_nodes.patch
vm-add-per-zone-writeout-counter.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id.patch
gfp_thisnode-for-the-slab-allocator-v2.patch
do_no_pfn.patch
nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem.patch
nommu-move-the-fallback-arch_vma_name-to-a-sensible-place.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
x86-microcode-microcode-driver-cleanup.patch
x86-microcode-add-sysfs-and-hotplug-support.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
