diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-22 11:38:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-22 11:38:57 -0700 |
commit | 39678e5e38055753ae08007ec8bcae31b122a0d0 (patch) | |
tree | 56d78e9e72e09e5a183bbc2f0c727010533c4971 /arch/m68k/include/asm/param.h | |
parent | f762dd68218665bb87d4e4a0eeac86fde7530293 (diff) | |
parent | 7a2cf4af1554d891b440cc3a649d01ed222206c3 (diff) | |
download | kernel_goldelico_gta04-39678e5e38055753ae08007ec8bcae31b122a0d0.zip kernel_goldelico_gta04-39678e5e38055753ae08007ec8bcae31b122a0d0.tar.gz kernel_goldelico_gta04-39678e5e38055753ae08007ec8bcae31b122a0d0.tar.bz2 |
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
Diffstat (limited to 'arch/m68k/include/asm/param.h')
-rw-r--r-- | arch/m68k/include/asm/param.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/param.h b/arch/m68k/include/asm/param.h index 40d1112..85c41b7 100644 --- a/arch/m68k/include/asm/param.h +++ b/arch/m68k/include/asm/param.h @@ -1,5 +1,26 @@ +#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 */ |