diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2020-05-20 16:49:03 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-05-20 16:49:03 +0100 |
| commit | 92cd235ced0a4f144d6cbc024c594e71642424da (patch) | |
| tree | 2af5ce516686126c953371ecbd1737282ac09f73 | |
| parent | 7115c6e58ca32b75f1991493cb307606169bcd5a (diff) | |
| download | linux-stable-queue-92cd235ced0a4f144d6cbc024c594e71642424da.tar.gz | |
Fix ia64 build regression
"efi: Use early_mem*() instead of early_io*()" failed to build on
ia64; add the missing macro definition.
| -rw-r--r-- | queue-3.16/arch-ia64-define-early_memunmap.patch | 34 | ||||
| -rw-r--r-- | queue-3.16/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/queue-3.16/arch-ia64-define-early_memunmap.patch b/queue-3.16/arch-ia64-define-early_memunmap.patch new file mode 100644 index 00000000..64046f6d --- /dev/null +++ b/queue-3.16/arch-ia64-define-early_memunmap.patch @@ -0,0 +1,34 @@ +From: Daniel Kiper <daniel.kiper@oracle.com> +Date: Mon, 30 Jun 2014 19:52:55 +0200 +Subject: arch/ia64: Define early_memunmap() + +commit 4fa62481e231111373418f0d95dd1f24f6e83321 upstream. + +This is odd to use early_iounmap() function do tear down mapping +created by early_memremap() function, even if it works right now, +because they belong to different set of functions. The former is +I/O related function and the later is memory related. So, create +early_memunmap() macro which in real is early_iounmap(). This +thing will help to not confuse code readers longer by mixing +functions from different classes. + +EFI patches following this patch uses that functionality. + +Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> +Cc: Tony Luck <tony.luck@intel.com> +Signed-off-by: Matt Fleming <matt.fleming@intel.com> +Signed-off-by: Ben Hutchings <ben@decadent.org.uk> +--- + arch/ia64/include/asm/io.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/ia64/include/asm/io.h ++++ b/arch/ia64/include/asm/io.h +@@ -426,6 +426,7 @@ extern void iounmap (volatile void __iom + extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size); + #define early_memremap(phys_addr, size) early_ioremap(phys_addr, size) + extern void early_iounmap (volatile void __iomem *addr, unsigned long size); ++#define early_memunmap(addr, size) early_iounmap(addr, size) + static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size) + { + return ioremap(phys_addr, size); diff --git a/queue-3.16/series b/queue-3.16/series index 07ef8422..e41375eb 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -39,6 +39,7 @@ media-iguanair-add-sanity-checks.patch media-iguanair-fix-endpoint-sanity-check.patch arm-dts-at91-sama5d3-fix-maximum-peripheral-clock-rates.patch arm-dts-at91-sama5d3-define-clock-rate-range-for-tcb1.patch +arch-ia64-define-early_memunmap.patch efi-use-early_mem-instead-of-early_io.patch efi-x86-map-the-entire-efi-vendor-string-before-copying-it.patch pci-don-t-disable-bridge-bars-when-assigning-bus-resources.patch |