7 files changed, 52 insertions, 48 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index e5cfb1fa47d..157fa81a264 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1867,7 +1867,7 @@ static int ipmi_pci_resume(struct pci_dev *pdev)
 
 static struct pci_device_id ipmi_pci_devices[] = {
         { PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) },
-        { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE) }
+        { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) }
 };
 MODULE_DEVICE_TABLE(pci, ipmi_pci_devices);
 
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 4bde30bb3be..75e9e38330f 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -230,34 +230,43 @@ static struct kobj_type ktype_memctrl = {
  */
 static int edac_sysfs_memctrl_setup(void)
 {
-        int err=0;
+        int err = 0;
 
         debugf1("%s()\n", __func__);
 
         /* create the /sys/devices/system/edac directory */
         err = sysdev_class_register(&edac_class);
 
-        if (!err) {
-                /* Init the MC's kobject */
-                memset(&edac_memctrl_kobj, 0, sizeof (edac_memctrl_kobj));
-                edac_memctrl_kobj.parent = &edac_class.kset.kobj;
-                edac_memctrl_kobj.ktype = &ktype_memctrl;
+        if (err) {
+                debugf1("%s() error=%d\n", __func__, err);
+                return err;
+        }
 
-                /* generate sysfs "..../edac/mc"   */
-                err = kobject_set_name(&edac_memctrl_kobj,"mc");
+        /* Init the MC's kobject */
+        memset(&edac_memctrl_kobj, 0, sizeof (edac_memctrl_kobj));
+        edac_memctrl_kobj.parent = &edac_class.kset.kobj;
+        edac_memctrl_kobj.ktype = &ktype_memctrl;
 
-                if (!err) {
-                        /* FIXME: maybe new sysdev_create_subdir() */
-                        err = kobject_register(&edac_memctrl_kobj);
+        /* generate sysfs "..../edac/mc"   */
+        err = kobject_set_name(&edac_memctrl_kobj,"mc");
 
-                        if (err)
-                                debugf1("Failed to register '.../edac/mc'\n");
-                        else
-                                debugf1("Registered '.../edac/mc' kobject\n");
-                }
-        } else
-                debugf1("%s() error=%d\n", __func__, err);
+        if (err)
+                goto fail;
+
+        /* FIXME: maybe new sysdev_create_subdir() */
+        err = kobject_register(&edac_memctrl_kobj);
+
+        if (err) {
+                debugf1("Failed to register '.../edac/mc'\n");
+                goto fail;
+        }
 
+        debugf1("Registered '.../edac/mc' kobject\n");
+
+        return 0;
+
+fail:
+        sysdev_class_unregister(&edac_class);
         return err;
 }
 
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 2b0ea8b6608..753fe0e2145 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -75,6 +75,7 @@ static struct amd_ide_chip {
         { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,        0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,        0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,        0x50, AMD_UDMA_133 },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE,        0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_AMD_CS5536_IDE,                 0x40, AMD_UDMA_100 },
         { 0 }
 };
@@ -491,7 +492,8 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
         /* 16 */ DECLARE_NV_DEV("NFORCE-MCP55"),
         /* 17 */ DECLARE_NV_DEV("NFORCE-MCP61"),
         /* 18 */ DECLARE_NV_DEV("NFORCE-MCP65"),
-        /* 19 */ DECLARE_AMD_DEV("AMD5536"),
+        /* 19 */ DECLARE_NV_DEV("NFORCE-MCP67"),
+        /* 20 */ DECLARE_AMD_DEV("AMD5536"),
 };
 
 static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -530,7 +532,8 @@ static struct pci_device_id amd74xx_pci_tbl[] = {
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },
-        { PCI_VENDOR_ID_AMD,    PCI_DEVICE_ID_AMD_CS5536_IDE,           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19 },
+        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19 },
+        { PCI_VENDOR_ID_AMD,    PCI_DEVICE_ID_AMD_CS5536_IDE,           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20 },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c
index 1fadf0133e9..18758772b74 100644
--- a/drivers/isdn/hysdn/hysdn_sched.c
+++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -155,21 +155,17 @@ hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan)
         if (card->debug_flags & LOG_SCHED_ASYN)
                 hysdn_addlog(card, "async tx-cfg chan=%d len=%d", chan, strlen(line) + 1);
 
