3 files changed, 11 insertions, 3 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 76b1135d401a..447fa9e33ffb 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
                         return 0;
 
                 pmtmr_ioport = fadt->xpm_tmr_blk.address;
+                /*
+                 * "X" fields are optional extensions to the original V1.0
+                 * fields, so we must selectively expand V1.0 fields if the
+                 * corresponding X field is zero.
+                 */
+                if (!pmtmr_ioport)
+                        pmtmr_ioport = fadt->V1_pm_tmr_blk;
         } else {
                 /* FADT rev. 1 */
                 pmtmr_ioport = fadt->V1_pm_tmr_blk;
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index 82df88b01bbe..f3e9c534aa82 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -262,11 +262,11 @@ $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd
                 skip=64 bs=1k
 
 $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE)
-        $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT)
+        $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y)
 
 $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
         $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
-                $(ENTRYPOINT)
+                $(entrypoint-y)
 
 $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
         $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y)
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c
index 1d1c3956c1ae..1941a8c7ca9a 100644
--- a/arch/ppc/syslib/m82xx_pci.c
+++ b/arch/ppc/syslib/m82xx_pci.c
@@ -248,7 +248,8 @@ pq2ads_setup_pci(struct pci_controller *hose)
         pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) *
                         ( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1);
         freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div));
-        time = (int)666666/freq;
+        time = (int)66666666/freq;
+
         /* due to PCI Local Bus spec, some devices needs to wait such a long
         time after RST  deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */
         printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq,