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

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

Pull arm64 fixes from Catalin Marinas:
"Most of issues addressed were introduced during this merging window.

- Initialise jump labels before setup_machine_fdt(), needed by commit
f5bda35fba61 ("random: use static branch for crng_ready()").

- Sparse warnings: missing prototype, incorrect __user annotation.

- Skip SVE kselftest if not sufficient vector lengths supported"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
kselftest/arm64: signal: Skip SVE signal test if not enough VLs supported
arm64: Initialize jump labels before setup_machine_fdt()
arm64: hibernate: Fix syntax errors in comments
arm64: Remove the __user annotation for the restore_za_context() argument
ftrace/fgraph: fix increased missing-prototypes warnings

+10 -5
+1 -1
arch/arm64/kernel/hibernate.c
··· 427 427 return rc; 428 428 429 429 /* 430 - * We need a zero page that is zero before & after resume in order to 430 + * We need a zero page that is zero before & after resume in order 431 431 * to break before make on the ttbr1 page tables. 432 432 */ 433 433 zero_page = (void *)get_safe_page(GFP_ATOMIC);
+4 -3
arch/arm64/kernel/setup.c
··· 303 303 early_fixmap_init(); 304 304 early_ioremap_init(); 305 305 306 - setup_machine_fdt(__fdt_pointer); 307 - 308 306 /* 309 307 * Initialise the static keys early as they may be enabled by the 310 - * cpufeature code and early parameters. 308 + * cpufeature code, early parameters, and DT setup. 311 309 */ 312 310 jump_label_init(); 311 + 312 + setup_machine_fdt(__fdt_pointer); 313 + 313 314 parse_early_param(); 314 315 315 316 /*
+1 -1
arch/arm64/kernel/signal.c
··· 385 385 return err ? -EFAULT : 0; 386 386 } 387 387 388 - static int restore_za_context(struct user_ctxs __user *user) 388 + static int restore_za_context(struct user_ctxs *user) 389 389 { 390 390 int err; 391 391 unsigned int vq;
+2
kernel/trace/fgraph.c
··· 30 30 /* Both enabled by default (can be cleared by function_graph tracer flags */ 31 31 static bool fgraph_sleep_time = true; 32 32 33 + #ifdef CONFIG_DYNAMIC_FTRACE 33 34 /* 34 35 * archs can override this function if they must do something 35 36 * to enable hook for graph tracer. ··· 48 47 { 49 48 return 0; 50 49 } 50 + #endif 51 51 52 52 /** 53 53 * ftrace_graph_stop - set to permanently disable function graph tracing
+2
tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_sve_change_vl.c
··· 6 6 * supported and is expected to segfault. 7 7 */ 8 8 9 + #include <kselftest.h> 9 10 #include <signal.h> 10 11 #include <ucontext.h> 11 12 #include <sys/prctl.h> ··· 41 40 /* We need at least two VLs */ 42 41 if (nvls < 2) { 43 42 fprintf(stderr, "Only %d VL supported\n", nvls); 43 + td->result = KSFT_SKIP; 44 44 return false; 45 45 } 46 46