sparc,sparc64: unify kernel/

o Move all files from sparc64/kernel/ to sparc/kernel - rename as appropriate o Update sparc/Makefile to the changes o Update sparc/kernel/Makefile to include the sparc64 files NOTE: This commit changes link order on sparc64! Link order had to change for either of sparc32 and sparc64. And assuming sparc64 see more testing than sparc32 change link order on sparc64 where issues will be caught faster. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Dec 4, 2008 · a88b5ba · a88b5ba
1 parent d670bd4
commit a88b5ba
Show file tree

Hide file tree

Showing 94 changed files with 45 additions and 47 deletions.
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
@@ -67,13 +67,10 @@ endif
 
 endif
 
-head-$(CONFIG_SPARC32) := arch/sparc/kernel/head_$(BITS).o
-head-$(CONFIG_SPARC32) += arch/sparc/kernel/init_task_$(BITS).o
-head-$(CONFIG_SPARC64) := arch/sparc64/kernel/head.o
-head-$(CONFIG_SPARC64) += arch/sparc64/kernel/init_task.o
+head-y                 := arch/sparc/kernel/head_$(BITS).o
+head-y                 += arch/sparc/kernel/init_task_$(BITS).o
 
-core-$(CONFIG_SPARC32) += arch/sparc/kernel/
-core-$(CONFIG_SPARC64) += arch/sparc64/kernel/
+core-y                 += arch/sparc/kernel/
 core-y                 += arch/sparc/mm/ arch/sparc/math-emu/
 
 libs-y                 += arch/sparc/prom/

diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
@@ -38,6 +38,19 @@ obj-$(CONFIG_SPARC32)   += muldiv.o
 obj-y                   += prom_$(BITS).o
 obj-y                   += of_device_$(BITS).o
 
+obj-$(CONFIG_SPARC64)   += reboot.o
+obj-$(CONFIG_SPARC64)   += sysfs.o
+obj-$(CONFIG_SPARC64)   += iommu.o
+obj-$(CONFIG_SPARC64)   += central.o
+obj-$(CONFIG_SPARC64)   += starfire.o
+obj-$(CONFIG_SPARC64)   += power.o
+obj-$(CONFIG_SPARC64)   += sbus.o
+obj-$(CONFIG_SPARC64)   += ebus.o
+obj-$(CONFIG_SPARC64)   += visemul.o
+obj-$(CONFIG_SPARC64)   += hvapi.o
+obj-$(CONFIG_SPARC64)   += sstate.o
+obj-$(CONFIG_SPARC64)   += mdesc.o
+
 # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation
 obj-$(CONFIG_SPARC32)     += devres.o
 devres-y                  := ../../../kernel/irq/devres.o
@@ -48,6 +61,7 @@ obj-$(CONFIG_SPARC32_PCI) += pcic.o
 
 obj-$(CONFIG_SMP)         += trampoline_$(BITS).o smp_$(BITS).o
 obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o
+obj-$(CONFIG_SPARC64_SMP) += hvtramp.o
 
 obj-y                     += auxio_$(BITS).o
 obj-$(CONFIG_SUN_PM)      += apc.o pmc.o
@@ -56,3 +70,28 @@ obj-$(CONFIG_MODULES)     += module_$(BITS).o
 obj-$(CONFIG_MODULES)     += sparc_ksyms_$(BITS).o
 obj-$(CONFIG_SPARC_LED)   += led.o
 obj-$(CONFIG_KGDB)        += kgdb_$(BITS).o
