tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'asm-generic-fix-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic regression fix from Arnd Bergmann:
"Just one partial revert for a commit from the merge window that caused
annoying behavior when building old kernels on arm64 hosts"
* tag 'asm-generic-fix-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch"
+76
+24
arch/arm64/include/uapi/asm/bitsperlong.h
+24
arch/arm64/include/uapi/asm/bitsperlong.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2
+
/*
3
+
* Copyright (C) 2012 ARM Ltd.
4
+
*
5
+
* This program is free software; you can redistribute it and/or modify
6
+
* it under the terms of the GNU General Public License version 2 as
7
+
* published by the Free Software Foundation.
8
+
*
9
+
* This program is distributed in the hope that it will be useful,
10
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+
* GNU General Public License for more details.
13
+
*
14
+
* You should have received a copy of the GNU General Public License
15
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
16
+
*/
17
+
#ifndef __ASM_BITSPERLONG_H
18
+
#define __ASM_BITSPERLONG_H
19
+
20
+
#define __BITS_PER_LONG 64
21
+
22
+
#include <asm-generic/bitsperlong.h>
23
+
24
+
#endif /* __ASM_BITSPERLONG_H */
+14
arch/riscv/include/uapi/asm/bitsperlong.h
+14
arch/riscv/include/uapi/asm/bitsperlong.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2
+
/*
3
+
* Copyright (C) 2012 ARM Ltd.
4
+
* Copyright (C) 2015 Regents of the University of California
5
+
*/
6
+
7
+
#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H
8
+
#define _UAPI_ASM_RISCV_BITSPERLONG_H
9
+
10
+
#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8)
11
+
12
+
#include <asm-generic/bitsperlong.h>
13
+
14
+
#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */
+24
tools/arch/arm64/include/uapi/asm/bitsperlong.h
+24
tools/arch/arm64/include/uapi/asm/bitsperlong.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2
+
/*
3
+
* Copyright (C) 2012 ARM Ltd.
4
+
*
5
+
* This program is free software; you can redistribute it and/or modify
6
+
* it under the terms of the GNU General Public License version 2 as
7
+
* published by the Free Software Foundation.
8
+
*
9
+
* This program is distributed in the hope that it will be useful,
10
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+
* GNU General Public License for more details.
13
+
*
14
+
* You should have received a copy of the GNU General Public License
15
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
16
+
*/
17
+
#ifndef __ASM_BITSPERLONG_H
18
+
#define __ASM_BITSPERLONG_H
19
+
20
+
#define __BITS_PER_LONG 64
21
+
22
+
#include <asm-generic/bitsperlong.h>
23
+
24
+
#endif /* __ASM_BITSPERLONG_H */
+14
tools/arch/riscv/include/uapi/asm/bitsperlong.h
+14
tools/arch/riscv/include/uapi/asm/bitsperlong.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0-only */
2
+
/*
3
+
* Copyright (C) 2012 ARM Ltd.
4
+
* Copyright (C) 2015 Regents of the University of California
5
+
*/
6
+
7
+
#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H
8
+
#define _UAPI_ASM_RISCV_BITSPERLONG_H
9
+
10
+
#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8)
11
+
12
+
#include <asm-generic/bitsperlong.h>
13
+
14
+
#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */