diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-07-01 17:46:34 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-07-01 17:46:34 +0200 |
| commit | e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c (patch) | |
| tree | 4b1109adc051c943ef3edd990f5a907a0836bdf8 /arch/riscv/include/asm/kexec.h | |
| parent | drm/i915/display: Fix state mismatch in drm infoframe (diff) | |
| parent | Merge tag 'drm-intel-next-fixes-2021-06-29' of git://anongit.freedesktop.org/... (diff) | |
| download | linux-e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c.tar.xz linux-e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c.zip | |
Merge drm/drm-next into drm-intel-next
Bring drm-intel-next closer to drm-next and drm-intel-gt-next for a more
feasible baseline for topic branches.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'arch/riscv/include/asm/kexec.h')
| -rw-r--r-- | arch/riscv/include/asm/kexec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h index 1e954101906a..e4e291d40759 100644 --- a/arch/riscv/include/asm/kexec.h +++ b/arch/riscv/include/asm/kexec.h @@ -42,8 +42,8 @@ struct kimage_arch { unsigned long fdt_addr; }; -const extern unsigned char riscv_kexec_relocate[]; -const extern unsigned int riscv_kexec_relocate_size; +extern const unsigned char riscv_kexec_relocate[]; +extern const unsigned int riscv_kexec_relocate_size; typedef void (*riscv_kexec_method)(unsigned long first_ind_entry, unsigned long jump_addr, |