10 files changed, 65 insertions, 47 deletions

diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index 302e92418bbe..ff51ab67231c 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -210,13 +210,10 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        proc_de = create_proc_entry("sky_cpustate", 0666, &proc_root);
+        proc_de = proc_create("sky_cpustate", 0666, NULL, &proc_cpustate);
         if (!proc_de) {
                 printk(KERN_WARNING "sky_cpustate: "
                        "Unable to create proc entry\n");
-        } else {
-                proc_de->proc_fops = &proc_cpustate;
-                proc_de->owner = THIS_MODULE;
         }
 
         printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 2fa36f7a6eb3..08e26beefe64 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -102,22 +102,17 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
                 printk(KERN_ERR "sky_nexus: Could not map slot id\n");
         }
 
-        hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
+        hdpu_slot_id = proc_create("sky_slot_id", 0666, NULL, &proc_slot_id);
         if (!hdpu_slot_id) {
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_slot_id\n");
-        } else {
-                hdpu_slot_id->proc_fops = &proc_slot_id;
-                hdpu_slot_id->owner = THIS_MODULE;
         }
 
-        hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
-        if (!hdpu_chassis_id) {
+        hdpu_chassis_id = proc_create("sky_chassis_id", 0666, NULL,
+                                      &proc_chassis_id);
+        if (!hdpu_chassis_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_chassis_id\n");
-        } else {
-                hdpu_chassis_id->proc_fops = &proc_chassis_id;
-                hdpu_chassis_id->owner = THIS_MODULE;
         }
 
         return 0;
@@ -128,8 +123,8 @@ static int hdpu_nexus_remove(struct platform_device *pdev)
         slot_id = -1;
         chassis_id = -1;
 
-        remove_proc_entry("sky_slot_id", &proc_root);
-        remove_proc_entry("sky_chassis_id", &proc_root);
+        remove_proc_entry("sky_slot_id", NULL);
+        remove_proc_entry("sky_chassis_id", NULL);
 
         hdpu_slot_id = 0;
         hdpu_chassis_id = 0;
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c
index 1a0e7978226a..276d3fb68094 100644
--- a/drivers/misc/ibmasm/command.c
+++ b/drivers/misc/ibmasm/command.c
@@ -96,7 +96,7 @@ static inline void do_exec_command(struct service_processor *sp)
 {
         char tsbuf[32];
 
-        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf));
 
         if (ibmasm_send_i2o_message(sp)) {
                 sp->current_command->status = IBMASM_CMD_FAILED;
@@ -119,7 +119,7 @@ void ibmasm_exec_command(struct service_processor *sp, struct command *cmd)
         unsigned long flags;
         char tsbuf[32];
 
-        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf));
 
         spin_lock_irqsave(&sp->lock, flags);
 
@@ -139,7 +139,7 @@ static void exec_next_command(struct service_processor *sp)
         unsigned long flags;
         char tsbuf[32];
 
-        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf));
 
         spin_lock_irqsave(&sp->lock, flags);
         sp->current_command = dequeue_command(sp);
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c
index 3036e785b3e4..1bc4306572a4 100644
--- a/drivers/misc/ibmasm/heartbeat.c
+++ b/drivers/misc/ibmasm/heartbeat.c
@@ -75,9 +75,9 @@ void ibmasm_heartbeat_exit(struct service_processor *sp)
 {
         char tsbuf[32];
 
-        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf));
         ibmasm_wait_for_response(sp->heartbeat, IBMASM_CMD_TIMEOUT_NORMAL);
-        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf));
         suspend_heartbeats = 1;
         command_put(sp->heartbeat);
 }
@@ -88,7 +88,7 @@ void ibmasm_receive_heartbeat(struct service_processor *sp,  void *message, size
         struct dot_command_header *header = (struct dot_command_header *)cmd->buffer;
         char tsbuf[32];
 
-        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf));
         if (suspend_heartbeats)
                 return;
 
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c
index 5bb8816c9126..80a136352408 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/misc/intel_menlow.c
@@ -179,14 +179,22 @@ static int intel_menlow_memory_add(struct acpi_device *device)
         result = sysfs_create_link(&device->dev.kobj,
                                 &cdev->device.kobj, "thermal_cooling");
         if (result)
-                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                goto unregister;
+
         result = sysfs_create_link(&cdev->device.kobj,
                                 &device->dev.kobj, "device");
-        if (result)
-                printk(KERN_ERR PREFIX "Create sysfs link\n");
+        if (result) {
+                sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+                goto unregister;
+        }
 
  end:
         return result;
