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

Commit 39678e5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fix-includes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

* 'fix-includes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: merge the non-MMU and MMU versions of siginfo.h
  m68k: use the MMU version of unistd.h for all m68k platforms
  m68k: merge the non-MMU and MMU versions of signal.h
  m68k: merge the non-MMU and MMU versions of ptrace.h
  m68k: use MMU version of setup.h for both MMU and non-MMU
  m68k: merge the non-MMU and MMU versions of sigcontext.h
  m68k: merge the non-MMU and MMU versions of swab.h
  m68k: merge the non-MMU and MMU versions of param.h
parents f762dd68 7a2cf4af

arch/m68k/include/asm/param.h

+23 −2
Original line number Diff line number Diff line 
#ifndef _M68K_PARAM_H

#define _M68K_PARAM_H



#ifdef __KERNEL__

# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */

# define USER_HZ	100		/* .. some user interfaces are in "ticks" */

# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */

#endif



#ifndef HZ

#define HZ 100

#endif



#ifdef __uClinux__

#include "param_no.h"

#define EXEC_PAGESIZE	4096

#else

#include "param_mm.h"

#define EXEC_PAGESIZE	8192

#endif



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _M68K_PARAM_H */

arch/m68k/include/asm/param_mm.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#ifndef _M68K_PARAM_H

#define _M68K_PARAM_H



#ifdef __KERNEL__

# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */

# define USER_HZ	100		/* .. some user interfaces are in "ticks" */

# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */

#endif



#ifndef HZ

#define HZ 100

#endif



#define EXEC_PAGESIZE	8192



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _M68K_PARAM_H */

arch/m68k/include/asm/param_no.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_PARAM_H

#define _M68KNOMMU_PARAM_H



#ifdef __KERNEL__

#define HZ CONFIG_HZ

#define	USER_HZ		HZ

#define	CLOCKS_PER_SEC	(USER_HZ)

#endif



#ifndef HZ

#define HZ	100

#endif



#define EXEC_PAGESIZE	4096



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _M68KNOMMU_PARAM_H */

arch/m68k/include/asm/ptrace.h

+85 −3
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "ptrace_no.h"

#ifndef _M68K_PTRACE_H

#define _M68K_PTRACE_H



#define PT_D1	   0

#define PT_D2	   1

#define PT_D3	   2

#define PT_D4	   3

#define PT_D5	   4

#define PT_D6	   5

#define PT_D7	   6

#define PT_A0	   7

#define PT_A1	   8

#define PT_A2	   9

#define PT_A3	   10

#define PT_A4	   11

#define PT_A5	   12

#define PT_A6	   13

#define PT_D0	   14

#define PT_USP	   15

#define PT_ORIG_D0 16

#define PT_SR	   17

#define PT_PC	   18



#ifndef __ASSEMBLY__



/* this struct defines the way the registers are stored on the

   stack during a system call. */



struct pt_regs {

  long     d1;

  long     d2;

  long     d3;

  long     d4;

  long     d5;

  long     a0;

  long     a1;

  long     a2;

  long     d0;

  long     orig_d0;

  long     stkadj;

#ifdef CONFIG_COLDFIRE

  unsigned format :  4; /* frame format specifier */

  unsigned vector : 12; /* vector offset */

  unsigned short sr;

  unsigned long  pc;

#else

#include "ptrace_mm.h"

  unsigned short sr;

  unsigned long  pc;

  unsigned format :  4; /* frame format specifier */

  unsigned vector : 12; /* vector offset */

#endif

};



/*

 * This is the extended stack used by signal handlers and the context

 * switcher: it's pushed after the normal "struct pt_regs".

 */

struct switch_stack {

	unsigned long  d6;

	unsigned long  d7;

	unsigned long  a3;

	unsigned long  a4;

	unsigned long  a5;

	unsigned long  a6;

	unsigned long  retpc;

};



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS            12

#define PTRACE_SETREGS            13

#define PTRACE_GETFPREGS          14

#define PTRACE_SETFPREGS          15



#ifdef __KERNEL__



#ifndef PS_S

#define PS_S  (0x2000)

#define PS_M  (0x1000)

#endif



#define user_mode(regs) (!((regs)->sr & PS_S))

#define instruction_pointer(regs) ((regs)->pc)

#define profile_pc(regs) instruction_pointer(regs)

extern void show_regs(struct pt_regs *);

#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */

#endif /* _M68K_PTRACE_H */

arch/m68k/include/asm/ptrace_mm.h

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
#ifndef _M68K_PTRACE_H

#define _M68K_PTRACE_H



#define PT_D1	   0

#define PT_D2	   1

#define PT_D3	   2

#define PT_D4	   3

#define PT_D5	   4

#define PT_D6	   5

#define PT_D7	   6

#define PT_A0	   7

#define PT_A1	   8

#define PT_A2	   9

#define PT_A3	   10

#define PT_A4	   11

#define PT_A5	   12

#define PT_A6	   13

#define PT_D0	   14

#define PT_USP	   15

#define PT_ORIG_D0 16

#define PT_SR	   17

#define PT_PC	   18



#ifndef __ASSEMBLY__



/* this struct defines the way the registers are stored on the

   stack during a system call. */



struct pt_regs {

  long     d1;

  long     d2;

  long     d3;

  long     d4;

  long     d5;

  long     a0;

  long     a1;

  long     a2;

  long     d0;

  long     orig_d0;

  long     stkadj;

  unsigned short sr;

  unsigned long  pc;

  unsigned format :  4; /* frame format specifier */

  unsigned vector : 12; /* vector offset */

};



/*

 * This is the extended stack used by signal handlers and the context

 * switcher: it's pushed after the normal "struct pt_regs".

 */

struct switch_stack {

	unsigned long  d6;

	unsigned long  d7;

	unsigned long  a3;

	unsigned long  a4;

	unsigned long  a5;

	unsigned long  a6;

	unsigned long  retpc;

};



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS            12

#define PTRACE_SETREGS            13

#define PTRACE_GETFPREGS          14

#define PTRACE_SETFPREGS          15



#ifdef __KERNEL__



#ifndef PS_S

#define PS_S  (0x2000)

#define PS_M  (0x1000)

#endif



#define user_mode(regs) (!((regs)->sr & PS_S))

#define instruction_pointer(regs) ((regs)->pc)

#define profile_pc(regs) instruction_pointer(regs)

extern void show_regs(struct pt_regs *);

#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */

#endif /* _M68K_PTRACE_H */