8 files changed, 67 insertions, 17 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 241064a32241..7406fe6966f9 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -204,7 +204,7 @@ int cpu_down(unsigned int cpu)
 #endif /*CONFIG_HOTPLUG_CPU*/
 
 /* Requires cpu_add_remove_lock to be held */
-static int __devinit _cpu_up(unsigned int cpu)
+static int __cpuinit _cpu_up(unsigned int cpu)
 {
         int ret;
         void *hcpu = (void *)(long)cpu;
@@ -239,7 +239,7 @@ out_notify:
         return ret;
 }
 
-int __devinit cpu_up(unsigned int cpu)
+int __cpuinit cpu_up(unsigned int cpu)
 {
         int err = 0;
 
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 543ea2e5ad93..9d8c79b48823 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -176,7 +176,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
 
 int noirqdebug __read_mostly;
 
-int __init noirqdebug_setup(char *str)
+int noirqdebug_setup(char *str)
 {
         noirqdebug = 1;
         printk(KERN_INFO "IRQ lockup detection disabled\n");
diff --git a/kernel/module.c b/kernel/module.c
index dbce132b354c..d0f2260a0210 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1148,10 +1148,10 @@ static int mod_sysfs_setup(struct module *mod,
         kobject_uevent(&mod->mkobj.kobj, KOBJ_ADD);
         return 0;
 
-out_unreg_drivers:
-        kobject_unregister(mod->drivers_dir);
 out_unreg_param:
         module_param_sysfs_remove(mod);
+out_unreg_drivers:
+        kobject_unregister(mod->drivers_dir);
 out_unreg:
         kobject_del(&mod->mkobj.kobj);
         kobject_put(&mod->mkobj.kobj);
@@ -2327,8 +2327,22 @@ void print_modules(void)
         printk("\n");
 }
 
+static char *make_driver_name(struct device_driver *drv)
+{
+        char *driver_name;
+
+        driver_name = kmalloc(strlen(drv->name) + strlen(drv->bus->name) + 2,
+                              GFP_KERNEL);
+        if (!driver_name)
+                return NULL;
+
+        sprintf(driver_name, "%s:%s", drv->bus->name, drv->name);
+        return driver_name;
+}
+
 void module_add_driver(struct module *mod, struct device_driver *drv)
 {
+        char *driver_name;
         int no_warn;
 
         if (!mod || !drv)
@@ -2336,17 +2350,31 @@ void module_add_driver(struct module *mod, struct device_driver *drv)
 
         /* Don't check return codes; these calls are idempotent */
         no_warn = sysfs_create_link(&drv->kobj, &mod->mkobj.kobj, "module");
-        no_warn = sysfs_create_link(mod->drivers_dir, &drv->kobj, drv->name);
+        driver_name = make_driver_name(drv);
+        if (driver_name) {
+                no_warn = sysfs_create_link(mod->drivers_dir, &drv->kobj,
+                                            driver_name);
+                kfree(driver_name);
+        }
 }
 EXPORT_SYMBOL(module_add_driver);
 
 void module_remove_driver(struct device_driver *drv)
 {
+        char *driver_name;
+
         if (!drv)
                 return;
+
         sysfs_remove_link(&drv->kobj, "module");
-        if (drv->owner && drv->owner->drivers_dir)
-                sysfs_remove_link(drv->owner->drivers_dir, drv->name);
+        if (drv->owner && drv->owner->drivers_dir) {
+                driver_name = make_driver_name(drv);
+                if (driver_name) {
+                        sysfs_remove_link(drv->owner->drivers_dir,
+                                          driver_name);
+                        kfree(driver_name);
+                }
+        }
 }
 EXPORT_SYMBOL(module_remove_driver);
 
diff --git a/kernel/params.c b/kernel/params.c
index f406655d6653..718945da8f58 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -143,9 +143,15 @@ int parse_args(const char *name,
 
         while (*args) {
                 int ret;
+                int irq_was_disabled;
 
                 args = next_arg(args, &param, &val);
+                irq_was_disabled = irqs_disabled();
                 ret = parse_one(param, val, params, num, unknown);
+                if (irq_was_disabled && !irqs_disabled()) {
+                        printk(KERN_WARNING "parse_args(): option '%s' enabled "
+                                        "irq's!\n", param);
+                }
                 switch (ret) {
                 case -ENOENT:
                         printk(KERN_ERR "%s: Unknown parameter `%s'\n",
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index f133d4a6d817..3581f8f86acd 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -165,14 +165,15 @@ static int swsusp_swap_check(void) /* This is called before saving image */
 {
         int res;
 
-        res = swap_type_of(swsusp_resume_device, swsusp_resume_block);
+        res = swap_type_of(swsusp_resume_device, swsusp_resume_block,
+                        &resume_bdev);
         if (res < 0)
                 return res;
 
         root_swap = res;
-        resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_WRITE);
-        if (IS_ERR(resume_bdev))
-                return PTR_ERR(resume_bdev);
+        res = blkdev_get(resume_bdev, FMODE_WRITE, O_RDWR);
+        if (res)
+                return res;
 
         res = set_blocksize(resume_bdev, PAGE_SIZE);
         if (res < 0)
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 89443b85163b..f7b7a785a5c6 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -57,7 +57,7 @@ static int snapshot_open(struct inode *inode, struct file *filp)
         memset(&data->handle, 0, sizeof(struct snapshot_handle));
         if ((filp->f_flags & O_ACCMODE) == O_RDONLY) {
                 data->swap = swsusp_resume_device ?
-                                swap_type_of(swsusp_resume_device, 0) : -1;
+                        swap_type_of(swsusp_resume_device, 0, NULL) : -1;
                 data->mode = O_RDONLY;
         } else {
                 data->swap = -1;
@@ -268,7 +268,8 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                          * so we need to recode them
                          */
                         if (old_decode_dev(arg)) {
-                                data->swap = swap_type_of(old_decode_dev(arg), 0);
+                                data->swap = swap_type_of(old_decode_dev(arg),
+                                                        0, NULL);
                                 if (data->swap < 0)
                                         error = -ENODEV;
                         } else {
@@ -365,7 +366,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                         swdev = old_decode_dev(swap_area.dev);
                         if (swdev) {
                                 offset = swap_area.offset;
-                                data->swap = swap_type_of(swdev, offset);
+                                data->swap = swap_type_of(swdev, offset, NULL);
                                 if (data->swap < 0)
                                         error = -ENODEV;
                         } else {
diff --git a/kernel/profile.c b/kernel/profile.c
index fb5e03d57e9d..a6574a18514e 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -40,7 +40,10 @@ int (*timer_hook)(struct pt_regs *) __read_mostly;
 
 static atomic_t *prof_buffer;
 static unsigned long prof_len, prof_shift;
+
 int prof_on __read_mostly;
+EXPORT_SYMBOL_GPL(prof_on);
+
 static cpumask_t prof_cpu_mask = CPU_MASK_ALL;
 #ifdef CONFIG_SMP
 static DEFINE_PER_CPU(struct profile_hit *[2], cpu_profile_hits);
@@ -52,6 +55,7 @@ static int __init profile_setup(char * str)
 {
         static char __initdata schedstr[] = "schedule";
         static char __initdata sleepstr[] = "sleep";
+        static char __initdata kvmstr[] = "kvm";
         int par;
 
         if (!strncmp(str, sleepstr, strlen(sleepstr))) {
@@ -63,7 +67,7 @@ static int __init profile_setup(char * str)
                 printk(KERN_INFO
                         "kernel sleep profiling enabled (shift: %ld)\n",
                         prof_shift);
-        } else if (!strncmp(str, sleepstr, strlen(sleepstr))) {
+        } else if (!strncmp(str, schedstr, strlen(schedstr))) {
                 prof_on = SCHED_PROFILING;
                 if (str[strlen(schedstr)] == ',')
                         str += strlen(schedstr) + 1;
@@ -72,6 +76,15 @@ static int __init profile_setup(char * str)
                 printk(KERN_INFO
                         "kernel schedule profiling enabled (shift: %ld)\n",
                         prof_shift);
+        } else if (!strncmp(str, kvmstr, strlen(kvmstr))) {
+                prof_on = KVM_PROFILING;
+                if (str[strlen(kvmstr)] == ',')
+                        str += strlen(kvmstr) + 1;
+                if (get_option(&str, &par))
+                        prof_shift = par;
+                printk(KERN_INFO
+                        "kernel KVM profiling enabled (shift: %ld)\n",
+                        prof_shift);
         } else if (get_option(&str, &par)) {
                 prof_shift = par;
                 prof_on = CPU_PROFILING;
@@ -318,6 +331,7 @@ out:
         local_irq_restore(flags);
         put_cpu();
 }
+EXPORT_SYMBOL_GPL(profile_hits);
 
 static int __devinit profile_cpu_callback(struct notifier_block *info,
                                         unsigned long action, void *__cpu)
diff --git a/kernel/sched.c b/kernel/sched.c
index 3df33da0dafc..cca93cc0dd7d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6865,7 +6865,7 @@ void __init sched_init_smp(void)
 
         lock_cpu_hotplug();
         arch_init_sched_domains(&cpu_online_map);
-        cpus_andnot(non_isolated_cpus, cpu_online_map, cpu_isolated_map);
+        cpus_andnot(non_isolated_cpus, cpu_possible_map, cpu_isolated_map);
         if (cpus_empty(non_isolated_cpus))
                 cpu_set(smp_processor_id(), non_isolated_cpus);
         unlock_cpu_hotplug();