From c1ddac9b3ad8d89e3228b0f2830c017d5b16b8b0 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 7 Jan 2013 22:09:49 +0000 Subject: [PATCH] --- yaml --- r: 349420 b: refs/heads/master c: b607e2126705ca28ecf21aa051172882bbdaae8a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/compressed/eboot.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 167bf8aa2df9..0d2c5c8354b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f791620fa7517e1045742c475a7f005db9a634b8 +refs/heads/master: b607e2126705ca28ecf21aa051172882bbdaae8a diff --git a/trunk/arch/x86/boot/compressed/eboot.c b/trunk/arch/x86/boot/compressed/eboot.c index 448a86e154a9..b7f220877294 100644 --- a/trunk/arch/x86/boot/compressed/eboot.c +++ b/trunk/arch/x86/boot/compressed/eboot.c @@ -295,10 +295,15 @@ static efi_status_t setup_efi_pci(struct boot_params *params) if (!pci) continue; +#ifdef CONFIG_X86_64 status = efi_call_phys4(pci->attributes, pci, EfiPciIoAttributeOperationGet, 0, &attributes); - +#else + status = efi_call_phys5(pci->attributes, pci, + EfiPciIoAttributeOperationGet, 0, 0, + &attributes); +#endif if (status != EFI_SUCCESS) continue;