Skip to content

Commit 9994a33

Browse files
committed
powerpc: Introduce entry_{32,64}.S, misc_{32,64}.S, systbl.S
The system call table has been consolidated into systbl.S. We have separate 32-bit and 64-bit versions of entry.S and misc.S since the code is mostly sufficiently different to be not worth merging. There are some common bits that will be extracted in future. Signed-off-by: Paul Mackerras <[email protected]>
1 parent 06d67d5 commit 9994a33

File tree

7 files changed

+4109
-4
lines changed

7 files changed

+4109
-4
lines changed

arch/powerpc/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,9 @@ head-$(CONFIG_4xx) := arch/powerpc/kernel/head_4xx.o
119119
head-$(CONFIG_44x) := arch/powerpc/kernel/head_44x.o
120120
head-$(CONFIG_FSL_BOOKE) := arch/powerpc/kernel/head_fsl_booke.o
121121

122-
ifeq ($(CONFIG_PPC32),y)
123122
head-$(CONFIG_6xx) += arch/powerpc/kernel/idle_6xx.o
123+
head-$(CONFIG_PPC64) += arch/powerpc/kernel/entry_64.o
124124
head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o
125-
endif
126125

127126
core-y += arch/powerpc/kernel/ \
128127
arch/$(OLDARCH)/kernel/ \

arch/powerpc/kernel/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ extra-$(CONFIG_44x) := head_44x.o
1717
extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
1818
extra-$(CONFIG_8xx) := head_8xx.o
1919
extra-$(CONFIG_6xx) += idle_6xx.o
20+
extra-$(CONFIG_PPC64) += entry_64.o
2021
extra-$(CONFIG_PPC_FPU) += fpu.o
2122
extra-y += vmlinux.lds
2223

23-
obj-y := traps.o prom.o semaphore.o
24-
obj-$(CONFIG_PPC32) += setup_32.o process.o
24+
obj-y += traps.o prom.o semaphore.o
25+
obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o
2526
obj-$(CONFIG_PPC64) += idle_power4.o
27+
obj-$(CONFIG_PPC64) += misc_64.o
2628
ifeq ($(CONFIG_PPC32),y)
2729
obj-$(CONFIG_PPC_OF) += prom_init.o of_device.o
2830
obj-$(CONFIG_MODULES) += ppc_ksyms.o

0 commit comments

Comments
 (0)