Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

5 files changed, 20 insertions, 22 deletions

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index d505b68cd372..fc593fbab696 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -51,6 +51,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/i2o.h>
 
 #include <linux/mempool.h>
@@ -940,7 +941,7 @@ static const struct block_device_operations i2o_block_fops = {
  *      Allocate memory for the i2o_block_device struct, gendisk and request
  *      queue and initialize them as far as no additional information is needed.
  *
- *      Returns a pointer to the allocated I2O Block device on succes or a
+ *      Returns a pointer to the allocated I2O Block device on success or a
  *      negative error code on failure.
  */
 static struct i2o_block_device *i2o_block_device_alloc(void)
@@ -1065,9 +1066,8 @@ static int i2o_block_probe(struct device *dev)
         queue = gd->queue;
         queue->queuedata = i2o_blk_dev;
 
-        blk_queue_max_phys_segments(queue, I2O_MAX_PHYS_SEGMENTS);
-        blk_queue_max_sectors(queue, max_sectors);
-        blk_queue_max_hw_segments(queue, i2o_sg_tablesize(c, body_size));
+        blk_queue_max_hw_sectors(queue, max_sectors);
+        blk_queue_max_segments(queue, i2o_sg_tablesize(c, body_size));
 
         osm_debug("max sectors = %d\n", queue->max_sectors);
         osm_debug("phys segments = %d\n", queue->max_phys_segments);
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index efba7021948a..11073fa3d9f4 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -33,6 +33,7 @@
 #include <linux/miscdevice.h>
 #include <linux/smp_lock.h>
 #include <linux/compat.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
@@ -40,8 +41,7 @@
 
 #define SG_TABLESIZE            30
 
-static int i2o_cfg_ioctl(struct inode *, struct file *, unsigned int,
-                         unsigned long);
+static long i2o_cfg_ioctl(struct file *, unsigned int, unsigned long);
 
 static spinlock_t i2o_config_lock;
 
@@ -751,7 +751,7 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd,
         lock_kernel();
         switch (cmd) {
         case I2OGETIOPS:
-                ret = i2o_cfg_ioctl(NULL, file, cmd, arg);
+                ret = i2o_cfg_ioctl(file, cmd, arg);
                 break;
         case I2OPASSTHRU32:
                 ret = i2o_cfg_passthru32(file, cmd, arg);
@@ -984,11 +984,11 @@ out:
 /*
  * IOCTL Handler
  */
-static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
-                         unsigned long arg)
+static long i2o_cfg_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
         int ret;
 
+        lock_kernel();
         switch (cmd) {
         case I2OGETIOPS:
                 ret = i2o_cfg_getiops(arg);
@@ -1044,7 +1044,7 @@ static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
                 osm_debug("unknown ioctl called!\n");
                 ret = -EINVAL;
         }
-
+        unlock_kernel();
         return ret;
 }
 
@@ -1118,7 +1118,7 @@ static int cfg_release(struct inode *inode, struct file *file)
 static const struct file_operations config_fops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
-        .ioctl = i2o_cfg_ioctl,
+        .unlocked_ioctl = i2o_cfg_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = i2o_cfg_compat_ioctl,
 #endif
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 7045c45da9b1..07dbeaf9df99 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -40,6 +40,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/i2o.h>
+#include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
@@ -111,10 +112,7 @@ static int print_serial_number(struct seq_file *seq, u8 * serialno, int max_len)
                 break;
 
         case I2O_SNFORMAT_LAN48_MAC:    /* LAN-48 MAC Address */
-                seq_printf(seq,
-                           "LAN-48 MAC address @ %02X:%02X:%02X:%02X:%02X:%02X",
-                           serialno[2], serialno[3],
-                           serialno[4], serialno[5], serialno[6], serialno[7]);
+                seq_printf(seq, "LAN-48 MAC address @ %pM", &serialno[2]);
                 break;
 
         case I2O_SNFORMAT_WAN:  /* WAN MAC Address */
@@ -126,10 +124,8 @@ static int print_serial_number(struct seq_file *seq, u8 * serialno, int max_len)
         case I2O_SNFORMAT_LAN64_MAC:    /* LAN-64 MAC Address */
                 /* FIXME: Figure out what a LAN-64 address really looks like?? */
                 seq_printf(seq,
-                           "LAN-64 MAC address @ [?:%02X:%02X:?] %02X:%02X:%02X:%02X:%02X:%02X",
-                           serialno[8], serialno[9],
-                           serialno[2], serialno[3],
-                           serialno[4], serialno[5], serialno[6], serialno[7]);
+                           "LAN-64 MAC address @ [?:%02X:%02X:?] %pM",
+                           serialno[8], serialno[9], &serialno[2]);
                 break;
 
         case I2O_SNFORMAT_DDM:  /* I2O DDM */
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 27cf4af0e13d..090d2a3a6548 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -29,6 +29,7 @@
 #include <linux/i2o.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include "core.h"
 
 #define OSM_NAME        "i2o"
@@ -132,7 +133,7 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
  *      Removes a previously added pointer from the context list and returns
  *      the matching context id.
  *
- *      Returns context id on succes or 0 on failure.
+ *      Returns context id on success or 0 on failure.
  */
 u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr)
 {
@@ -198,7 +199,7 @@ void *i2o_cntxt_list_get(struct i2o_controller *c, u32 context)
  *      @c: controller to which the context list belong
  *      @ptr: pointer to which the context id should be fetched
  *
- *      Returns context id which matches to the pointer on succes or 0 on
+ *      Returns context id which matches to the pointer on success or 0 on
  *      failure.
  */
 u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr)
@@ -539,7 +540,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
                  * which is indeterminate. We need to wait until the IOP has
                  * rebooted before we can let the system talk to it. We read
                  * the inbound Free_List until a message is available. If we
-                 * can't read one in the given ammount of time, we assume the
+                 * can't read one in the given amount of time, we assume the
                  * IOP could not reboot properly.
                  */
                 osm_debug("%s: Reset in progress, waiting for reboot...\n",
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 35ba2ae38b42..73e4658af53c 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -29,6 +29,7 @@
 
 #include <linux/pci.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <linux/i2o.h>
 #include "core.h"