Skip to content

Commit f65bbf0

Browse files
author
Al Viro
committed
alpha: regularize the situation with asm/param.h
The only reason why alpha can't do what sparc et.al. are doing is that include/asm-generic/param.h relies upon the value of HZ set for userland header in uapi/asm/param.h being 100. We need that value to define USER_HZ and we need that definition to outlive the redefinition of HZ kernel-side. And alpha needs it to be 1024, not 100 like everybody else. So let's add __USER_HZ to uapi/asm-generic/param.h, defaulting to 100 and used to define HZ. That way include/asm-generic/param.h can use that thing instead of open-coding it - it won't be affected by undefining and redefining HZ. That done, alpha asm/param.h can be removed and uapi/asm/param.h switched to defining __USER_HZ and EXEC_PAGESIZE and then including <asm-generic/param.h> - asm/param.h will resolve to uapi/asm/param.h, which pulls <asm-generic/param.h>, which will do the right thing both in the kernel and userland contexts. Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 674e55e commit f65bbf0

4 files changed

Lines changed: 8 additions & 21 deletions

File tree

arch/alpha/include/asm/param.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

arch/alpha/include/uapi/asm/param.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
#ifndef _UAPI_ASM_ALPHA_PARAM_H
33
#define _UAPI_ASM_ALPHA_PARAM_H
44

5-
#define HZ 1024
6-
5+
#define __USER_HZ 1024
76
#define EXEC_PAGESIZE 8192
87

9-
#ifndef NOGROUP
10-
#define NOGROUP (-1)
11-
#endif
12-
13-
#define MAXHOSTNAMELEN 64 /* max length of hostname */
8+
#include <asm-generic/param.h>
149

1510
#endif /* _UAPI_ASM_ALPHA_PARAM_H */

include/asm-generic/param.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
# undef HZ
88
# define HZ CONFIG_HZ /* Internal kernel timer frequency */
9-
# define USER_HZ 100 /* some user interfaces are */
9+
# define USER_HZ __USER_HZ /* some user interfaces are */
1010
# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */
1111
#endif /* __ASM_GENERIC_PARAM_H */

include/uapi/asm-generic/param.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
#ifndef _UAPI__ASM_GENERIC_PARAM_H
33
#define _UAPI__ASM_GENERIC_PARAM_H
44

5+
#ifndef __USER_HZ
6+
#define __USER_HZ 100
7+
#endif
8+
59
#ifndef HZ
6-
#define HZ 100
10+
#define HZ __USER_HZ
711
#endif
812

913
#ifndef EXEC_PAGESIZE

0 commit comments

Comments
 (0)