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

diff --combined arch/arm64/kernel/signal.c
index edb2d92,03810a7..b0980fb
--- 1/arch/arm64/kernel/signal.c
--- 2/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@@ -385,7 -385,7 +385,7 @@@ static int preserve_za_context(struct z
        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;
@@@ -1179,7 -1179,6 +1179,7 @@@ static_assert(offsetof(siginfo_t, si_up
  static_assert(offsetof(siginfo_t, si_pkey)    == 0x20);
  static_assert(offsetof(siginfo_t, si_perf_data)       == 0x18);
  static_assert(offsetof(siginfo_t, si_perf_type)       == 0x20);
 +static_assert(offsetof(siginfo_t, si_perf_flags) == 0x24);
  static_assert(offsetof(siginfo_t, si_band)    == 0x10);
  static_assert(offsetof(siginfo_t, si_fd)      == 0x18);
  static_assert(offsetof(siginfo_t, si_call_addr)       == 0x10);

diff --combined kernel/trace/fgraph.c
index 3fd5284,2cd3742..218cd95
--- 1/kernel/trace/fgraph.c
--- 2/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@@ -30,6 -30,7 +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 +48,7 @@@ int __weak ftrace_disable_ftrace_graph_
  {
        return 0;
  }
+ #endif
  
  /**
   * ftrace_graph_stop - set to permanently disable function graph tracing
@@@ -422,9 -424,9 +424,9 @@@ free
  
  static void
  ftrace_graph_probe_sched_switch(void *ignore, bool preempt,
 -                              unsigned int prev_state,
                                struct task_struct *prev,
 -                              struct task_struct *next)
 +                              struct task_struct *next,
 +                              unsigned int prev_state)
  {
        unsigned long long timestamp;
        int index;