Merge commit 'origin/master'

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

1 files changed, 19 insertions, 0 deletions

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 7b46faf22318..5ca1d80de182 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -215,3 +215,22 @@ pm_good:
  * but we still need to load before device_initcall
  */
 fs_initcall(init_acpi_pm_clocksource);
+
+/*
+ * Allow an override of the IOPort. Stupid BIOSes do not tell us about
+ * the PMTimer, but we might know where it is.
+ */
+static int __init parse_pmtmr(char *arg)
+{
+        unsigned long base;
+
+        if (strict_strtoul(arg, 16, &base))
+                return -EINVAL;
+
+        printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
+               (unsigned int)pmtmr_ioport, base);
+        pmtmr_ioport = base;
+
+        return 1;
+}
+__setup("pmtmr=", parse_pmtmr);