+
+ unregister:
+        thermal_cooling_device_unregister(cdev);
+        return result;
+
 }
 
 static int intel_menlow_memory_remove(struct acpi_device *device, int type)
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 05172d2613d6..6f76573e7c8a 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -75,7 +75,7 @@ ioc4_register_submodule(struct ioc4_submodule *is)
                         printk(KERN_WARNING
                                "%s: IOC4 submodule %s probe failed "
                                "for pci_dev %s",
-                               __FUNCTION__, module_name(is->is_owner),
+                               __func__, module_name(is->is_owner),
                                pci_name(idd->idd_pdev));
                 }
         }
@@ -102,7 +102,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is)
                         printk(KERN_WARNING
                                "%s: IOC4 submodule %s remove failed "
                                "for pci_dev %s.\n",
-                               __FUNCTION__, module_name(is->is_owner),
+                               __func__, module_name(is->is_owner),
                                pci_name(idd->idd_pdev));
                 }
         }
@@ -282,7 +282,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         if ((ret = pci_enable_device(pdev))) {
                 printk(KERN_WARNING
                        "%s: Failed to enable IOC4 device for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 goto out;
         }
         pci_set_master(pdev);
@@ -292,7 +292,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         if (!idd) {
                 printk(KERN_WARNING
                        "%s: Failed to allocate IOC4 data for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(pdev));
+                       __func__, pci_name(pdev));
                 ret = -ENODEV;
                 goto out_idd;
         }
@@ -307,7 +307,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 printk(KERN_WARNING
                        "%s: Unable to find IOC4 misc resource "
                        "for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(idd->idd_pdev));
+                       __func__, pci_name(idd->idd_pdev));
                 ret = -ENODEV;
                 goto out_pci;
         }
@@ -316,7 +316,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 printk(KERN_WARNING
                        "%s: Unable to request IOC4 misc region "
                        "for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(idd->idd_pdev));
+                       __func__, pci_name(idd->idd_pdev));
                 ret = -ENODEV;
                 goto out_pci;
         }
@@ -326,7 +326,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 printk(KERN_WARNING
                        "%s: Unable to remap IOC4 misc region "
                        "for pci_dev %s.\n",
-                       __FUNCTION__, pci_name(idd->idd_pdev));
+                       __func__, pci_name(idd->idd_pdev));
                 ret = -ENODEV;
                 goto out_misc_region;
         }
@@ -372,7 +372,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                         printk(KERN_WARNING
                                "%s: IOC4 submodule 0x%s probe failed "
                                "for pci_dev %s.\n",
-                               __FUNCTION__, module_name(is->is_owner),
+                               __func__, module_name(is->is_owner),
                                pci_name(idd->idd_pdev));
                 }
         }
@@ -406,7 +406,7 @@ ioc4_remove(struct pci_dev *pdev)
                         printk(KERN_WARNING
                                "%s: IOC4 submodule 0x%s remove failed "
                                "for pci_dev %s.\n",
-                               __FUNCTION__, module_name(is->is_owner),
+                               __func__, module_name(is->is_owner),
                                pci_name(idd->idd_pdev));
                 }
         }
@@ -418,7 +418,7 @@ ioc4_remove(struct pci_dev *pdev)
                 printk(KERN_WARNING
                        "%s: Unable to get IOC4 misc mapping for pci_dev %s. "
                        "Device removal may be incomplete.\n",
-                       __FUNCTION__, pci_name(idd->idd_pdev));
+                       __func__, pci_name(idd->idd_pdev));
         }
         release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
 
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 6d6286c4eeac..30a1af857c7a 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -132,7 +132,7 @@ static int send_ack;
 static int final_ack;
 static int hw_break_val;
 static int hw_break_val2;
-#if defined(CONFIG_ARM) || defined(CONFIG_MIPS)
+#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || defined(CONFIG_SPARC)
 static int arch_needs_sstep_emulation = 1;
 #else
 static int arch_needs_sstep_emulation;
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 7fa61e907e1c..71d1c84e2fa8 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -12,6 +12,7 @@
  *  or alternatively, you might use OpenHaptics provided by Sensable.
  */
 
+#include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -91,11 +92,8 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
         unsigned long flags;
         unsigned int i;
 
-        if (_IOC_TYPE(cmd) != PH_IOC_MAGIC ||
-                        _IOC_NR(cmd) > PH_IOC_MAXNR)
-                return -ENOTTY;
-
         switch (cmd) {
+        case PHN_SETREG:
         case PHN_SET_REG:
                 if (copy_from_user(&r, argp, sizeof(r)))
                         return -EFAULT;
@@ -126,6 +124,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
                         phantom_status(dev, dev->status & ~PHB_RUNNING);
                 spin_unlock_irqrestore(&dev->regs_lock, flags);
                 break;
+        case PHN_SETREGS:
         case PHN_SET_REGS:
                 if (copy_from_user(&rs, argp, sizeof(rs)))
                         return -EFAULT;
@@ -143,6 +142,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
                 }
                 spin_unlock_irqrestore(&dev->regs_lock, flags);
                 break;
