Commit 21873bd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
     f5bda35f ("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
parents f66e797b 78c09c0f

arch/arm64/kernel/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ int swsusp_arch_resume(void) 
		return rc;



	/*

	 * We need a zero page that is zero before & after resume in order to

	 * We need a zero page that is zero before & after resume in order

	 * to break before make on the ttbr1 page tables.

	 */

	zero_page = (void *)get_safe_page(GFP_ATOMIC);

arch/arm64/kernel/setup.c

+4 −3
Original line number Diff line number Diff line
@@ -303,13 +303,14 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) 
	early_fixmap_init();

	early_ioremap_init();



	setup_machine_fdt(__fdt_pointer);



	/*

	 * Initialise the static keys early as they may be enabled by the

	 * cpufeature code and early parameters.

	 * cpufeature code, early parameters, and DT setup.

	 */

	jump_label_init();



	setup_machine_fdt(__fdt_pointer);



	parse_early_param();



	/*

arch/arm64/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static int preserve_za_context(struct za_context __user *ctx) 
	return err ? -EFAULT : 0;

}



static int restore_za_context(struct user_ctxs __user *user)

static int restore_za_context(struct user_ctxs *user)

{

	int err;

	unsigned int vq;

kernel/trace/fgraph.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ int ftrace_graph_active; 
/* Both enabled by default (can be cleared by function_graph tracer flags */

static bool fgraph_sleep_time = true;



#ifdef CONFIG_DYNAMIC_FTRACE

/*

 * archs can override this function if they must do something

 * to enable hook for graph tracer.
@@ -47,6 +48,7 @@ int __weak ftrace_disable_ftrace_graph_caller(void) 
{

	return 0;

}

#endif



/**

 * ftrace_graph_stop - set to permanently disable function graph tracing

tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_sve_change_vl.c

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * supported and is expected to segfault.

 */



#include <kselftest.h>

#include <signal.h>

#include <ucontext.h>

#include <sys/prctl.h>
@@ -40,6 +41,7 @@ static bool sve_get_vls(struct tdescr *td) 
	/* We need at least two VLs */

	if (nvls < 2) {

		fprintf(stderr, "Only %d VL supported\n", nvls);

		td->result = KSFT_SKIP;

		return false;

	}