tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull arm64 fixes from Catalin Marinas:

- Fix the arm64 __get_mem_asm() to use the _ASM_EXTABLE_##type##ACCESS()
macro instead of the *_ERR() one in order to avoid writing -EFAULT to
the value register in case of a fault

- Initialise all elements of the acpi_early_node_map[] to NUMA_NO_NODE.
Prior to this fix, only the first element was initialised

- Move the KASAN random tag seed initialisation after the per-CPU areas
have been initialised (prng_state is __percpu)

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: Fix KASAN random tag seed initialization
arm64: ACPI: NUMA: initialize all values of acpi_early_node_map to NUMA_NO_NODE
arm64: uaccess: correct thinko in __get_mem_asm()

Linus Torvalds c2cdb13a 216595b7

+4 -5
+1 -1
arch/arm64/include/asm/uaccess.h
··· 188 188 #define __get_mem_asm(load, reg, x, addr, label, type) \ 189 189 asm_goto_output( \ 190 190 "1: " load " " reg "0, [%1]\n" \ 191 - _ASM_EXTABLE_##type##ACCESS_ERR(1b, %l2, %w0) \ 191 + _ASM_EXTABLE_##type##ACCESS(1b, %l2) \ 192 192 : "=r" (x) \ 193 193 : "r" (addr) : : label) 194 194 #else
+1 -1
arch/arm64/kernel/acpi_numa.c
··· 27 27 28 28 #include <asm/numa.h> 29 29 30 - static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE }; 30 + static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE }; 31 31 32 32 int __init acpi_numa_get_nid(unsigned int cpu) 33 33 {
-3
arch/arm64/kernel/setup.c
··· 355 355 smp_init_cpus(); 356 356 smp_build_mpidr_hash(); 357 357 358 - /* Init percpu seeds for random tags after cpus are set up. */ 359 - kasan_init_sw_tags(); 360 - 361 358 #ifdef CONFIG_ARM64_SW_TTBR0_PAN 362 359 /* 363 360 * Make sure init_thread_info.ttbr0 always generates translation
+2
arch/arm64/kernel/smp.c
··· 467 467 init_gic_priority_masking(); 468 468 469 469 kasan_init_hw_tags(); 470 + /* Init percpu seeds for random tags after cpus are set up. */ 471 + kasan_init_sw_tags(); 470 472 } 471 473 472 474 /*