[PATCH] misc fixes

- xfs printk warning fix (dev_t is ulong on ppc64)

- unused var in serial_remove() (Daniele Bellucci <bellucda@tiscali.it>)

diff --git a/drivers/serial/8250_cs.c b/drivers/serial/8250_cs.c
index b1e012cb5d3d7aca630c12f0e729d11d65595bd5..a70c3ddfadfad2e3072c5213e36e3e822e02737a 100644 (file)
--- a/drivers/serial/8250_cs.c
+++ b/drivers/serial/8250_cs.c
@@ -133,7 +133,7 @@ static dev_link_t *dev_list = NULL;
 static void serial_remove(dev_link_t *link)
 {
        struct serial_info *info = link->priv;
-       int i, ret;
+       int i;
 
        link->state &= ~DEV_PRESENT;
 

diff --git a/fs/xfs/linux/xfs_super.c b/fs/xfs/linux/xfs_super.c
index 0df0d915865f6966494a510688bd3ece5c97a328..d482cb69fadeb88df8b9baed65ab3a81a65df2cf 100644 (file)
--- a/fs/xfs/linux/xfs_super.c
+++ b/fs/xfs/linux/xfs_super.c
@@ -265,8 +265,8 @@ xfs_setsize_buftarg(
 
        if (set_blocksize(btp->pbr_bdev, sectorsize)) {
                printk(KERN_WARNING
-                       "XFS: Cannot set_blocksize to %u on device 0x%x\n",
-                       sectorsize, btp->pbr_dev);
+                       "XFS: Cannot set_blocksize to %u on device 0x%lx\n",
+                       sectorsize, (unsigned long)btp->pbr_dev);
        }
 }