Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed981856 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move module.c over to arch/powerpc 



... and rename it to module_32.c since it is the 32-bit version.
The 32-bit and 64-bit ABIs are sufficiently different that having
a merged version isn't really practical.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 45320bcb

arch/powerpc/kernel/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o 
obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o

obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o

obj-$(CONFIG_TAU)		+= tau_6xx.o

obj-$(CONFIG_TAU)		+= tau_6xx.o

obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o

obj32-$(CONFIG_MODULES)		+= module_32.o





ifeq ($(CONFIG_PPC_MERGE),y)

ifeq ($(CONFIG_PPC_MERGE),y)
@@ -78,6 +80,7 @@ smpobj-$(CONFIG_SMP) += smp.o 




endif

endif





obj-$(CONFIG_PPC32)		+= $(obj32-y)

obj-$(CONFIG_PPC64)		+= $(obj64-y)

obj-$(CONFIG_PPC64)		+= $(obj64-y)





extra-$(CONFIG_PPC_FPU)		+= fpu.o

extra-$(CONFIG_PPC_FPU)		+= fpu.o

arch/ppc/kernel/module.c→arch/powerpc/kernel/module_32.c

+0 −0

File moved.

View file

arch/ppc/kernel/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ extra-y += vmlinux.lds 
obj-y				:= entry.o traps.o time.o misc.o \

obj-y				:= entry.o traps.o time.o misc.o \

					setup.o \

					setup.o \

					ppc_htab.o

					ppc_htab.o

obj-$(CONFIG_MODULES)		+= module.o ppc_ksyms.o

obj-$(CONFIG_MODULES)		+= ppc_ksyms.o

obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o

obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o

obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_RAPIDIO)		+= rio.o

obj-$(CONFIG_RAPIDIO)		+= rio.o
@@ -31,7 +31,6 @@ endif 
# These are here while we do the architecture merge

# These are here while we do the architecture merge





else

else

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o

obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o

obj-$(CONFIG_KGDB)		+= ppc-stub.o

obj-$(CONFIG_KGDB)		+= ppc-stub.o

ifndef CONFIG_E200

ifndef CONFIG_E200