+
+
+obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
+CFLAGS_REMOVE_ftrace.o := -pg
+
+obj-$(CONFIG_STACKTRACE)     += stacktrace.o
+# sparc64 PCI
+obj-$(CONFIG_SPARC64_PCI)    += pci.o pci_common.o psycho_common.o
+obj-$(CONFIG_SPARC64_PCI)    += pci_psycho.o pci_sabre.o pci_schizo.o
+obj-$(CONFIG_SPARC64_PCI)    += pci_sun4v.o pci_sun4v_asm.o pci_fire.o
+obj-$(CONFIG_PCI_MSI)        += pci_msi.o
+
+obj-$(CONFIG_COMPAT)         += sys32.o sys_sparc32.o signal32.o
+
+# sparc64 cpufreq
+obj-$(CONFIG_US3_FREQ)  += us3_cpufreq.o
+obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o
+obj-$(CONFIG_US3_MC)    += chmc.o
+
+obj-$(CONFIG_KPROBES)   += kprobes.o
+obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o
+
+obj-$(CONFIG_AUDIT)     += audit.o
+audit--$(CONFIG_AUDIT)  := compat_audit.o
+obj-$(CONFIG_COMPAT)    += $(audit--y)
diff --git a/arch/sparc64/kernel/audit.c → arch/sparc/kernel/audit.c b/arch/sparc64/kernel/audit.c → arch/sparc/kernel/audit.c
diff --git a/arch/sparc64/kernel/auxio.c → arch/sparc/kernel/auxio_64.c b/arch/sparc64/kernel/auxio.c → arch/sparc/kernel/auxio_64.c
diff --git a/arch/sparc64/kernel/central.c → arch/sparc/kernel/central.c b/arch/sparc64/kernel/central.c → arch/sparc/kernel/central.c
diff --git a/arch/sparc64/kernel/cherrs.S → arch/sparc/kernel/cherrs.S b/arch/sparc64/kernel/cherrs.S → arch/sparc/kernel/cherrs.S
diff --git a/arch/sparc64/kernel/chmc.c → arch/sparc/kernel/chmc.c b/arch/sparc64/kernel/chmc.c → arch/sparc/kernel/chmc.c
diff --git a/arch/sparc64/kernel/compat_audit.c → arch/sparc/kernel/compat_audit.c b/arch/sparc64/kernel/compat_audit.c → arch/sparc/kernel/compat_audit.c
diff --git a/arch/sparc64/kernel/cpu.c → arch/sparc/kernel/cpu_64.c b/arch/sparc64/kernel/cpu.c → arch/sparc/kernel/cpu_64.c
diff --git a/arch/sparc64/kernel/ds.c → arch/sparc/kernel/ds.c b/arch/sparc64/kernel/ds.c → arch/sparc/kernel/ds.c
diff --git a/arch/sparc64/kernel/dtlb_miss.S → arch/sparc/kernel/dtlb_miss.S b/arch/sparc64/kernel/dtlb_miss.S → arch/sparc/kernel/dtlb_miss.S
diff --git a/arch/sparc64/kernel/dtlb_prot.S → arch/sparc/kernel/dtlb_prot.S b/arch/sparc64/kernel/dtlb_prot.S → arch/sparc/kernel/dtlb_prot.S
diff --git a/arch/sparc64/kernel/ebus.c → arch/sparc/kernel/ebus.c b/arch/sparc64/kernel/ebus.c → arch/sparc/kernel/ebus.c
diff --git a/arch/sparc64/kernel/entry.h → arch/sparc/kernel/entry.h b/arch/sparc64/kernel/entry.h → arch/sparc/kernel/entry.h
diff --git a/arch/sparc64/kernel/etrap.S → arch/sparc/kernel/etrap_64.S b/arch/sparc64/kernel/etrap.S → arch/sparc/kernel/etrap_64.S
diff --git a/arch/sparc64/kernel/fpu_traps.S → arch/sparc/kernel/fpu_traps.S b/arch/sparc64/kernel/fpu_traps.S → arch/sparc/kernel/fpu_traps.S
diff --git a/arch/sparc64/kernel/ftrace.c → arch/sparc/kernel/ftrace.c b/arch/sparc64/kernel/ftrace.c → arch/sparc/kernel/ftrace.c
diff --git a/arch/sparc64/kernel/getsetcc.S → arch/sparc/kernel/getsetcc.S b/arch/sparc64/kernel/getsetcc.S → arch/sparc/kernel/getsetcc.S
diff --git a/arch/sparc64/kernel/head.S → arch/sparc/kernel/head_64.S b/arch/sparc64/kernel/head.S → arch/sparc/kernel/head_64.S
@@ -825,8 +825,8 @@ setup_tba:
 	 restore
 sparc64_boot_end:
 
-#include "etrap.S"
-#include "rtrap.S"
+#include "etrap_64.S"
+#include "rtrap_64.S"
 #include "winfixup.S"
 #include "fpu_traps.S"
 #include "ivec.S"
@@ -882,7 +882,7 @@ swapper_4m_tsb:
 
 ! 0x0000000000428000
 
-#include "systbls.S"
+#include "systbls_64.S"
 
 	.data
 	.align	8

