Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 18a2ed2

Browse files
author
Tudor Ambarus
committed
Merge e55037c ("Merge tag 'efi-next-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi") into android-mainline
Steps on the way to v6.11-rc1 Change-Id: Ib87bf158d4d0bea6ac06bfb2e390af934020b5ea Signed-off-by: Tudor Ambarus <tudordana@google.com>
2 parents a111ff6 + e55037c commit 18a2ed2

File tree

106 files changed

+1374
-1631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1374
-1631
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,27 +1435,6 @@
14351435
you are really sure that your UEFI does sane gc and
14361436
fulfills the spec otherwise your board may brick.
14371437

1438-
efi_fake_mem= nn[KMG]@ss[KMG]:aa[,nn[KMG]@ss[KMG]:aa,..] [EFI,X86,EARLY]
1439-
Add arbitrary attribute to specific memory range by
1440-
updating original EFI memory map.
1441-
Region of memory which aa attribute is added to is
1442-
from ss to ss+nn.
1443-
1444-
If efi_fake_mem=2G@4G:0x10000,2G@0x10a0000000:0x10000
1445-
is specified, EFI_MEMORY_MORE_RELIABLE(0x10000)
1446-
attribute is added to range 0x100000000-0x180000000 and
1447-
0x10a0000000-0x1120000000.
1448-
1449-
If efi_fake_mem=8G@9G:0x40000 is specified, the
1450-
EFI_MEMORY_SP(0x40000) attribute is added to
1451-
range 0x240000000-0x43fffffff.
1452-
1453-
Using this parameter you can do debugging of EFI memmap
1454-
related features. For example, you can do debugging of
1455-
Address Range Mirroring feature even if your box
1456-
doesn't support it, or mark specific memory as
1457-
"soft reserved".
1458-
14591438
efivar_ssdt= [EFI; X86] Name of an EFI variable that contains an SSDT
14601439
that is to be dynamically loaded by Linux. If there are
14611440
multiple variables with the same name but with different

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ remove-stale-files:
12821282
$(Q)$(srctree)/scripts/remove-stale-files
12831283

12841284
# Support for using generic headers in asm-generic
1285-
asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
1285+
asm-generic := -f $(srctree)/scripts/Makefile.asm-headers obj
12861286

12871287
PHONY += asm-generic uapi-asm-generic
12881288
asm-generic: uapi-asm-generic

‎arch/arc/include/asm/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
syscall-y += syscall_table_32.h
3+
24
generic-y += extable.h
35
generic-y += kvm_para.h
46
generic-y += mcs_spinlock.h

‎arch/arc/include/asm/unistd.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
#ifndef _ASM_ARC_UNISTD_H
3+
#define _ASM_ARC_UNISTD_H
4+
5+
#include <uapi/asm/unistd.h>
6+
7+
#define __ARCH_WANT_STAT64
8+
#define __ARCH_WANT_SYS_CLONE
9+
#define __ARCH_WANT_SYS_VFORK
10+
#define __ARCH_WANT_SYS_FORK
11+
12+
#define NR_syscalls __NR_syscalls
13+
14+
#endif

‎arch/arc/include/uapi/asm/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
syscall-y += unistd_32.h
3+
24
generic-y += ucontext.h

‎arch/arc/include/uapi/asm/unistd.h

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,4 @@
77
* published by the Free Software Foundation.
88
*/
99

10-
/******** no-legacy-syscalls-ABI *******/
11-
12-
/*
13-
* Non-typical guard macro to enable inclusion twice in ARCH sys.c
14-
* That is how the Generic syscall wrapper generator works
15-
*/
16-
#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL)
17-
#define _UAPI_ASM_ARC_UNISTD_H
18-
19-
#define __ARCH_WANT_RENAMEAT
20-
#define __ARCH_WANT_STAT64
21-
#define __ARCH_WANT_SET_GET_RLIMIT
22-
#define __ARCH_WANT_SYS_EXECVE
23-
#define __ARCH_WANT_SYS_CLONE
24-
#define __ARCH_WANT_SYS_CLONE3
25-
#define __ARCH_WANT_SYS_VFORK
26-
#define __ARCH_WANT_SYS_FORK
27-
#define __ARCH_WANT_TIME32_SYSCALLS
28-
29-
#define sys_mmap2 sys_mmap_pgoff
30-
31-
#include <asm-generic/unistd.h>
32-
33-
#define NR_syscalls __NR_syscalls
34-
35-
/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */
36-
#define __NR_sysfs (__NR_arch_specific_syscall + 3)
37-
38-
/* ARC specific syscall */
39-
#define __NR_cacheflush (__NR_arch_specific_syscall + 0)
40-
#define __NR_arc_settls (__NR_arch_specific_syscall + 1)
41-
#define __NR_arc_gettls (__NR_arch_specific_syscall + 2)
42-
#define __NR_arc_usr_cmpxchg (__NR_arch_specific_syscall + 4)
43-
44-
__SYSCALL(__NR_cacheflush, sys_cacheflush)
45-
__SYSCALL(__NR_arc_settls, sys_arc_settls)
46-
__SYSCALL(__NR_arc_gettls, sys_arc_gettls)
47-
__SYSCALL(__NR_arc_usr_cmpxchg, sys_arc_usr_cmpxchg)
48-
__SYSCALL(__NR_sysfs, sys_sysfs)
49-
50-
#undef __SYSCALL
51-
52-
#endif
10+
#include <asm/unistd_32.h>

‎arch/arc/kernel/Makefile.syscalls

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
syscall_abis_32 += arc time32 renameat stat64 rlimit

‎arch/arc/kernel/sys.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#define sys_clone sys_clone_wrapper
1010
#define sys_clone3 sys_clone3_wrapper
11+
#define sys_mmap2 sys_mmap_pgoff
1112

12-
#undef __SYSCALL
1313
#define __SYSCALL(nr, call) [nr] = (call),
14+
#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native)
1415

1516
void *sys_call_table[NR_syscalls] = {
1617
[0 ... NR_syscalls-1] = sys_ni_syscall,
17-
#include <asm/unistd.h>
18+
#include <asm/syscall_table_32.h>
1819
};

‎arch/arm/include/asm/unistd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#define __ARCH_WANT_SYS_FORK
3838
#define __ARCH_WANT_SYS_VFORK
3939
#define __ARCH_WANT_SYS_CLONE
40-
#define __ARCH_WANT_SYS_CLONE3
4140

4241
/*
4342
* Unimplemented (or alternatively implemented) syscalls

‎arch/arm64/include/asm/Kbuild

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
# SPDX-License-Identifier: GPL-2.0
2+
syscall-y += syscall_table_32.h
3+
syscall-y += syscall_table_64.h
4+
5+
# arm32 syscall table used by lib/compat_audit.c:
6+
syscall-y += unistd_32.h
7+
# same constants with prefixes, used by vdso, seccomp and sigreturn:
8+
syscall-y += unistd_compat_32.h
9+
210
generic-y += early_ioremap.h
311
generic-y += mcs_spinlock.h
412
generic-y += qrwlock.h

0 commit comments

Comments
 (0)