aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2014-01-23 18:54:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 19:36:57 -0500
commitcf0744021c5d5de54d2c66e2020c6de2fe800264 (patch)
tree0d2032c3d04aabe53ac3d9a2963c41d8c0b331c1 /arch/ia64/include
parent3e2a4c183ace8708c69f589505fb82bb63010ade (diff)
firmware/dmi_scan: generalize for use by other archs
This patch makes a couple of changes to the SMBIOS/DMI scanning code so it can be used on other archs (such as ARM and arm64): (a) wrap the calls to ioremap()/iounmap(), this allows the use of a flavor of ioremap() more suitable for random unaligned access; (b) allow the non-EFI fallback probe into hardcoded physical address 0xF0000 to be disabled. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Grant Likely <grant.likely@linaro.org> Cc: Ingo Molnar <mingo@elte.hu> Cc "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/dmi.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/dmi.h b/arch/ia64/include/asm/dmi.h
index 185d3d18d0ec..f365a61f5c71 100644
--- a/arch/ia64/include/asm/dmi.h
+++ b/arch/ia64/include/asm/dmi.h
@@ -5,8 +5,10 @@
5#include <asm/io.h> 5#include <asm/io.h>
6 6
7/* Use normal IO mappings for DMI */ 7/* Use normal IO mappings for DMI */
8#define dmi_ioremap ioremap 8#define dmi_early_remap ioremap
9#define dmi_iounmap(x,l) iounmap(x) 9#define dmi_early_unmap(x, l) iounmap(x)
10#define dmi_alloc(l) kzalloc(l, GFP_ATOMIC) 10#define dmi_remap ioremap
11#define dmi_unmap iounmap
12#define dmi_alloc(l) kzalloc(l, GFP_ATOMIC)
11 13
12#endif 14#endif