diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-06-09 14:41:26 +0200 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-06-19 12:14:33 +0200 |
| commit | 98a716b66cab993e15001c7ec06f637ca6f1079b (patch) | |
| tree | b5ca6b132d1aaa6c443f89f7e2e5731571ae731d /arch/x86/platform/efi | |
| parent | x86/efi: Move all workarounds to a separate file quirks.c (diff) | |
| download | linux-98a716b66cab993e15001c7ec06f637ca6f1079b.tar.xz linux-98a716b66cab993e15001c7ec06f637ca6f1079b.zip | |
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@redhat.com>
Cc: Saurabh Tangri <saurabh.tangri@intel.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/platform/efi')
| -rw-r--r-- | arch/x86/platform/efi/quirks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 7e3099c610dd..b4cb9182f155 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; } |