Merge branches 'sh/serial-rework' and 'sh/oprofile'

[mv-sheeva.git] / drivers / acpi / numa.c

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index cb9864e39bae743f0943c41075e557dd696ac3ac..25ceae9191ef3f1bed834cd2f88d4094e3ba61cb 100644 (file)
--- 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;