mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
49148020bc
Merge header files for m68k and m68knommu to the single location: arch/m68k/include/asm The majority of this patch was the result of the script that is included in the changelog below. The script was originally written by Arnd Bergman and exten by me to cover a few more files. When the header files differed the script uses the following: The original m68k file is named <file>_mm.h [mm for memory manager] The m68knommu file is named <file>_no.h [no for no memory manager] The files uses the following include guard: This include gaurd works as the m68knommu toolchain set the __uClinux__ symbol - so this should work in userspace too. Merging the header files for m68k and m68knommu exposes the (unexpected?) ABI differences thus it is easier to actually identify these and thus to fix them. The commit has been build tested with both a m68k and a m68knommu toolchain - with success. The commit has also been tested with "make headers_check" and this patch fixes make headers_check for m68knommu. The script used: TARGET=arch/m68k/include/asm SOURCE=arch/m68knommu/include/asm INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \ linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \ oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \ shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \ termbits.h termios.h tlb.h types.h user.h" EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \ ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \ sections.h topology.h" NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \ elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \ m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \ m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \ m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \ mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \ mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \ nettel.h quicc_simple.h smp.h" FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \ cacheflush.h checksum.h current.h delay.h div64.h \ dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \ irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \ module.h page.h page_offset.h param.h pci.h pgalloc.h \ pgtable.h processor.h ptrace.h scatterlist.h segment.h \ setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \ thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \ unaligned.h unistd.h" mergefile() { BASE=${1%.h} git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h cat << EOF > ${TARGET}/$1 EOF git add ${TARGET}/$1 } set -e mkdir -p ${TARGET} git mv include/asm-m68k/* ${TARGET} rmdir include/asm-m68k git rm ${SOURCE}/Kbuild for F in $INCLUDE $EQUAL; do git rm ${SOURCE}/$F done for F in $NOMUUFILES; do git mv ${SOURCE}/$F ${TARGET}/$F done for F in $FILES ; do mergefile $F done rmdir arch/m68knommu/include/asm rmdir arch/m68knommu/include Cc: Arnd Bergmann <arnd@arndb.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
144 lines
3.5 KiB
C
144 lines
3.5 KiB
C
/*
|
|
* include/asm-m68knommu/processor.h
|
|
*
|
|
* Copyright (C) 1995 Hamish Macdonald
|
|
*/
|
|
|
|
#ifndef __ASM_M68K_PROCESSOR_H
|
|
#define __ASM_M68K_PROCESSOR_H
|
|
|
|
/*
|
|
* Default implementation of macro that returns current
|
|
* instruction pointer ("program counter").
|
|
*/
|
|
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/threads.h>
|
|
#include <asm/types.h>
|
|
#include <asm/segment.h>
|
|
#include <asm/fpu.h>
|
|
#include <asm/ptrace.h>
|
|
#include <asm/current.h>
|
|
|
|
static inline unsigned long rdusp(void)
|
|
{
|
|
#ifdef CONFIG_COLDFIRE
|
|
extern unsigned int sw_usp;
|
|
return(sw_usp);
|
|
#else
|
|
unsigned long usp;
|
|
__asm__ __volatile__("move %/usp,%0" : "=a" (usp));
|
|
return usp;
|
|
#endif
|
|
}
|
|
|
|
static inline void wrusp(unsigned long usp)
|
|
{
|
|
#ifdef CONFIG_COLDFIRE
|
|
extern unsigned int sw_usp;
|
|
sw_usp = usp;
|
|
#else
|
|
__asm__ __volatile__("move %0,%/usp" : : "a" (usp));
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* User space process size: 3.75GB. This is hardcoded into a few places,
|
|
* so don't change it unless you know what you are doing.
|
|
*/
|
|
#define TASK_SIZE (0xF0000000UL)
|
|
|
|
/*
|
|
* This decides where the kernel will search for a free chunk of vm
|
|
* space during mmap's. We won't be using it
|
|
*/
|
|
#define TASK_UNMAPPED_BASE 0
|
|
|
|
/*
|
|
* if you change this structure, you must change the code and offsets
|
|
* in m68k/machasm.S
|
|
*/
|
|
|
|
struct thread_struct {
|
|
unsigned long ksp; /* kernel stack pointer */
|
|
unsigned long usp; /* user stack pointer */
|
|
unsigned short sr; /* saved status register */
|
|
unsigned short fs; /* saved fs (sfc, dfc) */
|
|
unsigned long crp[2]; /* cpu root pointer */
|
|
unsigned long esp0; /* points to SR of stack frame */
|
|
unsigned long fp[8*3];
|
|
unsigned long fpcntl[3]; /* fp control regs */
|
|
unsigned char fpstate[FPSTATESIZE]; /* floating point state */
|
|
};
|
|
|
|
#define INIT_THREAD { \
|
|
sizeof(init_stack) + (unsigned long) init_stack, 0, \
|
|
PS_S, __KERNEL_DS, \
|
|
{0, 0}, 0, {0,}, {0, 0, 0}, {0,}, \
|
|
}
|
|
|
|
/*
|
|
* Coldfire stacks need to be re-aligned on trap exit, conventional
|
|
* 68k can handle this case cleanly.
|
|
*/
|
|
#if defined(CONFIG_COLDFIRE)
|
|
#define reformat(_regs) do { (_regs)->format = 0x4; } while(0)
|
|
#else
|
|
#define reformat(_regs) do { } while (0)
|
|
#endif
|
|
|
|
/*
|
|
* Do necessary setup to start up a newly executed thread.
|
|
*
|
|
* pass the data segment into user programs if it exists,
|
|
* it can't hurt anything as far as I can tell
|
|
*/
|
|
#define start_thread(_regs, _pc, _usp) \
|
|
do { \
|
|
set_fs(USER_DS); /* reads from user space */ \
|
|
(_regs)->pc = (_pc); \
|
|
((struct switch_stack *)(_regs))[-1].a6 = 0; \
|
|
reformat(_regs); \
|
|
if (current->mm) \
|
|
(_regs)->d5 = current->mm->start_data; \
|
|
(_regs)->sr &= ~0x2000; \
|
|
wrusp(_usp); \
|
|
} while(0)
|
|
|
|
/* Forward declaration, a strange C thing */
|
|
struct task_struct;
|
|
|
|
/* Free all resources held by a thread. */
|
|
static inline void release_thread(struct task_struct *dead_task)
|
|
{
|
|
}
|
|
|
|
/* Prepare to copy thread state - unlazy all lazy status */
|
|
#define prepare_to_copy(tsk) do { } while (0)
|
|
|
|
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
|
|
|
|
/*
|
|
* Free current thread data structures etc..
|
|
*/
|
|
static inline void exit_thread(void)
|
|
{
|
|
}
|
|
|
|
unsigned long thread_saved_pc(struct task_struct *tsk);
|
|
unsigned long get_wchan(struct task_struct *p);
|
|
|
|
#define KSTK_EIP(tsk) \
|
|
({ \
|
|
unsigned long eip = 0; \
|
|
if ((tsk)->thread.esp0 > PAGE_SIZE && \
|
|
(virt_addr_valid((tsk)->thread.esp0))) \
|
|
eip = ((struct pt_regs *) (tsk)->thread.esp0)->pc; \
|
|
eip; })
|
|
#define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp)
|
|
|
|
#define cpu_relax() barrier()
|
|
|
|
#endif
|