powerpc/32: Restore previous version of 32-bit PCI code (e05b3b4a) · Commits · 戴 / test

When I removed the powermac support from arch/ppc/kernel/pci.c, I overlooked the fact that that file is used in 32-bit ARCH=powerpc builds. To prevent problems in future, restore the original version of that file as arch/powerpc/kernel/pci_32.c, and use that. Signed-off-by:

Paul Mackerras <paulus@samba.org>

arch/powerpc/kernel/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,8 @@ obj-$(CONFIG_MODULES) += $(module-y)

	pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \		pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \
	pci_direct_iommu.o iomap.o		pci_direct_iommu.o iomap.o
	obj-$(CONFIG_PCI) += $(pci64-y)		pci32-$(CONFIG_PPC32) := pci_32.o
			obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y)
	kexec-$(CONFIG_PPC64) := machine_kexec_64.o crash.o		kexec-$(CONFIG_PPC64) := machine_kexec_64.o crash.o
	kexec-$(CONFIG_PPC32) := machine_kexec_32.o		kexec-$(CONFIG_PPC32) := machine_kexec_32.o
	obj-$(CONFIG_KEXEC) += machine_kexec.o $(kexec-y)		obj-$(CONFIG_KEXEC) += machine_kexec.o $(kexec-y)

Admin message