+        case PHN_GETREG:
         case PHN_GET_REG:
                 if (copy_from_user(&r, argp, sizeof(r)))
                         return -EFAULT;
@@ -155,6 +155,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
                 if (copy_to_user(argp, &r, sizeof(r)))
                         return -EFAULT;
                 break;
+        case PHN_GETREGS:
         case PHN_GET_REGS: {
                 u32 m;
 
@@ -168,6 +169,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
                 for (i = 0; i < m; i++)
                         if (rs.mask & BIT(i))
                                 rs.values[i] = ioread32(dev->iaddr + i);
+                atomic_set(&dev->counter, 0);
                 spin_unlock_irqrestore(&dev->regs_lock, flags);
 
                 if (copy_to_user(argp, &rs, sizeof(rs)))
@@ -191,6 +193,20 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
         return 0;
 }
 
+#ifdef CONFIG_COMPAT
+static long phantom_compat_ioctl(struct file *filp, unsigned int cmd,
+                unsigned long arg)
+{
+        if (_IOC_NR(cmd) <= 3 && _IOC_SIZE(cmd) == sizeof(compat_uptr_t)) {
+                cmd &= ~(_IOC_SIZEMASK << _IOC_SIZESHIFT);
+                cmd |= sizeof(void *) << _IOC_SIZESHIFT;
+        }
+        return phantom_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
+}
+#else
+#define phantom_compat_ioctl NULL
+#endif
+
 static int phantom_open(struct inode *inode, struct file *file)
 {
         struct phantom_device *dev = container_of(inode->i_cdev,
@@ -239,11 +255,12 @@ static unsigned int phantom_poll(struct file *file, poll_table *wait)
 
         pr_debug("phantom_poll: %d\n", atomic_read(&dev->counter));
         poll_wait(file, &dev->wait, wait);
-        if (atomic_read(&dev->counter)) {
+
+        if (!(dev->status & PHB_RUNNING))
+                mask = POLLERR;
+        else if (atomic_read(&dev->counter))
                 mask = POLLIN | POLLRDNORM;
-                atomic_dec(&dev->counter);
-        } else if ((dev->status & PHB_RUNNING) == 0)
-                mask = POLLIN | POLLRDNORM | POLLERR;
+
         pr_debug("phantom_poll end: %x/%d\n", mask, atomic_read(&dev->counter));
 
         return mask;
@@ -253,6 +270,7 @@ static struct file_operations phantom_file_ops = {
         .open = phantom_open,
         .release = phantom_release,
         .unlocked_ioctl = phantom_ioctl,
+        .compat_ioctl = phantom_compat_ioctl,
         .poll = phantom_poll,
 };
 
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index 27e200ec5826..acd3fd4285d7 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -211,7 +211,7 @@ xpc_rsvd_page_init(void)
          */
         amos_page = xpc_vars->amos_page;
         if (amos_page == NULL) {
-                amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0));
+                amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0, 1));
                 if (amos_page == NULL) {
                         dev_err(xpc_part, "can't allocate page of AMOs\n");
                         return NULL;
@@ -230,7 +230,7 @@ xpc_rsvd_page_init(void)
                                 dev_err(xpc_part, "can't change memory "
                                         "protections\n");
                                 uncached_free_page(__IA64_UNCACHED_OFFSET |
-                                                   TO_PHYS((u64)amos_page));
+                                                   TO_PHYS((u64)amos_page), 1);
                                 return NULL;
                         }
                 }
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 02ff3d19b1cc..00e48e2a9c11 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -961,7 +961,7 @@ static int sony_nc_resume(struct acpi_device *device)
                 ret = acpi_callsetfunc(sony_nc_acpi_handle, *item->acpiset,
                                        item->value, NULL);
                 if (ret < 0) {
-                        printk("%s: %d\n", __FUNCTION__, ret);
+                        printk("%s: %d\n", __func__, ret);
                         break;
                 }
         }
@@ -1453,7 +1453,7 @@ static struct sonypi_eventtypes type4_events[] = {
                 udelay(1);                                              \
         if (!n)                                                         \
                 dprintk("command failed at %s : %s (line %d)\n",        \
-                                __FILE__, __FUNCTION__, __LINE__);      \
+                                __FILE__, __func__, __LINE__);  \
 }
 
 static u8 sony_pic_call1(u8 dev)