Merge branch 'ull' into test

Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

Signed-off-by: Len Brown <len.brown@intel.com>

21 files changed, 83 insertions, 71 deletions

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 8b6a84a43b15..d72a1b6c8a94 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -85,7 +85,7 @@ struct acpi_ac {
         struct power_supply charger;
 #endif
         struct acpi_device * device;
-        unsigned long state;
+        unsigned long long state;
 };
 
 #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger);
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 289d02260f16..71d21c51c45f 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -194,8 +194,7 @@ acpi_memory_get_device(acpi_handle handle,
 
 static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
 {
-        unsigned long current_status;
-
+        unsigned long long current_status;
 
         /* Get device present/absent information from the _STA */
         if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA",
@@ -264,7 +263,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device)
         acpi_status status;
         struct acpi_object_list arg_list;
         union acpi_object arg;
-        unsigned long current_status;
+        unsigned long long current_status;
 
 
         /* Issue the _EJ0 command */
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 2377e8b917d7..1e74988c7b2d 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -753,7 +753,7 @@ static int get_lcd_state(void)
                         /* That's what the AML code does */
                         lcd = out_obj.integer.value >> 8;
         } else if (hotk->model == F3Sa) {
-                unsigned long tmp;
+                unsigned long long tmp;
                 union acpi_object param;
                 struct acpi_object_list input;
                 acpi_status status;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b11400e2f856..c797c6473f31 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -94,7 +94,7 @@ EXPORT_SYMBOL(acpi_bus_get_device);
 int acpi_bus_get_status(struct acpi_device *device)
 {
         acpi_status status = AE_OK;
-        unsigned long sta = 0;
+        unsigned long long sta = 0;
 
 
         if (!device)
@@ -172,7 +172,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
         int result = 0;
         acpi_status status = 0;
         struct acpi_device *device = NULL;
-        unsigned long psc = 0;
+        unsigned long long psc = 0;
 
 
         result = acpi_bus_get_device(handle, &device);
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index e22033ea2614..9d568d417eaa 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -145,7 +145,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
 {
         struct acpi_button *button = seq->private;
         acpi_status status;
-        unsigned long state;
+        unsigned long long state;
 
         if (!button || !button->device)
                 return 0;
@@ -253,7 +253,7 @@ static int acpi_button_remove_fs(struct acpi_device *device)
    -------------------------------------------------------------------------- */
 static int acpi_lid_send_state(struct acpi_button *button)
 {
-        unsigned long state;
+        unsigned long long state;
         acpi_status status;
 
         status = acpi_evaluate_integer(button->device->handle, "_LID", NULL,
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 03ea8478e393..134818b265a9 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -76,7 +76,7 @@ static int is_device_present(acpi_handle handle)
 {
         acpi_handle temp;
         acpi_status status;
-        unsigned long sta;
+        unsigned long long sta;
 
 
         status = acpi_get_handle(handle, "_STA", &temp);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 913bb1e89dd6..5b30b8d91d71 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -294,7 +294,7 @@ EXPORT_SYMBOL_GPL(is_dock_device);
  */
 static int dock_present(struct dock_station *ds)
 {
-        unsigned long sta;
+        unsigned long long sta;
         acpi_status status;
 
         if (ds) {
@@ -900,7 +900,7 @@ static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
 static ssize_t show_dock_uid(struct device *dev,
                              struct device_attribute *attr, char *buf)
 {
-        unsigned long lbuf;
+        unsigned long long lbuf;
         struct dock_station *dock_station = *((struct dock_station **)
                 dev->platform_data);
         acpi_status status = acpi_evaluate_integer(dock_station->handle,
@@ -908,7 +908,7 @@ static ssize_t show_dock_uid(struct device *dev,
         if (ACPI_FAILURE(status))
             return 0;
 
-        return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);
+        return snprintf(buf, PAGE_SIZE, "%llx\n", lbuf);
 }
 static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
 
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 40fefba6264e..ef42316f89f5 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -736,6 +736,7 @@ static acpi_status
 ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
 {
         acpi_status status;
+        unsigned long long tmp;
 
         struct acpi_ec *ec = context;
         status = acpi_walk_resources(handle, METHOD_NAME__CRS,
@@ -745,11 +746,13 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
 
         /* Get GPE bit assignment (EC events). */
         /* TODO: Add support for _GPE returning a package */
-        status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
+        status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp);
         if (ACPI_FAILURE(status))
                 return status;
+        ec->gpe = tmp;
         /* Use the global lock for all EC transactions? */
-        acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
+        acpi_evaluate_integer(handle, "_GLK", NULL, &tmp);
+        ec->global_lock = tmp;
         ec->handle = handle;
         return AE_CTRL_TERMINATE;
 }
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index cb9864e39bae..25ceae9191ef 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -258,7 +258,7 @@ int __init acpi_numa_init(void)
 
 int acpi_get_pxm(acpi_handle h)
 {
-        unsigned long pxm;
+        unsigned long long pxm;
         acpi_status status;
         acpi_handle handle;
         acpi_handle phandle = h;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6234d3e7acd3..4be252145cb4 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -608,7 +608,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
         acpi_handle handle;
         struct acpi_pci_id *pci_id = *id;
         acpi_status status;
-        unsigned long temp;
+        unsigned long long temp;
         acpi_object_type type;
 
         acpi_get_parent(chandle, &handle);
@@ -620,8 +620,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
                 if ((ACPI_FAILURE(status)) || (type != ACPI_TYPE_DEVICE))
                         return;
 
-                status =
-                    acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
+                status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
                                           &temp);
                 if (ACPI_SUCCESS(status)) {
                         u32 val;
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index add1a19bbbfe..1b8f67d21d53 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -190,7 +190,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         struct acpi_pci_root *root = NULL;
         struct acpi_pci_root *tmp;
         acpi_status status = AE_OK;
-        unsigned long value = 0;
+        unsigned long long value = 0;
         acpi_handle handle = NULL;
         struct acpi_device *child;
 
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index d5b4ef898879..9bb84d4596be 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -76,10 +76,10 @@ static struct acpi_pci_driver acpi_pci_slot_driver = {
 };
 
 static int
-check_slot(acpi_handle handle, unsigned long *sun)
+check_slot(acpi_handle handle, unsigned long long *sun)
 {
         int device = -1;
-        unsigned long adr, sta;
+        unsigned long long adr, sta;
         acpi_status status;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
@@ -132,7 +132,7 @@ static acpi_status
 register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         int device;
-        unsigned long sun;
+        unsigned long long sun;
         char name[SLOT_NAME_SIZE];
         struct acpi_pci_slot *slot;
         struct pci_slot *pci_slot;
@@ -182,7 +182,7 @@ static acpi_status
 walk_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         int device, function;
-        unsigned long adr;
+        unsigned long long adr;
         acpi_status status;
         acpi_handle dummy_handle;
         acpi_walk_callback user_function;
@@ -239,7 +239,7 @@ static int
 walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function)
 {
         int seg, bus;
-        unsigned long tmp;
+        unsigned long long tmp;
         acpi_status status;
         acpi_handle dummy_handle;
         struct pci_bus *pci_bus;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index e88edc008668..a1718e56103b 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -139,7 +139,7 @@ acpi_power_get_context(acpi_handle handle,
 static int acpi_power_get_state(acpi_handle handle, int *state)
 {
         acpi_status status = AE_OK;
-        unsigned long sta = 0;
+        unsigned long long sta = 0;
 
 
         if (!handle || !state)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 289461649196..24a362f8034c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -563,7 +563,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
 
         /* Check if it is a Device with HID and UID */
         if (has_uid) {
-                unsigned long value;
+                unsigned long long value;
                 status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
                                                 NULL, &value);
                 if (ACPI_FAILURE(status)) {
@@ -875,7 +875,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 static int is_processor_present(acpi_handle handle)
 {
         acpi_status status;
-        unsigned long sta = 0;
+        unsigned long long sta = 0;
 
 
         status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index b0614f379470..dc98f7a6f2c4 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -127,7 +127,7 @@ static struct notifier_block acpi_ppc_notifier_block = {
 static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
 {
         acpi_status status = 0;
-        unsigned long ppc = 0;
+        unsigned long long ppc = 0;
 
 
         if (!pr)
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index e89a25824f2a..3da2df93d924 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -274,7 +274,7 @@ static int acpi_processor_throttling_notifier(unsigned long event, void *data)
 static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
 {
         acpi_status status = 0;
-        unsigned long tpc = 0;
+        unsigned long long tpc = 0;
 
         if (!pr)
                 return -EINVAL;
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 001d9143a2cb..e53e590252c0 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -258,7 +258,7 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
 static int acpi_smbus_hc_add(struct acpi_device *device)
 {
         int status;
-        unsigned long val;
+        unsigned long long val;
         struct acpi_smb_hc *hc;
 
         if (!device)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index cc344d4252c9..76037883cd13 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -495,7 +495,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
         acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
         struct acpi_device *adev;
         char acpi_method[] = "_SxD";
-        unsigned long d_min, d_max;
+        unsigned long long d_min, d_max;
 
         if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
                 printk(KERN_DEBUG "ACPI handle has no context!\n");
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index f26c6463a09e..ad6cae938f0b 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -246,18 +246,18 @@ static const struct file_operations acpi_thermal_polling_fops = {
 static int acpi_thermal_get_temperature(struct acpi_thermal *tz)
 {
         acpi_status status = AE_OK;
-
+        unsigned long long tmp;
 
         if (!tz)
                 return -EINVAL;
 
         tz->last_temperature = tz->temperature;
 
-        status =
-            acpi_evaluate_integer(tz->device->handle, "_TMP", NULL, &tz->temperature);
+        status = acpi_evaluate_integer(tz->device->handle, "_TMP", NULL, &tmp);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
+        tz->temperature = tmp;
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Temperature is %lu dK\n",
                           tz->temperature));
 
@@ -267,17 +267,16 @@ static int acpi_thermal_get_temperature(struct acpi_thermal *tz)
 static int acpi_thermal_get_polling_frequency(struct acpi_thermal *tz)
 {
         acpi_status status = AE_OK;
-
+        unsigned long long tmp;
 
         if (!tz)
                 return -EINVAL;
 
-        status =
-            acpi_evaluate_integer(tz->device->handle, "_TZP", NULL,
-                                  &tz->polling_frequency);
+        status = acpi_evaluate_integer(tz->device->handle, "_TZP", NULL, &tmp);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
+        tz->polling_frequency = tmp;
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Polling frequency is %lu dS\n",
                           tz->polling_frequency));
 
@@ -356,6 +355,7 @@ do {	\
 static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
 {
         acpi_status status = AE_OK;
+        unsigned long long tmp;
         struct acpi_handle_list devices;
         int valid = 0;
         int i;
@@ -363,7 +363,8 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
         /* Critical Shutdown (required) */
         if (flag & ACPI_TRIPS_CRITICAL) {
                 status = acpi_evaluate_integer(tz->device->handle,
-                                "_CRT", NULL, &tz->trips.critical.temperature);
+                                "_CRT", NULL, &tmp);
+                tz->trips.critical.temperature = tmp;
                 /*
                  * Treat freezing temperatures as invalid as well; some
                  * BIOSes return really low values and cause reboots at startup.
@@ -401,12 +402,13 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
         /* Critical Sleep (optional) */
         if (flag & ACPI_TRIPS_HOT) {
                 status = acpi_evaluate_integer(tz->device->handle,
-                                "_HOT", NULL, &tz->trips.hot.temperature);
+                                "_HOT", NULL, &tmp);
                 if (ACPI_FAILURE(status)) {
                         tz->trips.hot.flags.valid = 0;
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                         "No hot threshold\n"));
                 } else {
+                        tz->trips.hot.temperature = tmp;
                         tz->trips.hot.flags.valid = 1;
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                         "Found hot threshold [%lu]\n",
@@ -420,33 +422,40 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                 if (psv == -1) {
                         status = AE_SUPPORT;
                 } else if (psv > 0) {
-                        tz->trips.passive.temperature = CELSIUS_TO_KELVIN(psv);
+                        tmp = CELSIUS_TO_KELVIN(psv);
                         status = AE_OK;
                 } else {
                         status = acpi_evaluate_integer(tz->device->handle,
-                                "_PSV", NULL, &tz->trips.passive.temperature);
+                                "_PSV", NULL, &tmp);
                 }
 
                 if (ACPI_FAILURE(status))
                         tz->trips.passive.flags.valid = 0;
                 else {
+                        tz->trips.passive.temperature = tmp;
                         tz->trips.passive.flags.valid = 1;
                         if (flag == ACPI_TRIPS_INIT) {
                                 status = acpi_evaluate_integer(
                                                 tz->device->handle, "_TC1",
-                                                NULL, &tz->trips.passive.tc1);
+                                                NULL, &tmp);
                                 if (ACPI_FAILURE(status))
                                         tz->trips.passive.flags.valid = 0;
+                                else
+                                        tz->trips.passive.tc1 = tmp;
                                 status = acpi_evaluate_integer(
                                                 tz->device->handle, "_TC2",
-                                                NULL, &tz->trips.passive.tc2);
+                                                NULL, &tmp);
                                 if (ACPI_FAILURE(status))
                                         tz->trips.passive.flags.valid = 0;
+                                else
+                                        tz->trips.passive.tc2 = tmp;
                                 status = acpi_evaluate_integer(
                                                 tz->device->handle, "_TSP",
-                                                NULL, &tz->trips.passive.tsp);
+                                                NULL, &tmp);
                                 if (ACPI_FAILURE(status))
                                         tz->trips.passive.flags.valid = 0;
+                                else
+                                        tz->trips.passive.tsp = tmp;
                         }
                 }
         }
@@ -481,7 +490,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
 
                 if (flag & ACPI_TRIPS_ACTIVE) {
                         status = acpi_evaluate_integer(tz->device->handle,
-                                name, NULL, &tz->trips.active[i].temperature);
+                                                        name, NULL, &tmp);
                         if (ACPI_FAILURE(status)) {
                                 tz->trips.active[i].flags.valid = 0;
                                 if (i == 0)
@@ -502,8 +511,10 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                                 tz->trips.active[i - 2].temperature :
                                                 CELSIUS_TO_KELVIN(act));
                                 break;
-                        } else
+                        } else {
+                                tz->trips.active[i].temperature = tmp;
                                 tz->trips.active[i].flags.valid = 1;
+                        }
                 }
 
                 name[2] = 'L';
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 100926143818..e827be36ee8d 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -256,7 +256,7 @@ EXPORT_SYMBOL(acpi_extract_package);
 acpi_status
 acpi_evaluate_integer(acpi_handle handle,
                       acpi_string pathname,
-                      struct acpi_object_list *arguments, unsigned long *data)
+                      struct acpi_object_list *arguments, unsigned long long *data)
 {
         acpi_status status = AE_OK;
         union acpi_object *element;
@@ -288,7 +288,7 @@ acpi_evaluate_integer(acpi_handle handle,
         *data = element->integer.value;
         kfree(element);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%lu]\n", *data));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data));
 
         return AE_OK;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 59fd299bb3d7..a29b0ccac65a 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -291,20 +291,20 @@ static int acpi_video_device_lcd_set_level(struct acpi_video_device *device,
                         int level);
 static int acpi_video_device_lcd_get_level_current(
                         struct acpi_video_device *device,
-                        unsigned long *level);
+                        unsigned long long *level);
 static int acpi_video_get_next_level(struct acpi_video_device *device,
                                      u32 level_current, u32 event);
 static void acpi_video_switch_brightness(struct acpi_video_device *device,
                                          int event);
 static int acpi_video_device_get_state(struct acpi_video_device *device,
-                            unsigned long *state);
+                            unsigned long long *state);
 static int acpi_video_output_get(struct output_device *od);
 static int acpi_video_device_set_state(struct acpi_video_device *device, int state);
 
 /*backlight device sysfs support*/
 static int acpi_video_get_brightness(struct backlight_device *bd)
 {
-        unsigned long cur_level;
+        unsigned long long cur_level;
         int i;
         struct acpi_video_device *vd =
                 (struct acpi_video_device *)bl_get_data(bd);
@@ -336,7 +336,7 @@ static struct backlight_ops acpi_backlight_ops = {
 /*video output device sysfs support*/
 static int acpi_video_output_get(struct output_device *od)
 {
-        unsigned long state;
+        unsigned long long state;
         struct acpi_video_device *vd =
                 (struct acpi_video_device *)dev_get_drvdata(&od->dev);
         acpi_video_device_get_state(vd, &state);
@@ -370,7 +370,7 @@ static int video_get_cur_state(struct thermal_cooling_device *cdev, char *buf)
 {
         struct acpi_device *device = cdev->devdata;
         struct acpi_video_device *video = acpi_driver_data(device);
-        unsigned long level;
+        unsigned long long level;
         int state;
 
         acpi_video_device_lcd_get_level_current(video, &level);
@@ -410,7 +410,7 @@ static struct thermal_cooling_device_ops video_cooling_ops = {
 /* device */
 
 static int
-acpi_video_device_query(struct acpi_video_device *device, unsigned long *state)
+acpi_video_device_query(struct acpi_video_device *device, unsigned long long *state)
 {
         int status;
 
@@ -421,7 +421,7 @@ acpi_video_device_query(struct acpi_video_device *device, unsigned long *state)
 
 static int
 acpi_video_device_get_state(struct acpi_video_device *device,
-                            unsigned long *state)
+                            unsigned long long *state)
 {
         int status;
 
@@ -436,7 +436,7 @@ acpi_video_device_set_state(struct acpi_video_device *device, int state)
         int status;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
-        unsigned long ret;
+        unsigned long long ret;
 
 
         arg0.integer.value = state;
@@ -495,7 +495,7 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
 
 static int
 acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
-                                        unsigned long *level)
+                                        unsigned long long *level)
 {
         if (device->cap._BQC)
                 return acpi_evaluate_integer(device->dev->handle, "_BQC", NULL,
@@ -549,7 +549,7 @@ static int
 acpi_video_bus_set_POST(struct acpi_video_bus *video, unsigned long option)
 {
         int status;
-        unsigned long tmp;
+        unsigned long long tmp;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
 
@@ -564,7 +564,7 @@ acpi_video_bus_set_POST(struct acpi_video_bus *video, unsigned long option)
 }
 
 static int
-acpi_video_bus_get_POST(struct acpi_video_bus *video, unsigned long *id)
+acpi_video_bus_get_POST(struct acpi_video_bus *video, unsigned long long *id)
 {
         int status;
 
@@ -575,7 +575,7 @@ acpi_video_bus_get_POST(struct acpi_video_bus *video, unsigned long *id)
 
 static int
 acpi_video_bus_POST_options(struct acpi_video_bus *video,
-                            unsigned long *options)
+                            unsigned long long *options)
 {
         int status;
 
@@ -918,7 +918,7 @@ static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
 {
         int status;
         struct acpi_video_device *dev = seq->private;
-        unsigned long state;
+        unsigned long long state;
 
 
         if (!dev)
@@ -927,14 +927,14 @@ static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
         status = acpi_video_device_get_state(dev, &state);
         seq_printf(seq, "state:     ");
         if (ACPI_SUCCESS(status))
-                seq_printf(seq, "0x%02lx\n", state);
+                seq_printf(seq, "0x%02llx\n", state);
         else
                 seq_printf(seq, "<not supported>\n");
 
         status = acpi_video_device_query(dev, &state);
         seq_printf(seq, "query:     ");
         if (ACPI_SUCCESS(status))
-                seq_printf(seq, "0x%02lx\n", state);
+                seq_printf(seq, "0x%02llx\n", state);
         else
                 seq_printf(seq, "<not supported>\n");
 
@@ -1217,7 +1217,7 @@ static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
 static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
 {
         struct acpi_video_bus *video = seq->private;
-        unsigned long options;
+        unsigned long long options;
         int status;
 
 
@@ -1232,7 +1232,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
                         printk(KERN_WARNING PREFIX
                                "This indicates a BIOS bug. Please contact the manufacturer.\n");
                 }
-                printk("%lx\n", options);
+                printk("%llx\n", options);
                 seq_printf(seq, "can POST: <integrated video>");
                 if (options & 2)
                         seq_printf(seq, " <PCI video>");
@@ -1256,7 +1256,7 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
 {
         struct acpi_video_bus *video = seq->private;
         int status;
-        unsigned long id;
+        unsigned long long id;
 
 
         if (!video)
@@ -1303,7 +1303,7 @@ acpi_video_bus_write_POST(struct file *file,
         struct seq_file *m = file->private_data;
         struct acpi_video_bus *video = m->private;
         char str[12] = { 0 };
-        unsigned long opt, options;
+        unsigned long long opt, options;
 
 
         if (!video || count + 1 > sizeof str)
@@ -1473,7 +1473,7 @@ static int
 acpi_video_bus_get_one_device(struct acpi_device *device,
                               struct acpi_video_bus *video)
 {
-        unsigned long device_id;
+        unsigned long long device_id;
         int status;
         struct acpi_video_device *data;
         struct acpi_video_device_attrib* attribute;
@@ -1724,7 +1724,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
 static void
 acpi_video_switch_brightness(struct acpi_video_device *device, int event)
 {
-        unsigned long level_current, level_next;
+        unsigned long long level_current, level_next;
         if (!device->brightness)
                 return;
         acpi_video_device_lcd_get_level_current(device, &level_current);