From ee6c7128ed0d58cb1812049463a13bba9cfb31b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Fri, 6 Nov 2015 01:42:41 +0100
Subject: Imported Upstream version 2.9.7

---
 util/mem_if.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'util/mem_if.c')

diff --git a/util/mem_if.c b/util/mem_if.c
index c445138..9be58a9 100644
--- a/util/mem_if.c
+++ b/util/mem_if.c
@@ -65,8 +65,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/param.h>
 #endif
-#if defined(SOLARIS) || defined(BSD)
+#endif
+#if defined(SOLARIS) || defined(BSD) || defined(HPUX)
 #define EXEC_PAGESIZE     4096
 #endif
 
@@ -274,6 +277,11 @@ static int	m_iCount = 0;
 int OpenIMemoryInterface(void)
 {
      int rv = -1;
+/* ARM64 does not handle /dev/mem the same.  
+ * It exposes SMBIOS at /sys/firmware/dmi/tables/, but because 
+ * IO memory is memory mapped, cannot use legacy /dev/mem. */
+#ifndef __arm__
+#ifndef __aarch64__
 	//check to see if driver has been previously defined
 	if (!m_iDriver) { //open the driver
 		m_iDriver = open(MEM_DRIVER, O_RDONLY);
@@ -286,6 +294,8 @@ int OpenIMemoryInterface(void)
 		m_iCount++;
 	}
 	if (m_iDriver > 0) rv = 0;
+#endif
+#endif
 	return(rv);
 }
 
-- 
cgit v1.2.3