Please pull from 'fixes-2.6.24'

[Kumar Gala]

(Note, this tree is based on a recent linus tree)

Please pull from 'fixes-2.6.24' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git fixes-2.6.24

to receive the following updates:

 arch/powerpc/math-emu/math.c  |   13 +++++++++----
 arch/powerpc/sysdev/fsl_pci.c |    2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

Kumar Gala (1):
      [POWERPC] Fix handling of stfiwx math emulation

Tony Li (1):
      [POWERPC] Add missing semicolon for fsl_pci.c

commit 01db9953a70e8ad33fbcf91d629f8a8ee59b3484
Author: Tony Li <tony.li at freescale.com>
Date:   Tue Oct 16 15:15:23 2007 +0800

    [POWERPC] Add missing semicolon for fsl_pci.c

    Signed-off-by: Tony Li <tony.li at freescale.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

commit ba02946a903015840ef672ccc9dc8620a7e83de6
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Thu Oct 11 17:07:34 2007 -0500

    [POWERPC] Fix handling of stfiwx math emulation

    Its legal for the stfiwx instruction to have RA = 0 as part of its
    effective address calculation.  This is illegal for all other XE
    form instructions.

    Add code to compute the proper effective address for stfiwx if
    RA = 0 rather than treating it as illegal.

    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
index 69058b2..381306b 100644
--- a/arch/powerpc/math-emu/math.c
+++ b/arch/powerpc/math-emu/math.c
@@ -407,11 +407,16 @@ do_mathemu(struct pt_regs *regs)

 	case XE:
 		idx = (insn >> 16) & 0x1f;
-		if (!idx)
-			goto illegal;
-
 		op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-		op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
+		if (!idx) {
+			if (((insn >> 1) & 0x3ff) == STFIWX)
+				op1 = (void *)(regs->gpr[(insn >> 11) & 0x1f]);
+			else
+				goto illegal;
+		} else {
+			op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
+		}
+
 		break;

 	case XEU:
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index af090c9..33df4c3 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -255,7 +255,7 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transpare
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent);
-DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent)
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_transparent);