Skip to content

Commit

Permalink
m68k: merge the non-MMU and MMU versions of param.h
Browse files Browse the repository at this point in the history
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: Greg Ungerer <gerg@uclinux.org>
  • Loading branch information
Greg Ungerer committed Mar 16, 2009
1 parent 5bee17f commit f984700
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 46 deletions.
25 changes: 23 additions & 2 deletions arch/m68k/include/asm/param.h
Original file line number Diff line number Diff line change
@@ -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 */
22 changes: 0 additions & 22 deletions arch/m68k/include/asm/param_mm.h

This file was deleted.

22 changes: 0 additions & 22 deletions arch/m68k/include/asm/param_no.h

This file was deleted.

0 comments on commit f984700

Please sign in to comment.