a0e60b2033
Here's a revised version. This re-introduces the set_bits() function from ppc64, which I removed because I thought it was unused (it exists on no other arch). In fact it is used in the powermac interrupt code (but not on pSeries). - We use LARXL/STCXL macros to generate the right (32 or 64 bit) instructions, similar to LDL/STL from ppc_asm.h, used in fpu.S - ppc32 previously used a full "sync" barrier at the end of test_and_*_bit(), whereas ppc64 used an "isync". The merged version uses "isync", since I believe that's sufficient. - The ppc64 versions of then minix_*() bitmap functions have changed semantics. Previously on ppc64, these functions were big-endian (that is bit 0 was the LSB in the first 64-bit, big-endian word). On ppc32 (and x86, for that matter, they were little-endian. As far as I can tell, the big-endian usage was simply wrong - I guess no-one ever tried to use minixfs on ppc64. - On ppc32 find_next_bit() and find_next_zero_bit() are no longer inline (they were already out-of-line on ppc64). - For ppc64, sched_find_first_bit() has moved from mmu_context.h to the merged bitops. What it was doing in mmu_context.h in the first place, I have no idea. - The fls() function is now implemented using the cntlzw instruction on ppc64, instead of generic_fls(), as it already was on ppc32. - For ARCH=ppc, this patch requires adding arch/powerpc/lib to the arch/ppc/Makefile. This in turn requires some changes to arch/powerpc/lib/Makefile which didn't correctly handle ARCH=ppc. Built and running on G5. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
72 lines
1.7 KiB
Makefile
72 lines
1.7 KiB
Makefile
#
|
|
# Makefile for the linux ppc64 kernel.
|
|
#
|
|
|
|
ifneq ($(CONFIG_PPC_MERGE),y)
|
|
|
|
EXTRA_CFLAGS += -mno-minimal-toc
|
|
extra-y := head.o vmlinux.lds
|
|
|
|
obj-y := misc.o prom.o
|
|
|
|
endif
|
|
|
|
obj-y += irq.o idle.o dma.o \
|
|
signal.o \
|
|
align.o pacaData.o \
|
|
udbg.o ioctl32.o \
|
|
rtc.o \
|
|
cpu_setup_power4.o \
|
|
iommu.o sysfs.o vdso.o firmware.o
|
|
obj-y += vdso32/ vdso64/
|
|
|
|
pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o
|
|
|
|
obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)
|
|
|
|
obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o
|
|
ifneq ($(CONFIG_PPC_MERGE),y)
|
|
obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
|
|
endif
|
|
|
|
obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o
|
|
|
|
obj-$(CONFIG_KEXEC) += machine_kexec.o
|
|
obj-$(CONFIG_EEH) += eeh.o
|
|
obj-$(CONFIG_PROC_FS) += proc_ppc64.o
|
|
obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
|
|
obj-$(CONFIG_SMP) += smp.o
|
|
obj-$(CONFIG_MODULES) += module.o
|
|
ifneq ($(CONFIG_PPC_MERGE),y)
|
|
obj-$(CONFIG_MODULES) += ppc_ksyms.o
|
|
endif
|
|
obj-$(CONFIG_PPC_RTAS) += rtas_pci.o
|
|
obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
|
|
obj-$(CONFIG_SCANLOG) += scanlog.o
|
|
obj-$(CONFIG_LPARCFG) += lparcfg.o
|
|
obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
|
|
ifneq ($(CONFIG_PPC_MERGE),y)
|
|
obj-$(CONFIG_BOOTX_TEXT) += btext.o
|
|
endif
|
|
obj-$(CONFIG_HVCS) += hvcserver.o
|
|
|
|
obj-$(CONFIG_PPC_PMAC) += udbg_scc.o
|
|
|
|
obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o
|
|
|
|
ifdef CONFIG_SMP
|
|
obj-$(CONFIG_PPC_PMAC) += smp-tbsync.o
|
|
obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o
|
|
endif
|
|
|
|
obj-$(CONFIG_KPROBES) += kprobes.o
|
|
|
|
CFLAGS_ioctl32.o += -Ifs/
|
|
|
|
ifneq ($(CONFIG_PPC_MERGE),y)
|
|
ifeq ($(CONFIG_PPC_ISERIES),y)
|
|
arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
|
|
AFLAGS_head.o += -Iarch/powerpc/kernel
|
|
endif
|
|
endif
|