Merge master.kernel.org:/home/davem/BK/misc-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

drivers/ide/ide-disk.c

@@ -71,7 +71,8 @@ static int lba_capacity_is_ok(struct hd_driveid *id)
 	unsigned long lba_sects, chs_sects, head, tail;
 
 	if ((id->command_set_2 & 0x0400) && (id->cfs_enable_2 & 0x0400)) {
-		printk("48-bit Drive: %llu \n", id->lba_capacity_2);
+		printk("48-bit Drive: %llu \n",
+		       (unsigned long long) id->lba_capacity_2);
 		return 1;
 	}
 

drivers/scsi/qlogicisp.c

@@ -1695,7 +1695,6 @@ static int isp1020_load_parameters(struct Scsi_Host *host)
 	u_short param[6];
 #endif
 	u_short isp_cfg1, hwrev;
-	unsigned long flags;
 	struct isp1020_hostdata *hostdata =
 		(struct isp1020_hostdata *) host->hostdata;
 

drivers/scsi/sr.c

@@ -734,7 +734,7 @@ static ssize_t sr_device_kdev_read(struct device *driverfs_dev,
 				   char *page, size_t count, loff_t off)
 {
 	kdev_t kdev; 
-	kdev.value=(int)driverfs_dev->driver_data;
+	kdev.value=(int)(long)driverfs_dev->driver_data;
 	return off ? 0 : sprintf(page, "%x\n",kdev.value);
 }
 static DEVICE_ATTR(kdev,"kdev",S_IRUGO,sr_device_kdev_read,NULL);
@@ -800,7 +800,7 @@ void sr_finish()
 			&SCp->device->sdev_driverfs_dev;
 		SCp->cdi.cdrom_driverfs_dev.bus = &scsi_driverfs_bus_type;
 		SCp->cdi.cdrom_driverfs_dev.driver_data = 
-			(void *)__mkdev(MAJOR_NR, i);
+			(void *)(long)__mkdev(MAJOR_NR, i);
 		device_register(&SCp->cdi.cdrom_driverfs_dev);
 		device_create_file(&SCp->cdi.cdrom_driverfs_dev,
 				   &dev_attr_type);

drivers/scsi/st.c

@@ -3530,7 +3530,7 @@ static ssize_t st_device_kdev_read(struct device *driverfs_dev,
 				   char *page, size_t count, loff_t off)
 {
 	kdev_t kdev; 
-	kdev.value=(int)driverfs_dev->driver_data;
+	kdev.value=(int)(long)driverfs_dev->driver_data;
 	return off ? 0 : sprintf(page, "%x\n",kdev.value);
 }
 static DEVICE_ATTR(kdev,"kdev",S_IRUGO,st_device_kdev_read,NULL);
@@ -3653,7 +3653,7 @@ static int st_attach(Scsi_Device * SDp)
 	    tpnt->driverfs_dev_r[mode].parent = &SDp->sdev_driverfs_dev;
 	    tpnt->driverfs_dev_r[mode].bus = &scsi_driverfs_bus_type;
 	    tpnt->driverfs_dev_r[mode].driver_data =
-			(void *)__mkdev(MAJOR_NR, i + (mode << 5));
+			(void *)(long)__mkdev(MAJOR_NR, i + (mode << 5));
 	    device_register(&tpnt->driverfs_dev_r[mode]);
 	    device_create_file(&tpnt->driverfs_dev_r[mode], 
 			       &dev_attr_type);
@@ -3672,7 +3672,7 @@ static int st_attach(Scsi_Device * SDp)
 	    tpnt->driverfs_dev_n[mode].parent= &SDp->sdev_driverfs_dev;
 	    tpnt->driverfs_dev_n[mode].bus = &scsi_driverfs_bus_type;
 	    tpnt->driverfs_dev_n[mode].driver_data =
-			(void *)__mkdev(MAJOR_NR, i + (mode << 5) + 128);
+			(void *)(long)__mkdev(MAJOR_NR, i + (mode << 5) + 128);
 	    device_register(&tpnt->driverfs_dev_n[mode]);
 	    device_create_file(&tpnt->driverfs_dev_n[mode], 
 			       &dev_attr_type);

fs/jfs/resize.c

@@ -314,7 +314,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
 	if (mapSize > t64) {
 		printk(KERN_ERR
 		       "jfs_extendfs: mapSize (0x%llx) > t64 (0x%llx)\n",
-		       mapSize, t64);
+		       (long long) mapSize, (long long) t64);
 		rc = EIO;
 		goto error_out;
 	}

kernel/cpu.c

@@ -46,7 +46,7 @@ int __devinit cpu_up(unsigned int cpu)
 
 	/* Now call notifier in preparation. */
 	printk("CPU %u IS NOW UP!\n", cpu);
-	notifier_call_chain(&cpu_chain, CPU_ONLINE, (void *)cpu);
+	notifier_call_chain(&cpu_chain, CPU_ONLINE, (void *)(long)cpu);
 
  out:
 	up(&cpucontrol);

kernel/sched.c

@@ -2064,7 +2064,7 @@ __init int migration_init(void)
 {
 	/* Start one for boot CPU. */
 	migration_call(&migration_notifier, CPU_ONLINE,
-		       (void *)smp_processor_id());
+		       (void *)(long)smp_processor_id());
 	register_cpu_notifier(&migration_notifier);
 	return 0;
 }

kernel/softirq.c

@@ -412,7 +412,7 @@ static struct notifier_block cpu_nfb = { &cpu_callback, NULL, 0 };
 
 __init int spawn_ksoftirqd(void)
 {
-	cpu_callback(&cpu_nfb, CPU_ONLINE, (void *)smp_processor_id());
+	cpu_callback(&cpu_nfb, CPU_ONLINE, (void *)(long)smp_processor_id());
 	register_cpu_notifier(&cpu_nfb);
 	return 0;
 }