Commit eabeef90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 0e8860d2 6e8d9690

arch/arm64/include/uapi/asm/bitsperlong.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2012 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_BITSPERLONG_H

#define __ASM_BITSPERLONG_H



#define __BITS_PER_LONG 64



#include <asm-generic/bitsperlong.h>



#endif	/* __ASM_BITSPERLONG_H */

arch/riscv/include/uapi/asm/bitsperlong.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

 * Copyright (C) 2012 ARM Ltd.

 * Copyright (C) 2015 Regents of the University of California

 */



#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H

#define _UAPI_ASM_RISCV_BITSPERLONG_H



#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8)



#include <asm-generic/bitsperlong.h>



#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */

tools/arch/arm64/include/uapi/asm/bitsperlong.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2012 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_BITSPERLONG_H

#define __ASM_BITSPERLONG_H



#define __BITS_PER_LONG 64



#include <asm-generic/bitsperlong.h>



#endif	/* __ASM_BITSPERLONG_H */

tools/arch/riscv/include/uapi/asm/bitsperlong.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2012 ARM Ltd.

 * Copyright (C) 2015 Regents of the University of California

 */



#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H

#define _UAPI_ASM_RISCV_BITSPERLONG_H



#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8)



#include <asm-generic/bitsperlong.h>



#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */