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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user