summaryrefslogtreecommitdiff
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2019-06-25 16:28:53 +0200
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2019-08-08 11:01:48 +0300
commit5828efb95bc43ad6a59f05458d3aed9649dd5a63 (patch)
treec828e619819932d3e40e95b8eef736174124d3c1 /arch/ia64/include
parentec7e1605d79d1d469b25e396f2056e42386f512f (diff)
efi: ia64: move SAL systab handling out of generic EFI code
The SAL systab is an Itanium specific EFI configuration table, so move its handling into arch/ia64 where it belongs. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/sal.h1
-rw-r--r--arch/ia64/include/asm/sn/sn_sal.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h
index 588f33156da6..08f5b6aaed73 100644
--- a/arch/ia64/include/asm/sal.h
+++ b/arch/ia64/include/asm/sal.h
@@ -43,6 +43,7 @@
#include <asm/pal.h>
#include <asm/fpu.h>
+extern unsigned long sal_systab_phys;
extern spinlock_t sal_lock;
/* SAL spec _requires_ eight args for each call. */
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);
}