Fix incorrect 'flags' usage pointed out by stricter type checking.

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 8e6e8ab7eff13820dbcffa0cb54d7718879b395d..36070279601112c17289bc15ac74d705f7c590fd 100644 (file)
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1479,7 +1479,8 @@ void print_all_local_APICs (void)
 void /*__init*/ print_PIC(void)
 {
        extern spinlock_t i8259A_lock;
-       unsigned int v, flags;
+       unsigned int v;
+       unsigned long flags;
 
        printk(KERN_DEBUG "\nprinting PIC contents\n");
 

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index dc450c6405947f42f94c0b804c846a90781e5138..fd9b9419d9d63ddead85f87d3da4e22203bcc3f6 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -281,7 +281,7 @@ acpi_bus_generate_event (
        int                     data)
 {
        struct acpi_bus_event   *event = NULL;
-       u32                     flags = 0;
+       unsigned long           flags = 0;
 
        ACPI_FUNCTION_TRACE("acpi_bus_generate_event");
 
@@ -314,7 +314,7 @@ int
 acpi_bus_receive_event (
        struct acpi_bus_event   *event)
 {
-       u32                     flags = 0;
+       unsigned long           flags = 0;
        struct acpi_bus_event   *entry = NULL;
 
        DECLARE_WAITQUEUE(wait, current);

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 596e936083193adf12f40e397095ad1dffe33d37..3b6cc6268f8ad9a2a5d4b9c542c0a82acf8a9b50 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -815,7 +815,7 @@ void scsi_finish_command(Scsi_Cmnd * SCpnt)
        struct Scsi_Host *host;
        Scsi_Device *device;
        Scsi_Request * SRpnt;
-       unsigned int flags;
+       unsigned long flags;
 
        host = SCpnt->device->host;
        device = SCpnt->device;

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b2b0ce3b30a16aaeded4fae7caefbe4d045e92c4..598c945ae33f297a978c76d4d3c0bb0c4b0cdde0 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -336,7 +336,7 @@ void scsi_setup_cmd_retry(struct scsi_cmnd *cmd)
 static void scsi_single_lun_run(struct scsi_device *current_sdev)
 {
        struct scsi_device *sdev;
-       unsigned int flags, flags2;
+       unsigned long flags, flags2;
 
        spin_lock_irqsave(current_sdev->host->host_lock, flags);
        WARN_ON(!current_sdev->sdev_target->starget_sdev_user);
@@ -1155,7 +1155,7 @@ static void scsi_request_fn(request_queue_t *q)
        struct Scsi_Host *shost = sdev->host;
        struct scsi_cmnd *cmd;
        struct request *req;
-       unsigned int flags;
+       unsigned long flags;
 
        /*
         * To start with, we keep looping until the queue is empty, or until

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 02c46eeab33174131e9e96995be027f5c4bb5ecd..d794ade20c766d305bfd0eabc48f13a9bc4349a9 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -485,7 +485,7 @@ out:
  **/
 static void scsi_free_sdev(struct scsi_device *sdev)
 {
-       unsigned int flags;
+       unsigned long flags;
 
        list_del(&sdev->siblings);
        list_del(&sdev->same_target_siblings);
@@ -1142,7 +1142,7 @@ static int scsi_add_lun(Scsi_Device *sdev, Scsi_Request *sreq,
 {
        struct scsi_device *sdev_sibling;
        struct scsi_target *starget;
-       unsigned int flags;
+       unsigned long flags;
 
        /*
         * XXX do not save the inquiry, since it can change underneath us,