Commit 5828efb9 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
parent ec7e1605

arch/ia64/include/asm/sal.h

+1 −0
Original line number Diff line number Diff line
@@ -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. */

arch/ia64/include/asm/sn/sn_sal.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/ia64/kernel/efi.c

+3 −0
Original line number Diff line number Diff line
@@ -47,8 +47,11 @@ 


static __initdata unsigned long palo_phys;



unsigned long sal_systab_phys = EFI_INVALID_TABLE_ADDR;



static __initdata efi_config_table_type_t arch_tables[] = {

	{PROCESSOR_ABSTRACTION_LAYER_OVERWRITE_GUID, "PALO", &palo_phys},

	{SAL_SYSTEM_TABLE_GUID, "SALsystab", &sal_systab_phys},

	{NULL_GUID, NULL, 0},

};

arch/ia64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ setup_arch (char **cmdline_p) 
	find_memory();



	/* process SAL system table: */

	ia64_sal_init(__va(efi.sal_systab));

	ia64_sal_init(__va(sal_systab_phys));



#ifdef CONFIG_ITANIUM

	ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist);

arch/x86/platform/efi/efi.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static const unsigned long * const efi_tables[] = { 
	&efi.acpi20,

	&efi.smbios,

	&efi.smbios3,

	&efi.sal_systab,

	&efi.boot_info,

	&efi.hcdp,

	&efi.uga,