diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-28 19:03:37 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-28 19:03:37 +0300 |
| commit | 126e5754e942b1a007246561fc61b745747cedcd (patch) | |
| tree | dab2784a15460e821674a700d710d43769c1eff7 /include/uapi | |
| parent | ce3f5bb7504ca802efa710280a4601a06545bd2e (diff) | |
| parent | 2560014ec150fd41b969ea6bcf8a985ae910eea5 (diff) | |
| download | linux-126e5754e942b1a007246561fc61b745747cedcd.tar.xz | |
Merge tag 'pull-headers_param' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull asm/param cleanup from Al Viro:
"This massages asm/param.h to simpler and more uniform shape:
- all arch/*/include/uapi/asm/param.h are either generated includes
of <asm-generic/param.h> or a #define or two followed by such
include
- no arch/*/include/asm/param.h anywhere, generated or not
- include <asm/param.h> resolves to arch/*/include/uapi/asm/param.h
of the architecture in question (or that of host in case of uml)
- include/asm-generic/param.h pulls uapi/asm-generic/param.h and
deals with USER_HZ, CLOCKS_PER_SEC and with HZ redefinition after
that"
* tag 'pull-headers_param' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
loongarch, um, xtensa: get rid of generated arch/$ARCH/include/asm/param.h
alpha: regularize the situation with asm/param.h
xtensa: get rid uapi/asm/param.h
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/asm-generic/param.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/uapi/asm-generic/param.h b/include/uapi/asm-generic/param.h index baad02ea7f93..3ed505dfea13 100644 --- a/include/uapi/asm-generic/param.h +++ b/include/uapi/asm-generic/param.h @@ -2,8 +2,12 @@ #ifndef _UAPI__ASM_GENERIC_PARAM_H #define _UAPI__ASM_GENERIC_PARAM_H +#ifndef __USER_HZ +#define __USER_HZ 100 +#endif + #ifndef HZ -#define HZ 100 +#define HZ __USER_HZ #endif #ifndef EXEC_PAGESIZE |