66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
77 lines
2.6 KiB
C
77 lines
2.6 KiB
C
/*
|
|
* This program is used to generate definitions needed by
|
|
* assembly language modules.
|
|
*
|
|
* 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 <linux/stddef.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/kernel_stat.h>
|
|
#include <linux/ptrace.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/kbuild.h>
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/thread_info.h>
|
|
|
|
int main(void)
|
|
{
|
|
/* offsets into the task struct */
|
|
DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
|
|
DEFINE(TASK_MM, offsetof(struct task_struct, mm));
|
|
|
|
/* offsets into the irq_cpustat_t struct */
|
|
DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
|
|
|
|
/* offsets into the thread struct */
|
|
DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));
|
|
DEFINE(THREAD_USP, offsetof(struct thread_struct, usp));
|
|
DEFINE(THREAD_SR, offsetof(struct thread_struct, sr));
|
|
DEFINE(THREAD_FS, offsetof(struct thread_struct, fs));
|
|
DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp));
|
|
DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0));
|
|
DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp));
|
|
DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
|
|
DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
|
|
|
|
/* offsets into the pt_regs */
|
|
DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0));
|
|
DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0));
|
|
DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1));
|
|
DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2));
|
|
DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3));
|
|
DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4));
|
|
DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5));
|
|
DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0));
|
|
DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1));
|
|
DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2));
|
|
DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc));
|
|
DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr));
|
|
|
|
#ifdef CONFIG_COLDFIRE
|
|
/* bitfields are a bit difficult */
|
|
DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2);
|
|
#else
|
|
/* bitfields are a bit difficult */
|
|
DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4);
|
|
#endif
|
|
|
|
/* signal defines */
|
|
DEFINE(SIGSEGV, SIGSEGV);
|
|
DEFINE(SEGV_MAPERR, SEGV_MAPERR);
|
|
DEFINE(SIGTRAP, SIGTRAP);
|
|
DEFINE(TRAP_TRACE, TRAP_TRACE);
|
|
|
|
DEFINE(PT_PTRACED, PT_PTRACED);
|
|
|
|
/* Offsets in thread_info structure */
|
|
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
|
|
DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count));
|
|
|
|
return 0;
|
|
}
|