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

Commit f9847004 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the non-MMU and MMU versions of param.h 



It is trivial to merge the non-MMU and MMU versions of param.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of param.h are not installed).

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 5bee17f1

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 */