[PATCH] KVM: fix bogus pagefault on writable pages

[powerpc.git] / drivers / acpi / numa.c

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 13d6d5b..bd96a70 100644 (file)
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -23,7 +23,6 @@
  *
  */
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -249,7 +248,7 @@ int acpi_get_pxm(acpi_handle h)
                handle = phandle;
                status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
                if (ACPI_SUCCESS(status))
-                       return (int)pxm;
+                       return pxm;
                status = acpi_get_parent(handle, &phandle);
        } while (ACPI_SUCCESS(status));
        return -1;
@@ -260,12 +259,10 @@ int acpi_get_node(acpi_handle *handle)
 {
        int pxm, node = -1;
 
-       ACPI_FUNCTION_TRACE("acpi_get_node");
-
        pxm = acpi_get_pxm(handle);
        if (pxm >= 0)
                node = acpi_map_pxm_to_node(pxm);
 
-       return_VALUE(node);
+       return node;
 }
 EXPORT_SYMBOL(acpi_get_node);