mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
This series massages asm/param.h to simpler and more uniform shape.
By the end of it, * 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. -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQqUNBr3gm4hGXdBJlZ7Krx/gZQ6wUCaIRH4wAKCRBZ7Krx/gZQ 6x9+AQDJ8m23WnR8eyKbUbWvJLtUPaAn4HhGYPhsargl8QSBPQEArmW8H7uEnLVQ yK7fXjHL/Ju+Gh0wPr4EC5o+qKLywgc= =ydzP -----END PGP SIGNATURE----- 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:
commit
126e5754e9
8 changed files with 8 additions and 55 deletions
|
@ -1,12 +0,0 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef _ASM_ALPHA_PARAM_H
|
|
||||||
#define _ASM_ALPHA_PARAM_H
|
|
||||||
|
|
||||||
#include <uapi/asm/param.h>
|
|
||||||
|
|
||||||
# undef HZ
|
|
||||||
# define HZ CONFIG_HZ
|
|
||||||
# define USER_HZ 1024
|
|
||||||
# define CLOCKS_PER_SEC USER_HZ /* frequency at which times() counts */
|
|
||||||
|
|
||||||
#endif /* _ASM_ALPHA_PARAM_H */
|
|
|
@ -2,14 +2,9 @@
|
||||||
#ifndef _UAPI_ASM_ALPHA_PARAM_H
|
#ifndef _UAPI_ASM_ALPHA_PARAM_H
|
||||||
#define _UAPI_ASM_ALPHA_PARAM_H
|
#define _UAPI_ASM_ALPHA_PARAM_H
|
||||||
|
|
||||||
#define HZ 1024
|
#define __USER_HZ 1024
|
||||||
|
|
||||||
#define EXEC_PAGESIZE 8192
|
#define EXEC_PAGESIZE 8192
|
||||||
|
|
||||||
#ifndef NOGROUP
|
#include <asm-generic/param.h>
|
||||||
#define NOGROUP (-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAXHOSTNAMELEN 64 /* max length of hostname */
|
|
||||||
|
|
||||||
#endif /* _UAPI_ASM_ALPHA_PARAM_H */
|
#endif /* _UAPI_ASM_ALPHA_PARAM_H */
|
||||||
|
|
|
@ -10,5 +10,4 @@ generic-y += user.h
|
||||||
generic-y += ioctl.h
|
generic-y += ioctl.h
|
||||||
generic-y += mmzone.h
|
generic-y += mmzone.h
|
||||||
generic-y += statfs.h
|
generic-y += statfs.h
|
||||||
generic-y += param.h
|
|
||||||
generic-y += text-patching.h
|
generic-y += text-patching.h
|
||||||
|
|
|
@ -15,7 +15,6 @@ generic-y += mcs_spinlock.h
|
||||||
generic-y += mmiowb.h
|
generic-y += mmiowb.h
|
||||||
generic-y += module.h
|
generic-y += module.h
|
||||||
generic-y += module.lds.h
|
generic-y += module.lds.h
|
||||||
generic-y += param.h
|
|
||||||
generic-y += parport.h
|
generic-y += parport.h
|
||||||
generic-y += percpu.h
|
generic-y += percpu.h
|
||||||
generic-y += preempt.h
|
generic-y += preempt.h
|
||||||
|
|
|
@ -3,7 +3,6 @@ generated-y += syscall_table.h
|
||||||
generic-y += extable.h
|
generic-y += extable.h
|
||||||
generic-y += kvm_para.h
|
generic-y += kvm_para.h
|
||||||
generic-y += mcs_spinlock.h
|
generic-y += mcs_spinlock.h
|
||||||
generic-y += param.h
|
|
||||||
generic-y += parport.h
|
generic-y += parport.h
|
||||||
generic-y += qrwlock.h
|
generic-y += qrwlock.h
|
||||||
generic-y += qspinlock.h
|
generic-y += qspinlock.h
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
||||||
/*
|
|
||||||
* include/asm-xtensa/param.h
|
|
||||||
*
|
|
||||||
* This file is subject to the terms and conditions of the GNU General Public
|
|
||||||
* License. See the file "COPYING" in the main directory of this archive
|
|
||||||
* for more details.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2001 - 2005 Tensilica Inc.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _UAPI_XTENSA_PARAM_H
|
|
||||||
#define _UAPI_XTENSA_PARAM_H
|
|
||||||
|
|
||||||
#ifndef __KERNEL__
|
|
||||||
# define HZ 100
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define EXEC_PAGESIZE 4096
|
|
||||||
|
|
||||||
#ifndef NGROUPS
|
|
||||||
#define NGROUPS 32
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef NOGROUP
|
|
||||||
#define NOGROUP (-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAXHOSTNAMELEN 64 /* max length of hostname */
|
|
||||||
|
|
||||||
#endif /* _UAPI_XTENSA_PARAM_H */
|
|
|
@ -6,6 +6,6 @@
|
||||||
|
|
||||||
# undef HZ
|
# undef HZ
|
||||||
# define HZ CONFIG_HZ /* Internal kernel timer frequency */
|
# define HZ CONFIG_HZ /* Internal kernel timer frequency */
|
||||||
# define USER_HZ 100 /* some user interfaces are */
|
# define USER_HZ __USER_HZ /* some user interfaces are */
|
||||||
# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */
|
# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */
|
||||||
#endif /* __ASM_GENERIC_PARAM_H */
|
#endif /* __ASM_GENERIC_PARAM_H */
|
||||||
|
|
|
@ -2,8 +2,12 @@
|
||||||
#ifndef _UAPI__ASM_GENERIC_PARAM_H
|
#ifndef _UAPI__ASM_GENERIC_PARAM_H
|
||||||
#define _UAPI__ASM_GENERIC_PARAM_H
|
#define _UAPI__ASM_GENERIC_PARAM_H
|
||||||
|
|
||||||
|
#ifndef __USER_HZ
|
||||||
|
#define __USER_HZ 100
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef HZ
|
#ifndef HZ
|
||||||
#define HZ 100
|
#define HZ __USER_HZ
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef EXEC_PAGESIZE
|
#ifndef EXEC_PAGESIZE
|
||||||
|
|
Loading…
Add table
Reference in a new issue