diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-08-12 18:58:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-08-12 18:58:34 +0200 |
| commit | d3dc0168e93233ba4d4ed9a2c506c9d2b8d8cd33 (patch) | |
| tree | 55126ad4a12dfd80cf9b3f4061af9e0867eb9b21 /arch/ia64/include/asm/sn | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| parent | b194a77fcc4001dc40aecdd15d249648e8a436d1 (diff) | |
| download | linux-d3dc0168e93233ba4d4ed9a2c506c9d2b8d8cd33.tar.bz2 | |
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core
Pull EFI changes for v5.4 from Ard:
- Some refactoring of the EFI config table handling across architectures.
- Add support for the Dell EMC OEM config table.
- Include AER diagnostic output to CPER handling of fatal PCIe errors.
Diffstat (limited to 'arch/ia64/include/asm/sn')
| -rw-r--r-- | arch/ia64/include/asm/sn/sn_sal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sn/sn_sal.h b/arch/ia64/include/asm/sn/sn_sal.h index 1f5ff470a5a1..5142c444652d 100644 --- a/arch/ia64/include/asm/sn/sn_sal.h +++ b/arch/ia64/include/asm/sn/sn_sal.h @@ -167,7 +167,7 @@ static inline u32 sn_sal_rev(void) { - struct ia64_sal_systab *systab = __va(efi.sal_systab); + struct ia64_sal_systab *systab = __va(sal_systab_phys); return (u32)(systab->sal_b_rev_major << 8 | systab->sal_b_rev_minor); } |