Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fa818dc4884afb21ba48de773807413bcc0092b8

Authored by Linus Torvalds
2 parents a2a32cd1d7 0145058c3d
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 - Wire up compat_sys_execveat for compat (AArch32) tasks
 - Revert 421520ba9829, as this breaks our side of the boot protocol

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: partially revert "ARM: 8167/1: extend the reserved memory for initrd to be page aligned"
  arm64: compat: wire up compat_sys_execveat

Showing 3 changed files Side-by-side Diff

arch/arm64/include/asm/unistd.h
Diff comments   View file @ fa818dc
... ... @@ -44,7 +44,7 @@
44 44 #define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2)
45 45 #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5)
46 46  
47   -#define __NR_compat_syscalls 387
  47 +#define __NR_compat_syscalls 388
48 48 #endif
49 49  
50 50 #define __ARCH_WANT_SYS_CLONE
arch/arm64/include/asm/unistd32.h
Diff comments   View file @ fa818dc
... ... @@ -795,4 +795,6 @@
795 795 __SYSCALL(__NR_memfd_create, sys_memfd_create)
796 796 #define __NR_bpf 386
797 797 __SYSCALL(__NR_bpf, sys_bpf)
  798 +#define __NR_execveat 387
  799 +__SYSCALL(__NR_execveat, compat_sys_execveat)
arch/arm64/mm/init.c
Diff comments   View file @ fa818dc
... ... @@ -335,14 +335,8 @@
335 335  
336 336 void free_initrd_mem(unsigned long start, unsigned long end)
337 337 {
338   - if (!keep_initrd) {
339   - if (start == initrd_start)
340   - start = round_down(start, PAGE_SIZE);
341   - if (end == initrd_end)
342   - end = round_up(end, PAGE_SIZE);
343   -
  338 + if (!keep_initrd)
344 339 free_reserved_area((void *)start, (void *)end, 0, "initrd");
345   - }
346 340 }
347 341  
348 342 static int __init keepinitrd_setup(char *__unused)