Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

powerpc/platforms: Move files from 4xx to 44x

Only 44x uses 4xx now, so only keep one directory.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240628121201.130802-7-mpe@ellerman.id.au

authored by

Christophe Leroy and committed by
Michael Ellerman
d5d1a1a5 7bf5f056

+20 -32
+5 -1
arch/powerpc/platforms/44x/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - obj-y += misc_44x.o machine_check.o 2 + obj-y += misc_44x.o machine_check.o uic.o soc.o 3 3 ifneq ($(CONFIG_PPC4xx_CPM),y) 4 4 obj-y += idle.o 5 5 endif ··· 12 12 obj-$(CONFIG_CURRITUCK) += ppc476.o 13 13 obj-$(CONFIG_AKEBONO) += ppc476.o 14 14 obj-$(CONFIG_FSP2) += fsp2.o 15 + obj-$(CONFIG_PCI) += pci.o 16 + obj-$(CONFIG_PPC4xx_HSTA_MSI) += hsta_msi.o 17 + obj-$(CONFIG_PPC4xx_CPM) += cpm.o 18 + obj-$(CONFIG_PPC4xx_GPIO) += gpio.o
+15
arch/powerpc/platforms/44x/machine_check.c
··· 9 9 #include <asm/reg.h> 10 10 #include <asm/cacheflush.h> 11 11 12 + int machine_check_4xx(struct pt_regs *regs) 13 + { 14 + unsigned long reason = regs->esr; 15 + 16 + if (reason & ESR_IMCP) { 17 + printk("Instruction"); 18 + mtspr(SPRN_ESR, reason & ~ESR_IMCP); 19 + } else 20 + printk("Data"); 21 + 22 + printk(" machine check in kernel mode.\n"); 23 + 24 + return 0; 25 + } 26 + 12 27 int machine_check_440A(struct pt_regs *regs) 13 28 { 14 29 unsigned long reason = regs->esr;
-7
arch/powerpc/platforms/4xx/Makefile
··· 1 - # SPDX-License-Identifier: GPL-2.0-only 2 - obj-y += uic.o machine_check.o 3 - obj-$(CONFIG_44x) += soc.o 4 - obj-$(CONFIG_PCI) += pci.o 5 - obj-$(CONFIG_PPC4xx_HSTA_MSI) += hsta_msi.o 6 - obj-$(CONFIG_PPC4xx_CPM) += cpm.o 7 - obj-$(CONFIG_PPC4xx_GPIO) += gpio.o
arch/powerpc/platforms/4xx/cpm.c arch/powerpc/platforms/44x/cpm.c
arch/powerpc/platforms/4xx/gpio.c arch/powerpc/platforms/44x/gpio.c
arch/powerpc/platforms/4xx/hsta_msi.c arch/powerpc/platforms/44x/hsta_msi.c
-23
arch/powerpc/platforms/4xx/machine_check.c
··· 1 - // SPDX-License-Identifier: GPL-2.0-or-later 2 - /* 3 - */ 4 - 5 - #include <linux/kernel.h> 6 - #include <linux/printk.h> 7 - #include <linux/ptrace.h> 8 - 9 - #include <asm/reg.h> 10 - 11 - int machine_check_4xx(struct pt_regs *regs) 12 - { 13 - unsigned long reason = regs->esr; 14 - 15 - if (reason & ESR_IMCP) { 16 - printk("Instruction"); 17 - mtspr(SPRN_ESR, reason & ~ESR_IMCP); 18 - } else 19 - printk("Data"); 20 - printk(" machine check in kernel mode.\n"); 21 - 22 - return 0; 23 - }
arch/powerpc/platforms/4xx/pci.c arch/powerpc/platforms/44x/pci.c
arch/powerpc/platforms/4xx/pci.h arch/powerpc/platforms/44x/pci.h
arch/powerpc/platforms/4xx/soc.c arch/powerpc/platforms/44x/soc.c
arch/powerpc/platforms/4xx/uic.c arch/powerpc/platforms/44x/uic.c
-1
arch/powerpc/platforms/Makefile
··· 4 4 5 5 obj-$(CONFIG_PPC_PMAC) += powermac/ 6 6 obj-$(CONFIG_PPC_CHRP) += chrp/ 7 - obj-$(CONFIG_4xx) += 4xx/ 8 7 obj-$(CONFIG_44x) += 44x/ 9 8 obj-$(CONFIG_PPC_MPC512x) += 512x/ 10 9 obj-$(CONFIG_PPC_MPC52xx) += 52xx/