diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-04 11:48:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-04 11:48:08 +0100 |
| commit | 99e18df3a41a044c6ac83e5e8310c228221881c9 (patch) | |
| tree | 03aee44088bc0761e2bf2bb3985d64903ed3a4c5 /arch/s390/kernel/machine_kexec_reloc.c | |
| parent | a1bb46c36ce389d4a24a42e5b6047b0626caa3ea (diff) | |
| parent | db0d32d84031188443e25edbd50a71a6e7ac5d1d (diff) | |
| download | talos-op-linux-99e18df3a41a044c6ac83e5e8310c228221881c9.tar.gz talos-op-linux-99e18df3a41a044c6ac83e5e8310c228221881c9.zip | |
Merge back earlier cpufreq material for v5.5.
Diffstat (limited to 'arch/s390/kernel/machine_kexec_reloc.c')
| -rw-r--r-- | arch/s390/kernel/machine_kexec_reloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/machine_kexec_reloc.c b/arch/s390/kernel/machine_kexec_reloc.c index 3b664cb3ec4d..d5035de9020e 100644 --- a/arch/s390/kernel/machine_kexec_reloc.c +++ b/arch/s390/kernel/machine_kexec_reloc.c @@ -27,6 +27,7 @@ int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val, *(u32 *)loc = val; break; case R_390_64: /* Direct 64 bit. */ + case R_390_GLOB_DAT: *(u64 *)loc = val; break; case R_390_PC16: /* PC relative 16 bit. */ |
