Skip to content

L
linux
Commit 8070dca4 authored by Paul Mackerras's avatar Paul Mackerras
Browse files
Options

PPC32: Use prepare target to make the assembler offsets header file. 

This also puts the file in include/asm-ppc/offsets.h rather
than arch/ppc/kernel/asm-offsets.h.  This changes PPC to do things
similarly to other ports, and makes make -j work reliably.
parent 7d083ae1
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 143 deletions
arch/ppc/Makefile
View file @ 8070dca4
...@@ -81,13 +81,21 @@ $(BOOT_TARGETS): vmlinux ...@@ -81,13 +81,21 @@ $(BOOT_TARGETS): vmlinux
cp -f arch/ppc/configs/$(@:config=defconfig) .config cp -f arch/ppc/configs/$(@:config=defconfig) .config
archclean: archclean:
rm -f arch/ppc/kernel/{mk_defs,asm-offsets.h,find_name}
rm -f arch/ppc/iSeries/ReleaseData.h
@$(MAKEBOOT) clean @$(MAKEBOOT) clean
archmrproper: archmrproper:
prepare: checkbin prepare: include/asm-$(ARCH)/offsets.h checkbin
arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
include/config/MARKER
include/asm-$(ARCH)/offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
@$(generate-asm-offsets.h) < $< > $@
include/asm-$(ARCH)/offsets.h: include/asm-$(ARCH)/offsets.h.tmp
@echo -n ' Generating $@'
@$(update-if-changed)
ifdef CONFIG_6xx ifdef CONFIG_6xx
# Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later # Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later
...@@ -107,3 +115,8 @@ else ...@@ -107,3 +115,8 @@ else
checkbin: checkbin:
@true @true
endif endif
CLEAN_FILES += include/asm-$(ARCH)/offsets.h.tmp \
include/asm-$(ARCH)/offsets.h \
arch/$(ARCH)/kernel/asm-offsets.s \
arch/$(ARCH)/iSeries/ReleaseData.h
arch/ppc/kernel/mk_defs.c → arch/ppc/asm-offsets.c
View file @ 8070dca4
/* /*
* This program is used to generate definitions needed by * Generate definitions needed by assembly language modules.
* assembly language modules. * This code generates raw asm output which is post-processed to extract
* * and format the required data.
* We use the technique used in the OSF Mach kernel code:
* generate asm statements containing #defines,
* compile this file to assembler, and then extract the
* #defines from the assembly-language output.
*/ */
#include <stddef.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h>
#include <linux/stddef.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/types.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -33,124 +28,126 @@ ...@@ -33,124 +28,126 @@
#include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvLpEvent.h>
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
#define DEFINE(sym, val) \ /* Use marker if you need to separate the values later */
asm volatile("\n#define\t" #sym "\t%0" : : "i" (val))
#define DEFINE(sym, val, marker) \
asm volatile("\n-> " #sym " %0 " #val " " #marker : : "i" (val))
#define BLANK() asm volatile("\n->" : : )
int int
main(void) main(void)
{ {
DEFINE(THREAD, offsetof(struct task_struct, thread)); DEFINE(THREAD, offsetof(struct task_struct, thread),);
DEFINE(THREAD_INFO, offsetof(struct task_struct, thread_info)); DEFINE(THREAD_INFO, offsetof(struct task_struct, thread_info),);
DEFINE(MM, offsetof(struct task_struct, mm)); DEFINE(MM, offsetof(struct task_struct, mm),);
DEFINE(KSP, offsetof(struct thread_struct, ksp)); DEFINE(KSP, offsetof(struct thread_struct, ksp),);
DEFINE(PGDIR, offsetof(struct thread_struct, pgdir)); DEFINE(PGDIR, offsetof(struct thread_struct, pgdir),);
DEFINE(LAST_SYSCALL, offsetof(struct thread_struct, last_syscall)); DEFINE(LAST_SYSCALL, offsetof(struct thread_struct, last_syscall),);
DEFINE(PT_REGS, offsetof(struct thread_struct, regs)); DEFINE(PT_REGS, offsetof(struct thread_struct, regs),);
DEFINE(THREAD_FPEXC_MODE, offsetof(struct thread_struct, fpexc_mode)); DEFINE(THREAD_FPEXC_MODE, offsetof(struct thread_struct, fpexc_mode),);
DEFINE(THREAD_FPR0, offsetof(struct thread_struct, fpr[0])); DEFINE(THREAD_FPR0, offsetof(struct thread_struct, fpr[0]),);
DEFINE(THREAD_FPSCR, offsetof(struct thread_struct, fpscr)); DEFINE(THREAD_FPSCR, offsetof(struct thread_struct, fpscr),);
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
DEFINE(THREAD_VR0, offsetof(struct thread_struct, vr[0])); DEFINE(THREAD_VR0, offsetof(struct thread_struct, vr[0]),);
DEFINE(THREAD_VRSAVE, offsetof(struct thread_struct, vrsave)); DEFINE(THREAD_VRSAVE, offsetof(struct thread_struct, vrsave),);
DEFINE(THREAD_VSCR, offsetof(struct thread_struct, vscr)); DEFINE(THREAD_VSCR, offsetof(struct thread_struct, vscr),);
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
/* Interrupt register frame */ /* Interrupt register frame */
DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD); DEFINE(INT_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs),);
DEFINE(INT_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs));
/* in fact we only use gpr0 - gpr9 and gpr20 - gpr23 */ /* in fact we only use gpr0 - gpr9 and gpr20 - gpr23 */
DEFINE(GPR0, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[0])); DEFINE(GPR0, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[0]),);
DEFINE(GPR1, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[1])); DEFINE(GPR1, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[1]),);
DEFINE(GPR2, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[2])); DEFINE(GPR2, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[2]),);
DEFINE(GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[3])); DEFINE(GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[3]),);
DEFINE(GPR4, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[4])); DEFINE(GPR4, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[4]),);
DEFINE(GPR5, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[5])); DEFINE(GPR5, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[5]),);
DEFINE(GPR6, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[6])); DEFINE(GPR6, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[6]),);
DEFINE(GPR7, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[7])); DEFINE(GPR7, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[7]),);
DEFINE(GPR8, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[8])); DEFINE(GPR8, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[8]),);
DEFINE(GPR9, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[9])); DEFINE(GPR9, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[9]),);
DEFINE(GPR10, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[10])); DEFINE(GPR10, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[10]),);
DEFINE(GPR11, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[11])); DEFINE(GPR11, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[11]),);
DEFINE(GPR12, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[12])); DEFINE(GPR12, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[12]),);
DEFINE(GPR13, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[13])); DEFINE(GPR13, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[13]),);
DEFINE(GPR14, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[14])); DEFINE(GPR14, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[14]),);
DEFINE(GPR15, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[15])); DEFINE(GPR15, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[15]),);
DEFINE(GPR16, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[16])); DEFINE(GPR16, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[16]),);
DEFINE(GPR17, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[17])); DEFINE(GPR17, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[17]),);
DEFINE(GPR18, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[18])); DEFINE(GPR18, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[18]),);
DEFINE(GPR19, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[19])); DEFINE(GPR19, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[19]),);
DEFINE(GPR20, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[20])); DEFINE(GPR20, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[20]),);
DEFINE(GPR21, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[21])); DEFINE(GPR21, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[21]),);
DEFINE(GPR22, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[22])); DEFINE(GPR22, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[22]),);
DEFINE(GPR23, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[23])); DEFINE(GPR23, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[23]),);
DEFINE(GPR24, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[24])); DEFINE(GPR24, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[24]),);
DEFINE(GPR25, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[25])); DEFINE(GPR25, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[25]),);
DEFINE(GPR26, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[26])); DEFINE(GPR26, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[26]),);
DEFINE(GPR27, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[27])); DEFINE(GPR27, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[27]),);
DEFINE(GPR28, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[28])); DEFINE(GPR28, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[28]),);
DEFINE(GPR29, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[29])); DEFINE(GPR29, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[29]),);
DEFINE(GPR30, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[30])); DEFINE(GPR30, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[30]),);
DEFINE(GPR31, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[31])); DEFINE(GPR31, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[31]),);
/* Note: these symbols include _ because they overlap with special /* Note: these symbols include _ because they overlap with special
* register names * register names
*/ */
DEFINE(_NIP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, nip)); DEFINE(_NIP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, nip),);
DEFINE(_MSR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, msr)); DEFINE(_MSR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, msr),);
DEFINE(_CTR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ctr)); DEFINE(_CTR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ctr),);
DEFINE(_LINK, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, link)); DEFINE(_LINK, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, link),);
DEFINE(_CCR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ccr)); DEFINE(_CCR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ccr),);
DEFINE(_MQ, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, mq)); DEFINE(_MQ, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, mq),);
DEFINE(_XER, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, xer)); DEFINE(_XER, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, xer),);
DEFINE(_DAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar)); DEFINE(_DAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar),);
DEFINE(_DSISR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr)); DEFINE(_DSISR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr),);
/* The PowerPC 400-class processors have neither the DAR nor the DSISR /* The PowerPC 400-class processors have neither the DAR nor the DSISR
* SPRs. Hence, we overload them to hold the similar DEAR and ESR SPRs * SPRs. Hence, we overload them to hold the similar DEAR and ESR SPRs
* for such processors. For critical interrupts we use them to * for such processors.
* hold SRR0 and SRR1.
*/ */
DEFINE(_DEAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar)); DEFINE(_DEAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar),);
DEFINE(_ESR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr)); DEFINE(_ESR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr),);
DEFINE(ORIG_GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, orig_gpr3)); DEFINE(ORIG_GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, orig_gpr3),);
DEFINE(RESULT, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, result)); DEFINE(RESULT, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, result),);
DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap)); DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap),);
DEFINE(CLONE_VM, CLONE_VM); DEFINE(CLONE_VM, CLONE_VM,);
DEFINE(MM_PGD, offsetof(struct mm_struct, pgd)); DEFINE(MM_PGD, offsetof(struct mm_struct, pgd),);
/* About the CPU features table */ /* About the CPU features table */
DEFINE(CPU_SPEC_ENTRY_SIZE, sizeof(struct cpu_spec)); DEFINE(CPU_SPEC_ENTRY_SIZE, sizeof(struct cpu_spec),);
DEFINE(CPU_SPEC_PVR_MASK, offsetof(struct cpu_spec, pvr_mask)); DEFINE(CPU_SPEC_PVR_MASK, offsetof(struct cpu_spec, pvr_mask),);
DEFINE(CPU_SPEC_PVR_VALUE, offsetof(struct cpu_spec, pvr_value)); DEFINE(CPU_SPEC_PVR_VALUE, offsetof(struct cpu_spec, pvr_value),);
DEFINE(CPU_SPEC_FEATURES, offsetof(struct cpu_spec, cpu_features)); DEFINE(CPU_SPEC_FEATURES, offsetof(struct cpu_spec, cpu_features),);
DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup)); DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup),);
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
DEFINE(PACAPROCENABLED, offsetof(struct Paca, xProcEnabled)); DEFINE(PACAPROCENABLED, offsetof(struct Paca, xProcEnabled),);
DEFINE(PACAPACAINDEX, offsetof(struct Paca, xPacaIndex)); DEFINE(PACAPACAINDEX, offsetof(struct Paca, xPacaIndex),);
DEFINE(PACAPROCSTART, offsetof(struct Paca, xProcStart)); DEFINE(PACAPROCSTART, offsetof(struct Paca, xProcStart),);
DEFINE(PACAKSAVE, offsetof(struct Paca, xKsave)); DEFINE(PACAKSAVE, offsetof(struct Paca, xKsave),);
DEFINE(PACASAVEDMSR, offsetof(struct Paca, xSavedMsr)); DEFINE(PACASAVEDMSR, offsetof(struct Paca, xSavedMsr),);
DEFINE(PACASAVEDLR, offsetof(struct Paca, xSavedLr)); DEFINE(PACASAVEDLR, offsetof(struct Paca, xSavedLr),);
DEFINE(PACACONTEXTOVERFLOW, offsetof(struct Paca, xContextOverflow)); DEFINE(PACACONTEXTOVERFLOW, offsetof(struct Paca, xContextOverflow),);
DEFINE(PACAR21, offsetof(struct Paca, xR21)); DEFINE(PACAR21, offsetof(struct Paca, xR21),);
DEFINE(PACAR22, offsetof(struct Paca, xR22)); DEFINE(PACAR22, offsetof(struct Paca, xR22),);
DEFINE(PACALPQUEUE, offsetof(struct Paca, lpQueuePtr)); DEFINE(PACALPQUEUE, offsetof(struct Paca, lpQueuePtr),);
DEFINE(PACALPPACA, offsetof(struct Paca, xLpPaca)); DEFINE(PACALPPACA, offsetof(struct Paca, xLpPaca),);
DEFINE(PACA_STRUCT_SIZE, sizeof(struct Paca)); DEFINE(PACA_STRUCT_SIZE, sizeof(struct Paca),);
DEFINE(LPREGSAV, offsetof(struct Paca, xRegSav)); DEFINE(LPREGSAV, offsetof(struct Paca, xRegSav),);
DEFINE(PACADEFAULTDECR, offsetof(struct Paca, default_decr)); DEFINE(PACADEFAULTDECR, offsetof(struct Paca, default_decr),);
DEFINE(LPPACAANYINT, offsetof(struct ItLpPaca, xRsvd)); DEFINE(LPPACAANYINT, offsetof(struct ItLpPaca, xRsvd),);
DEFINE(LPPACASRR0, offsetof(struct ItLpPaca, xSavedSrr0)); DEFINE(LPPACASRR0, offsetof(struct ItLpPaca, xSavedSrr0),);
DEFINE(LPPACASRR1, offsetof(struct ItLpPaca, xSavedSrr1)); DEFINE(LPPACASRR1, offsetof(struct ItLpPaca, xSavedSrr1),);
DEFINE(LPPACADECRINT, offsetof(struct ItLpPaca, xDecrInt)); DEFINE(LPPACADECRINT, offsetof(struct ItLpPaca, xDecrInt),);
DEFINE(LPPACAIPIINT, offsetof(struct ItLpPaca, xIpiCnt)); DEFINE(LPPACAIPIINT, offsetof(struct ItLpPaca, xIpiCnt),);
DEFINE(LPQCUREVENTPTR, offsetof(struct ItLpQueue, xSlicCurEventPtr)); DEFINE(LPQCUREVENTPTR, offsetof(struct ItLpQueue, xSlicCurEventPtr),);
DEFINE(LPQOVERFLOW, offsetof(struct ItLpQueue, xPlicOverflowIntPending)); DEFINE(LPQOVERFLOW, offsetof(struct ItLpQueue, xPlicOverflowIntPending),);
DEFINE(LPQINUSEWORD, offsetof(struct ItLpQueue, xInUseWord)); DEFINE(LPQINUSEWORD, offsetof(struct ItLpQueue, xInUseWord),);
DEFINE(LPEVENTFLAGS, offsetof(struct HvLpEvent, xFlags)); DEFINE(LPEVENTFLAGS, offsetof(struct HvLpEvent, xFlags),);
DEFINE(CONTEXT, offsetof(struct mm_struct, context)); DEFINE(CONTEXT, offsetof(struct mm_struct, context),);
DEFINE(_SOFTE, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, mq)); DEFINE(_SOFTE, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, mq),);
DEFINE(PACA_EXT_INTS, offsetof(struct Paca, ext_ints)); DEFINE(PACA_EXT_INTS, offsetof(struct Paca, ext_ints),);
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28); DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28,);
return 0; return 0;
} }
arch/ppc/kernel/Makefile
View file @ 8070dca4
...@@ -89,23 +89,5 @@ obj-$(CONFIG_PPC_ISERIES) += iSeries_misc.o ...@@ -89,23 +89,5 @@ obj-$(CONFIG_PPC_ISERIES) += iSeries_misc.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
entry.o: entry.S asm-offsets.h
misc.o: misc.S asm-offsets.h
l2cr.o: l2cr.S asm-offsets.h
head.o: head.S asm-offsets.h
head_4xx.o: head_4xx.S asm-offsets.h
head_8xx.o: head_8xx.S asm-offsets.h
iSeries_head.o: iSeries_head.S asm-offsets.h
iSeries_misc.o: iSeries_misc.S asm-offsets.h
asm-offsets.h: mk_defs.c asm-offsets.head \
$(TOPDIR)/include/asm/mmu.h \
$(TOPDIR)/include/asm/processor.h \
$(TOPDIR)/include/asm/pgtable.h \
$(TOPDIR)/include/asm/ptrace.h
$(CC) $(CFLAGS) -S mk_defs.c
(cat asm-offsets.head; grep '^#define' mk_defs.s) >asm-offsets.h
rm mk_defs.s
find_name : find_name.c find_name : find_name.c
$(HOSTCC) $(HOSTCFLAGS) -o find_name find_name.c $(HOSTCC) $(HOSTCFLAGS) -o find_name find_name.c
arch/ppc/kernel/asm-offsets.head deleted 100644 → 0
View file @ 7d083ae1
/*
* WARNING! This file is automatically generated - DO NOT EDIT!
*/
arch/ppc/kernel/entry.S
View file @ 8070dca4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include "asm-offsets.h" #include <asm/offsets.h>
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
#include "iSeries_asm.h" #include "iSeries_asm.h"
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
......
arch/ppc/kernel/head.S
View file @ 8070dca4
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include "asm-offsets.h" #include <asm/offsets.h>
#ifdef CONFIG_APUS #ifdef CONFIG_APUS
#include <asm/amigappc.h> #include <asm/amigappc.h>
......
arch/ppc/kernel/head_4xx.S
View file @ 8070dca4
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include "asm-offsets.h" #include <asm/offsets.h>
/* As with the other PowerPC ports, it is expected that when code /* As with the other PowerPC ports, it is expected that when code
* execution begins here, the following registers contain valid, yet * execution begins here, the following registers contain valid, yet
......
arch/ppc/kernel/head_8xx.S
View file @ 8070dca4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include "asm-offsets.h" #include <asm/offsets.h>
.text .text
.globl _stext .globl _stext
......
arch/ppc/kernel/iSeries_head.S
View file @ 8070dca4
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include "asm-offsets.h" #include <asm/offsets.h>
#include "iSeries_asm.h" #include "iSeries_asm.h"
......
arch/ppc/kernel/iSeries_misc.S
View file @ 8070dca4
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include "asm-offsets.h" #include <asm/offsets.h>
#include "iSeries_asm.h" #include "iSeries_asm.h"
.text .text
......
arch/ppc/kernel/misc.S
View file @ 8070dca4
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include "asm-offsets.h" #include <asm/offsets.h>
.text .text
......
arch/ppc/mm/hashtable.S
View file @ 8070dca4
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include "asm-offsets.h" #include <asm/offsets.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.comm mmu_hash_lock,4 .comm mmu_hash_lock,4
...@@ -144,9 +144,7 @@ retry: ...@@ -144,9 +144,7 @@ retry:
#endif #endif
/* Return from the exception */ /* Return from the exception */
lwz r4,_LINK(r11)
lwz r5,_CTR(r11) lwz r5,_CTR(r11)
mtlr r4
mtctr r5 mtctr r5
lwz r0,GPR0(r11) lwz r0,GPR0(r11)
lwz r7,GPR7(r11) lwz r7,GPR7(r11)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7