-        spin_lock_irqsave(&card->hysdn_lock, flags);
         while (card->async_busy) {
-                sti();
 
                 if (card->debug_flags & LOG_SCHED_ASYN)
                         hysdn_addlog(card, "async tx-cfg delayed");
 
                 msleep_interruptible(20);               /* Timeout 20ms */
-                if (!--cnt) {
-                        spin_unlock_irqrestore(&card->hysdn_lock, flags);
+                if (!--cnt)
                         return (-ERR_ASYNC_TIME);       /* timed out */
-                }
-                cli();
         }                       /* wait for buffer to become free */
 
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         strcpy(card->async_data, line);
         card->async_len = strlen(line) + 1;
         card->async_channel = chan;
@@ -177,30 +173,23 @@ hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan)
 
         /* now queue the task */
         schedule_work(&card->irq_queue);
-        sti();
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 
         if (card->debug_flags & LOG_SCHED_ASYN)
                 hysdn_addlog(card, "async tx-cfg data queued");
 
         cnt++;                  /* short delay */
-        cli();
 
         while (card->async_busy) {
-                sti();
 
                 if (card->debug_flags & LOG_SCHED_ASYN)
                         hysdn_addlog(card, "async tx-cfg waiting for tx-ready");
 
                 msleep_interruptible(20);               /* Timeout 20ms */
-                if (!--cnt) {
-                        spin_unlock_irqrestore(&card->hysdn_lock, flags);
+                if (!--cnt)
                         return (-ERR_ASYNC_TIME);       /* timed out */
-                }
-                cli();
         }                       /* wait for buffer to become free again */
 
-        spin_unlock_irqrestore(&card->hysdn_lock, flags);
-
         if (card->debug_flags & LOG_SCHED_ASYN)
                 hysdn_addlog(card, "async tx-cfg data send");
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 50ab4a936e3..d1113560440 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3200,6 +3200,7 @@ static int do_md_run(mddev_t * mddev)
 
         mddev->changed = 1;
         md_new_event(mddev);
+        kobject_uevent(&mddev->gendisk->kobj, KOBJ_ONLINE);
         return 0;
 }
 
@@ -3313,6 +3314,7 @@ static int do_md_stop(mddev_t * mddev, int mode)
 
                         module_put(mddev->pers->owner);
                         mddev->pers = NULL;
+                        kobject_uevent(&mddev->gendisk->kobj, KOBJ_OFFLINE);
                         if (mddev->ro)
                                 mddev->ro = 0;
                 }
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index bbdba7b37e1..46a9c35943b 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -44,12 +44,14 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/fs.h>
 #include <linux/module.h>
+#include <linux/buffer_head.h>
 #include <linux/kprobes.h>
-#include <linux/kallsyms.h>
+#include <linux/list.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/hrtimer.h>
 #include <scsi/scsi_cmnd.h>
 
 #ifdef CONFIG_IDE
@@ -116,16 +118,16 @@ static enum ctype cptype = NONE;
 static int count = DEFAULT_COUNT;
 
 module_param(recur_count, int, 0644);
-MODULE_PARM_DESC(recur_count, "Recurcion level for the stack overflow test,\
-                                 default is 10");
+MODULE_PARM_DESC(recur_count, " Recursion level for the stack overflow test, "\
+                                 "default is 10");
 module_param(cpoint_name, charp, 0644);
-MODULE_PARM_DESC(cpoint_name, "Crash Point, where kernel is to be crashed");
-module_param(cpoint_type, charp, 06444);
-MODULE_PARM_DESC(cpoint_type, "Crash Point Type, action to be taken on\
-                                hitting the crash point");
-module_param(cpoint_count, int, 06444);
-MODULE_PARM_DESC(cpoint_count, "Crash Point Count, number of times the \
-                                crash point is to be hit to trigger action");
+MODULE_PARM_DESC(cpoint_name, " Crash Point, where kernel is to be crashed");
+module_param(cpoint_type, charp, 0644);
+MODULE_PARM_DESC(cpoint_type, " Crash Point Type, action to be taken on "\
+                                "hitting the crash point");
+module_param(cpoint_count, int, 0644);
+MODULE_PARM_DESC(cpoint_count, " Crash Point Count, number of times the "\
+                                "crash point is to be hit to trigger action");
 
 unsigned int jp_do_irq(unsigned int irq)
 {
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 146298ad737..c3c0626f550 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -281,7 +281,6 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
         up(&board_lock);
         return 0;
 }
-EXPORT_SYMBOL_GPL(spi_register_board_info);
 
 /* FIXME someone should add support for a __setup("spi", ...) that
  * creates board info from kernel command lines