Commit-ID: 98a716b66cab993e15001c7ec06f637ca6f1079b
Gitweb: http://git.kernel.org/tip/98a716b66cab993e15001c7ec06f637ca6f1079b
Author: Matt Fleming <matt.fleming@xxxxxxxxx>
AuthorDate: Mon, 9 Jun 2014 13:41:26 +0100
Committer: Matt Fleming <matt.fleming@xxxxxxxxx>
CommitDate: Thu, 19 Jun 2014 11:14:33 +0100
x86/efi: Use early_memunmap() to squelch sparse errors
The kbuild reports the following sparse errors,
>> arch/x86/platform/efi/quirks.c:242:23: sparse: incorrect type in >> argument 1 (different address spaces)
arch/x86/platform/efi/quirks.c:242:23: expected void [noderef] <asn:2>*addr
arch/x86/platform/efi/quirks.c:242:23: got void *[assigned] tablep
>> arch/x86/platform/efi/quirks.c:245:23: sparse: incorrect type in >> argument 1 (different address spaces)
arch/x86/platform/efi/quirks.c:245:23: expected void [noderef] <asn:2>*addr
arch/x86/platform/efi/quirks.c:245:23: got struct efi_setup_data *[assigned] data
Dave Young had made previous attempts to convert the early_iounmap()
calls to early_memunmap() but ran into merge conflicts with commit
9e5c33d7aeee ("mm: create generic early_ioremap() support").
Now that we've got that commit in place we can switch to using
early_memunmap() since we're already using early_memremap() in
efi_reuse_config().
Cc: Dave Young <dyoung@xxxxxxxxxx>
Cc: Saurabh Tangri <saurabh.tangri@xxxxxxxxx>
Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>
---
arch/x86/platform/efi/quirks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 7e3099c..b4cb918 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -239,10 +239,10 @@ int __init efi_reuse_config(u64 tables, int nr_tables)
((efi_config_table_64_t *)p)->table = data->smbios;
p += sz;
}
- early_iounmap(tablep, nr_tables * sz);
+ early_memunmap(tablep, nr_tables * sz);
out_memremap:
- early_iounmap(data, sizeof(*data));
+ early_memunmap(data, sizeof(*data));
out:
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|