History

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

Linus Torvalds committed 1 year ago

Commit 126e5752 parents ce3f5bb 25600148 files · +8 −55Browse files

Showing the changes to include/uapi (1 of 8 files). Show all

Unified · Split

include/uapi/asm-generic/param.h+5−1
@@ -2,8 +2,12 @@ · 1 unmodified line
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