Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cae826e authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'fixes-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

parents f6b80769 01db9953

arch/powerpc/math-emu/math.c

+9 −4
Original line number Diff line number Diff line
@@ -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];

		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:

arch/powerpc/sysdev/fsl_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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);