diff --git a/arch/sparc64/kernel/helpers.S → arch/sparc/kernel/helpers.S b/arch/sparc64/kernel/helpers.S → arch/sparc/kernel/helpers.S
diff --git a/arch/sparc64/kernel/hvapi.c → arch/sparc/kernel/hvapi.c b/arch/sparc64/kernel/hvapi.c → arch/sparc/kernel/hvapi.c
diff --git a/arch/sparc64/kernel/hvcalls.S → arch/sparc/kernel/hvcalls.S b/arch/sparc64/kernel/hvcalls.S → arch/sparc/kernel/hvcalls.S
diff --git a/arch/sparc64/kernel/hvtramp.S → arch/sparc/kernel/hvtramp.S b/arch/sparc64/kernel/hvtramp.S → arch/sparc/kernel/hvtramp.S
diff --git a/arch/sparc64/kernel/idprom.c → arch/sparc/kernel/idprom_64.c b/arch/sparc64/kernel/idprom.c → arch/sparc/kernel/idprom_64.c
diff --git a/arch/sparc64/kernel/init_task.c → arch/sparc/kernel/init_task_64.c b/arch/sparc64/kernel/init_task.c → arch/sparc/kernel/init_task_64.c
diff --git a/arch/sparc64/kernel/iommu.c → arch/sparc/kernel/iommu.c b/arch/sparc64/kernel/iommu.c → arch/sparc/kernel/iommu.c
diff --git a/arch/sparc64/kernel/iommu_common.h → arch/sparc/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h → arch/sparc/kernel/iommu_common.h
diff --git a/arch/sparc64/kernel/irq.c → arch/sparc/kernel/irq_64.c b/arch/sparc64/kernel/irq.c → arch/sparc/kernel/irq_64.c
diff --git a/arch/sparc64/kernel/itlb_miss.S → arch/sparc/kernel/itlb_miss.S b/arch/sparc64/kernel/itlb_miss.S → arch/sparc/kernel/itlb_miss.S
diff --git a/arch/sparc64/kernel/ivec.S → arch/sparc/kernel/ivec.S b/arch/sparc64/kernel/ivec.S → arch/sparc/kernel/ivec.S
diff --git a/arch/sparc64/kernel/kgdb.c → arch/sparc/kernel/kgdb_64.c b/arch/sparc64/kernel/kgdb.c → arch/sparc/kernel/kgdb_64.c
diff --git a/arch/sparc64/kernel/kprobes.c → arch/sparc/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c → arch/sparc/kernel/kprobes.c
diff --git a/arch/sparc64/kernel/kstack.h → arch/sparc/kernel/kstack.h b/arch/sparc64/kernel/kstack.h → arch/sparc/kernel/kstack.h
diff --git a/arch/sparc64/kernel/ktlb.S → arch/sparc/kernel/ktlb.S b/arch/sparc64/kernel/ktlb.S → arch/sparc/kernel/ktlb.S
diff --git a/arch/sparc64/kernel/ldc.c → arch/sparc/kernel/ldc.c b/arch/sparc64/kernel/ldc.c → arch/sparc/kernel/ldc.c
diff --git a/arch/sparc64/kernel/mdesc.c → arch/sparc/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c → arch/sparc/kernel/mdesc.c
diff --git a/arch/sparc64/kernel/misctrap.S → arch/sparc/kernel/misctrap.S b/arch/sparc64/kernel/misctrap.S → arch/sparc/kernel/misctrap.S
diff --git a/arch/sparc64/kernel/module.c → arch/sparc/kernel/module_64.c b/arch/sparc64/kernel/module.c → arch/sparc/kernel/module_64.c
diff --git a/arch/sparc64/kernel/of_device.c → arch/sparc/kernel/of_device_64.c b/arch/sparc64/kernel/of_device.c → arch/sparc/kernel/of_device_64.c
diff --git a/arch/sparc64/kernel/pci.c → arch/sparc/kernel/pci.c b/arch/sparc64/kernel/pci.c → arch/sparc/kernel/pci.c
diff --git a/arch/sparc64/kernel/pci_common.c → arch/sparc/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c → arch/sparc/kernel/pci_common.c
diff --git a/arch/sparc64/kernel/pci_fire.c → arch/sparc/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c → arch/sparc/kernel/pci_fire.c
diff --git a/arch/sparc64/kernel/pci_impl.h → arch/sparc/kernel/pci_impl.h b/arch/sparc64/kernel/pci_impl.h → arch/sparc/kernel/pci_impl.h
diff --git a/arch/sparc64/kernel/pci_msi.c → arch/sparc/kernel/pci_msi.c b/arch/sparc64/kernel/pci_msi.c → arch/sparc/kernel/pci_msi.c
diff --git a/arch/sparc64/kernel/pci_psycho.c → arch/sparc/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c → arch/sparc/kernel/pci_psycho.c
diff --git a/arch/sparc64/kernel/pci_sabre.c → arch/sparc/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c → arch/sparc/kernel/pci_sabre.c
diff --git a/arch/sparc64/kernel/pci_schizo.c → arch/sparc/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c → arch/sparc/kernel/pci_schizo.c
diff --git a/arch/sparc64/kernel/pci_sun4v.c → arch/sparc/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c → arch/sparc/kernel/pci_sun4v.c
diff --git a/arch/sparc64/kernel/pci_sun4v.h → arch/sparc/kernel/pci_sun4v.h b/arch/sparc64/kernel/pci_sun4v.h → arch/sparc/kernel/pci_sun4v.h
diff --git a/arch/sparc64/kernel/pci_sun4v_asm.S → arch/sparc/kernel/pci_sun4v_asm.S b/arch/sparc64/kernel/pci_sun4v_asm.S → arch/sparc/kernel/pci_sun4v_asm.S
diff --git a/arch/sparc64/kernel/power.c → arch/sparc/kernel/power.c b/arch/sparc64/kernel/power.c → arch/sparc/kernel/power.c
diff --git a/arch/sparc64/kernel/process.c → arch/sparc/kernel/process_64.c b/arch/sparc64/kernel/process.c → arch/sparc/kernel/process_64.c
diff --git a/arch/sparc64/kernel/prom.c → arch/sparc/kernel/prom_64.c b/arch/sparc64/kernel/prom.c → arch/sparc/kernel/prom_64.c
diff --git a/arch/sparc64/kernel/psycho_common.c → arch/sparc/kernel/psycho_common.c b/arch/sparc64/kernel/psycho_common.c → arch/sparc/kernel/psycho_common.c
diff --git a/arch/sparc64/kernel/psycho_common.h → arch/sparc/kernel/psycho_common.h b/arch/sparc64/kernel/psycho_common.h → arch/sparc/kernel/psycho_common.h
diff --git a/arch/sparc64/kernel/ptrace.c → arch/sparc/kernel/ptrace_64.c b/arch/sparc64/kernel/ptrace.c → arch/sparc/kernel/ptrace_64.c
diff --git a/arch/sparc64/kernel/reboot.c → arch/sparc/kernel/reboot.c b/arch/sparc64/kernel/reboot.c → arch/sparc/kernel/reboot.c
diff --git a/arch/sparc64/kernel/rtrap.S → arch/sparc/kernel/rtrap_64.S b/arch/sparc64/kernel/rtrap.S → arch/sparc/kernel/rtrap_64.S
diff --git a/arch/sparc64/kernel/sbus.c → arch/sparc/kernel/sbus.c b/arch/sparc64/kernel/sbus.c → arch/sparc/kernel/sbus.c
diff --git a/arch/sparc64/kernel/setup.c → arch/sparc/kernel/setup_64.c b/arch/sparc64/kernel/setup.c → arch/sparc/kernel/setup_64.c
diff --git a/arch/sparc64/kernel/signal32.c → arch/sparc/kernel/signal32.c b/arch/sparc64/kernel/signal32.c → arch/sparc/kernel/signal32.c
diff --git a/arch/sparc64/kernel/signal.c → arch/sparc/kernel/signal_64.c b/arch/sparc64/kernel/signal.c → arch/sparc/kernel/signal_64.c
diff --git a/arch/sparc64/kernel/smp.c → arch/sparc/kernel/smp_64.c b/arch/sparc64/kernel/smp.c → arch/sparc/kernel/smp_64.c
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c → arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc64/kernel/sparc64_ksyms.c → arch/sparc/kernel/sparc_ksyms_64.c
diff --git a/arch/sparc64/kernel/spiterrs.S → arch/sparc/kernel/spiterrs.S b/arch/sparc64/kernel/spiterrs.S → arch/sparc/kernel/spiterrs.S
diff --git a/arch/sparc64/kernel/sstate.c → arch/sparc/kernel/sstate.c b/arch/sparc64/kernel/sstate.c → arch/sparc/kernel/sstate.c
diff --git a/arch/sparc64/kernel/stacktrace.c → arch/sparc/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c → arch/sparc/kernel/stacktrace.c
diff --git a/arch/sparc64/kernel/starfire.c → arch/sparc/kernel/starfire.c b/arch/sparc64/kernel/starfire.c → arch/sparc/kernel/starfire.c
diff --git a/arch/sparc64/kernel/sun4v_ivec.S → arch/sparc/kernel/sun4v_ivec.S b/arch/sparc64/kernel/sun4v_ivec.S → arch/sparc/kernel/sun4v_ivec.S
diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S → arch/sparc/kernel/sun4v_tlb_miss.S b/arch/sparc64/kernel/sun4v_tlb_miss.S → arch/sparc/kernel/sun4v_tlb_miss.S
diff --git a/arch/sparc64/kernel/sys32.S → arch/sparc/kernel/sys32.S b/arch/sparc64/kernel/sys32.S → arch/sparc/kernel/sys32.S
diff --git a/arch/sparc64/kernel/sys_sparc32.c → arch/sparc/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c → arch/sparc/kernel/sys_sparc32.c
diff --git a/arch/sparc64/kernel/sys_sparc.c → arch/sparc/kernel/sys_sparc_64.c b/arch/sparc64/kernel/sys_sparc.c → arch/sparc/kernel/sys_sparc_64.c
diff --git a/arch/sparc64/kernel/syscalls.S → arch/sparc/kernel/syscalls.S b/arch/sparc64/kernel/syscalls.S → arch/sparc/kernel/syscalls.S
diff --git a/arch/sparc64/kernel/sysfs.c → arch/sparc/kernel/sysfs.c b/arch/sparc64/kernel/sysfs.c → arch/sparc/kernel/sysfs.c
diff --git a/arch/sparc64/kernel/systbls.h → arch/sparc/kernel/systbls.h b/arch/sparc64/kernel/systbls.h → arch/sparc/kernel/systbls.h
diff --git a/arch/sparc64/kernel/systbls.S → arch/sparc/kernel/systbls_64.S b/arch/sparc64/kernel/systbls.S → arch/sparc/kernel/systbls_64.S
diff --git a/arch/sparc64/kernel/time.c → arch/sparc/kernel/time_64.c b/arch/sparc64/kernel/time.c → arch/sparc/kernel/time_64.c
diff --git a/arch/sparc64/kernel/trampoline.S → arch/sparc/kernel/trampoline_64.S b/arch/sparc64/kernel/trampoline.S → arch/sparc/kernel/trampoline_64.S
diff --git a/arch/sparc64/kernel/traps.c → arch/sparc/kernel/traps_64.c b/arch/sparc64/kernel/traps.c → arch/sparc/kernel/traps_64.c
diff --git a/arch/sparc64/kernel/tsb.S → arch/sparc/kernel/tsb.S b/arch/sparc64/kernel/tsb.S → arch/sparc/kernel/tsb.S
diff --git a/arch/sparc64/kernel/ttable.S → arch/sparc/kernel/ttable.S b/arch/sparc64/kernel/ttable.S → arch/sparc/kernel/ttable.S
diff --git a/arch/sparc64/kernel/una_asm.S → arch/sparc/kernel/una_asm_64.S b/arch/sparc64/kernel/una_asm.S → arch/sparc/kernel/una_asm_64.S
diff --git a/arch/sparc64/kernel/unaligned.c → arch/sparc/kernel/unaligned_64.c b/arch/sparc64/kernel/unaligned.c → arch/sparc/kernel/unaligned_64.c
diff --git a/arch/sparc64/kernel/us2e_cpufreq.c → arch/sparc/kernel/us2e_cpufreq.c b/arch/sparc64/kernel/us2e_cpufreq.c → arch/sparc/kernel/us2e_cpufreq.c
diff --git a/arch/sparc64/kernel/us3_cpufreq.c → arch/sparc/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c → arch/sparc/kernel/us3_cpufreq.c
diff --git a/arch/sparc64/kernel/utrap.S → arch/sparc/kernel/utrap.S b/arch/sparc64/kernel/utrap.S → arch/sparc/kernel/utrap.S
diff --git a/arch/sparc64/kernel/vio.c → arch/sparc/kernel/vio.c b/arch/sparc64/kernel/vio.c → arch/sparc/kernel/vio.c
diff --git a/arch/sparc64/kernel/viohs.c → arch/sparc/kernel/viohs.c b/arch/sparc64/kernel/viohs.c → arch/sparc/kernel/viohs.c
diff --git a/arch/sparc64/kernel/visemul.c → arch/sparc/kernel/visemul.c b/arch/sparc64/kernel/visemul.c → arch/sparc/kernel/visemul.c
diff --git a/arch/sparc64/kernel/winfixup.S → arch/sparc/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S → arch/sparc/kernel/winfixup.S
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
diff --git a/arch/sparc64/kernel/asm-offsets.c b/arch/sparc64/kernel/asm-offsets.c
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S