Merge branch 'x86/urgent' into x86-mm

Merge reason: Pick up the following two fix commits.

  2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
  765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change

Scheduled NUMA init 32/64bit unification changes depend on these.

Signed-off-by: Tejun Heo <tj@kernel.org>

4 files changed, 8 insertions, 4 deletions

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index d1d484d4a06a..f703b2881153 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -241,7 +241,7 @@ static inline int ghes_severity(int severity)
         case CPER_SEV_FATAL:
                 return GHES_SEV_PANIC;
         default:
-                /* Unkown, go panic */
+                /* Unknown, go panic */
                 return GHES_SEV_PANIC;
         }
 }
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 6f2c6d914cbc..605a2954ef17 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -1152,7 +1152,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
                          */
                         if (!match_pr->flags.throttling) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "Throttling Controll is unsupported "
+                                        "Throttling Control is unsupported "
                                         "on CPU %d\n", i));
                                 continue;
                         }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index b136c9c1e531..449c556274c0 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -943,6 +943,10 @@ static int acpi_bus_get_flags(struct acpi_device *device)
         if (ACPI_SUCCESS(status))
                 device->flags.lockable = 1;
 
+        /* Power resources cannot be power manageable. */
+        if (device->device_type == ACPI_BUS_TYPE_POWER)
+                return 0;
+
         /* Presence of _PS0|_PR0 indicates 'power manageable' */
         status = acpi_get_handle(device->handle, "_PS0", &temp);
         if (ACPI_FAILURE(status))
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 31e9e10f657e..ec574fc8fbc6 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1354,7 +1354,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
                 status = acpi_video_bus_get_one_device(dev, video);
                 if (ACPI_FAILURE(status)) {
                         printk(KERN_WARNING PREFIX
-                                        "Cant attach device\n");
+                                        "Can't attach device\n");
                         continue;
                 }
         }
@@ -1373,7 +1373,7 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
                                             acpi_video_device_notify);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_WARNING PREFIX
-                       "Cant remove video notify handler\n");
+                       "Can't remove video notify handler\n");
         }
         if (device->backlight) {
                 backlight_device_unregister(device->backlight);