9 files changed, 45 insertions, 45 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index cada73ffdfa7..58d2c91ba62b 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -324,8 +324,8 @@ static int extract_package(struct acpi_battery *battery,
                                 strncpy(ptr, element->string.pointer, 32);
                         else if (element->type == ACPI_TYPE_INTEGER) {
                                 strncpy(ptr, (u8 *)&element->integer.value,
-                                        sizeof(acpi_integer));
-                                ptr[sizeof(acpi_integer)] = 0;
+                                        sizeof(u64));
+                                ptr[sizeof(u64)] = 0;
                         } else
                                 *ptr = 0; /* don't have value */
                 } else {
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index d6471bb6852f..748ced85dec5 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -589,7 +589,7 @@ static u32 acpi_ec_gpe_handler(void *data)
 
 static acpi_status
 acpi_ec_space_handler(u32 function, acpi_physical_address address,
-                      u32 bits, acpi_integer *value,
+                      u32 bits, u64 *value,
                       void *handler_context, void *region_context)
 {
         struct acpi_ec *ec = handler_context;
@@ -620,7 +620,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
                 ++address;
                 if (function == ACPI_READ) {
                         result = acpi_ec_read(ec, address, &temp);
-                        (*value) |= ((acpi_integer)temp) << i;
+                        (*value) |= ((u64)temp) << i;
                 } else {
                         temp = 0xff & ((*value) >> i);
                         result = acpi_ec_write(ec, address, temp);
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4c8fcff662cf..6d5b64b7d526 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -87,7 +87,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
 /* Get device's handler per its address under its parent */
 struct acpi_find_child {
         acpi_handle handle;
-        acpi_integer address;
+        u64 address;
 };
 
 static acpi_status
@@ -106,7 +106,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
         return AE_OK;
 }
 
-acpi_handle acpi_get_child(acpi_handle parent, acpi_integer address)
+acpi_handle acpi_get_child(acpi_handle parent, u64 address)
 {
         struct acpi_find_child find = { NULL, address };
 
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 02e8464e480f..8e6d8665f0ae 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -436,7 +436,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
  * Running in interpreter thread context, safe to sleep
  */
 
-void acpi_os_sleep(acpi_integer ms)
+void acpi_os_sleep(u64 ms)
 {
         schedule_timeout_interruptible(msecs_to_jiffies(ms));
 }
@@ -603,7 +603,7 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
 
 acpi_status
 acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
-                                acpi_integer value, u32 width)
+                                u64 value, u32 width)
 {
         int result, size;
 
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
index dc4ffadf8122..834c5af0de4b 100644
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -71,17 +71,17 @@ static const struct acpi_device_id power_meter_ids[] = {
 MODULE_DEVICE_TABLE(acpi, power_meter_ids);
 
 struct acpi_power_meter_capabilities {
-        acpi_integer            flags;
-        acpi_integer            units;
-        acpi_integer            type;
-        acpi_integer            accuracy;
-        acpi_integer            sampling_time;
-        acpi_integer            min_avg_interval;
-        acpi_integer            max_avg_interval;
-        acpi_integer            hysteresis;
-        acpi_integer            configurable_cap;
-        acpi_integer            min_cap;
-        acpi_integer            max_cap;
+        u64             flags;
+        u64             units;
+        u64             type;
+        u64             accuracy;
+        u64             sampling_time;
+        u64             min_avg_interval;
+        u64             max_avg_interval;
+        u64             hysteresis;
+        u64             configurable_cap;
+        u64             min_cap;
+        u64             max_cap;
 };
 
 struct acpi_power_meter_resource {
@@ -93,9 +93,9 @@ struct acpi_power_meter_resource {
         acpi_string             model_number;
         acpi_string             serial_number;
         acpi_string             oem_info;
-        acpi_integer            power;
-        acpi_integer            cap;
-        acpi_integer            avg_interval;
+        u64             power;
+        u64             cap;
+        u64             avg_interval;
         int                     sensors_valid;
         unsigned long           sensors_last_updated;
         struct sensor_device_attribute  sensors[NUM_SENSORS];
@@ -402,7 +402,7 @@ static ssize_t show_val(struct device *dev,
         struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct acpi_device *acpi_dev = to_acpi_device(dev);
         struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
-        acpi_integer val = 0;
+        u64 val = 0;
 
         switch (attr->index) {
         case 0:
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 7c0441f63b39..3455d7abf5f3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -352,7 +352,7 @@ static int acpi_processor_get_power_info_default(struct acpi_processor *pr)
 static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 {
         acpi_status status = 0;
-        acpi_integer count;
+        u64 count;
         int current_count;
         int i;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1c5d7a8b2fdf..7ded7542fc9d 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -660,7 +660,7 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
 
 #ifdef CONFIG_X86
 static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                        acpi_integer * value)
+                                        u64 *value)
 {
         struct cpuinfo_x86 *c;
         u64 msr_high, msr_low;
@@ -681,13 +681,13 @@ static int acpi_throttling_rdmsr(struct acpi_processor *pr,
                 rdmsr_safe(MSR_IA32_THERM_CONTROL,
                         (u32 *)&msr_low , (u32 *) &msr_high);
                 msr = (msr_high << 32) | msr_low;
-                *value = (acpi_integer) msr;
+                *value = (u64) msr;
                 ret = 0;
         }
         return ret;
 }
 
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
 {
         struct cpuinfo_x86 *c;
         unsigned int cpu;
@@ -711,14 +711,14 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 }
 #else
 static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                acpi_integer * value)
+                                u64 *value)
 {
         printk(KERN_ERR PREFIX
                 "HARDWARE addr space,NOT supported yet\n");
         return -1;
 }
 
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
 {
         printk(KERN_ERR PREFIX
                 "HARDWARE addr space,NOT supported yet\n");
@@ -727,7 +727,7 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 #endif
 
 static int acpi_read_throttling_status(struct acpi_processor *pr,
-                                        acpi_integer *value)
+                                        u64 *value)
 {
         u32 bit_width, bit_offset;
         u64 ptc_value;
@@ -746,7 +746,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
                                   address, (u32 *) &ptc_value,
                                   (u32) (bit_width + bit_offset));
                 ptc_mask = (1 << bit_width) - 1;
-                *value = (acpi_integer) ((ptc_value >> bit_offset) & ptc_mask);
+                *value = (u64) ((ptc_value >> bit_offset) & ptc_mask);
                 ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -760,7 +760,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
 }
 
 static int acpi_write_throttling_state(struct acpi_processor *pr,
-                                acpi_integer value)
+                                u64 value)
 {
         u32 bit_width, bit_offset;
         u64 ptc_value;
@@ -793,7 +793,7 @@ static int acpi_write_throttling_state(struct acpi_processor *pr,
 }
 
 static int acpi_get_throttling_state(struct acpi_processor *pr,
-                                acpi_integer value)
+                                u64 value)
 {
         int i;
 
@@ -808,7 +808,7 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
 }
 
 static int acpi_get_throttling_value(struct acpi_processor *pr,
-                        int state, acpi_integer *value)
+                        int state, u64 *value)
 {
         int ret = -1;
 
@@ -826,7 +826,7 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 {
         int state = 0;
         int ret;
-        acpi_integer value;
+        u64 value;
 
         if (!pr)
                 return -EINVAL;
@@ -993,7 +993,7 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
                                              int state, bool force)
 {
         int ret;
-        acpi_integer value;
+        u64 value;
 
         if (!pr)
                 return -EINVAL;
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 811fec10462b..11882dbe2094 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -107,12 +107,12 @@ acpi_extract_package(union acpi_object *package,
                 case ACPI_TYPE_INTEGER:
                         switch (format_string[i]) {
                         case 'N':
-                                size_required += sizeof(acpi_integer);
-                                tail_offset += sizeof(acpi_integer);
+                                size_required += sizeof(u64);
+                                tail_offset += sizeof(u64);
                                 break;
                         case 'S':
                                 size_required +=
-                                    sizeof(char *) + sizeof(acpi_integer) +
+                                    sizeof(char *) + sizeof(u64) +
                                     sizeof(char);
                                 tail_offset += sizeof(char *);
                                 break;
@@ -193,17 +193,17 @@ acpi_extract_package(union acpi_object *package,
                 case ACPI_TYPE_INTEGER:
                         switch (format_string[i]) {
                         case 'N':
-                                *((acpi_integer *) head) =
+                                *((u64 *) head) =
                                     element->integer.value;
-                                head += sizeof(acpi_integer);
+                                head += sizeof(u64);
                                 break;
                         case 'S':
                                 pointer = (u8 **) head;
                                 *pointer = tail;
-                                *((acpi_integer *) tail) =
+                                *((u64 *) tail) =
                                     element->integer.value;
-                                head += sizeof(acpi_integer *);
-                                tail += sizeof(acpi_integer);
+                                head += sizeof(u64 *);
+                                tail += sizeof(u64);
                                 /* NULL terminate string */
                                 *tail = (char)0;
                                 tail += sizeof(char);
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index b765790b32be..6e9b49149fce 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -759,7 +759,7 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video,
 static int
 acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 {
-        acpi_integer status = 0;
+        u64 status = 0;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };