powerpc: Move most remaining ppc64 files over to arch/powerpc

Also deletes files in arch/ppc64 that are no longer used now that we don't compile with ARCH=ppc64 any more. Signed-off-by: Paul Mackerras <paulus@samba.org>
git-mirror · Nov 14, 2005 · 7568cb4 · 7568cb4
1 parent c55377e
commit 7568cb4
Show file tree

Hide file tree

Showing 29 changed files with 19 additions and 9,886 deletions.
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
@@ -932,6 +932,7 @@ source "arch/powerpc/oprofile/Kconfig"
 
 config KPROBES
 	bool "Kprobes (EXPERIMENTAL)"
+	depends on PPC64
 	help
 	  Kprobes allows you to trap at almost any kernel address and
 	  execute a callback function.  register_kprobe() establishes

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
@@ -49,24 +49,32 @@ extra-y				+= vmlinux.lds
 obj-y				+= process.o init_task.o time.o \
 				   prom.o traps.o setup-common.o
 obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o systbl.o
-obj-$(CONFIG_PPC64)		+= misc_64.o
+obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o
 obj-$(CONFIG_PPC_OF)		+= prom_init.o
 obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
 obj-$(CONFIG_6xx)		+= idle_6xx.o
 obj-$(CONFIG_SMP)		+= smp.o
+obj-$(CONFIG_KPROBES)		+= kprobes.o
+
+module-$(CONFIG_PPC64)		+= module_64.o
+obj-$(CONFIG_MODULES)		+= $(module-y)
+
+pci64-$(CONFIG_PPC64)		+= pci_64.o pci_dn.o pci_iommu.o \
+				   pci_direct_iommu.o iomap.o
+obj-$(CONFIG_PCI)		+= $(pci64-y)
+
+kexec64-$(CONFIG_PPC64)		+= machine_kexec_64.o
+obj-$(CONFIG_KEXEC)		+= $(kexec64-y)
 
 ifeq ($(CONFIG_PPC_ISERIES),y)
 $(obj)/head_64.o: $(obj)/lparmap.s
 AFLAGS_head_64.o += -I$(obj)
 endif
 
 else
-# stuff used from here for ARCH=ppc or ARCH=ppc64
+# stuff used from here for ARCH=ppc
 smpobj-$(CONFIG_SMP)		+= smp.o
-obj-$(CONFIG_PPC64)		+= traps.o process.o init_task.o time.o \
-				   setup-common.o $(smpobj-y)
-
 
 endif
 

diff --git a/arch/ppc64/kernel/dma.c → arch/powerpc/kernel/dma_64.c b/arch/ppc64/kernel/dma.c → arch/powerpc/kernel/dma_64.c
diff --git a/arch/ppc64/kernel/iomap.c → arch/powerpc/kernel/iomap.c b/arch/ppc64/kernel/iomap.c → arch/powerpc/kernel/iomap.c
diff --git a/arch/ppc64/kernel/iommu.c → arch/powerpc/kernel/iommu.c b/arch/ppc64/kernel/iommu.c → arch/powerpc/kernel/iommu.c
diff --git a/arch/ppc64/kernel/kprobes.c → arch/powerpc/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c → arch/powerpc/kernel/kprobes.c
diff --git a/arch/ppc64/kernel/machine_kexec.c → arch/powerpc/kernel/machine_kexec_64.c b/arch/ppc64/kernel/machine_kexec.c → arch/powerpc/kernel/machine_kexec_64.c
diff --git a/arch/ppc64/kernel/module.c → arch/powerpc/kernel/module_64.c b/arch/ppc64/kernel/module.c → arch/powerpc/kernel/module_64.c
diff --git a/arch/ppc64/kernel/pci.c → arch/powerpc/kernel/pci_64.c b/arch/ppc64/kernel/pci.c → arch/powerpc/kernel/pci_64.c
diff --git a/arch/ppc64/kernel/pci_direct_iommu.c → arch/powerpc/kernel/pci_direct_iommu.c b/arch/ppc64/kernel/pci_direct_iommu.c → arch/powerpc/kernel/pci_direct_iommu.c
diff --git a/arch/ppc64/kernel/pci_dn.c → arch/powerpc/kernel/pci_dn.c b/arch/ppc64/kernel/pci_dn.c → arch/powerpc/kernel/pci_dn.c
diff --git a/arch/ppc64/kernel/pci_iommu.c → arch/powerpc/kernel/pci_iommu.c b/arch/ppc64/kernel/pci_iommu.c → arch/powerpc/kernel/pci_iommu.c
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
@@ -4,4 +4,7 @@ obj-$(CONFIG_SMP)	+= smp.o
 obj-$(CONFIG_IBMVIO)	+= vio.o
 obj-$(CONFIG_XICS)	+= xics.o
 obj-$(CONFIG_SCANLOG)	+= scanlog.o
-obj-$(CONFIG_EEH)    += eeh.o eeh_event.o
+obj-$(CONFIG_EEH)	+= eeh.o eeh_event.o
+
+obj-$(CONFIG_HVC_CONSOLE)	+= hvconsole.o
+obj-$(CONFIG_HVCS)		+= hvcserver.o
diff --git a/arch/ppc64/kernel/hvconsole.c → arch/powerpc/platforms/pseries/hvconsole.c b/arch/ppc64/kernel/hvconsole.c → arch/powerpc/platforms/pseries/hvconsole.c
diff --git a/arch/ppc64/kernel/hvcserver.c → arch/powerpc/platforms/pseries/hvcserver.c b/arch/ppc64/kernel/hvcserver.c → arch/powerpc/platforms/pseries/hvcserver.c