summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Miles <wmiles@sgl.com>2016-03-24 02:40:26 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-05 03:53:32 +0200
commit53c78d75d8a4615e5c2f1d9fe94f25e049f0e61b (patch)
treeb09d2edaab05500fcb0df5ea3654694ab1c2403c
parentACPICA: Headers: Update generation of the ACPICA library (diff)
downloadlinux-53c78d75d8a4615e5c2f1d9fe94f25e049f0e61b.tar.xz
linux-53c78d75d8a4615e5c2f1d9fe94f25e049f0e61b.zip
ACPICA: Add support for QNX 6.6 platform
ACPICA commit 37a1dec2391272251e59948c16c60713183ae78f Link: https://github.com/acpica/acpica/commit/37a1dec2 Signed-off-by: Will Miles <wmiles@sgl.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--include/acpi/platform/acenv.h3
-rw-r--r--tools/power/acpi/os_specific/service_layers/osunixmap.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 72f85b4bdc44..86b5a8447606 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -219,6 +219,9 @@
#elif defined(__HAIKU__)
#include "achaiku.h"
+#elif defined(__QNX__)
+#include "acqnx.h"
+
#else
/* Unknown environment */
diff --git a/tools/power/acpi/os_specific/service_layers/osunixmap.c b/tools/power/acpi/os_specific/service_layers/osunixmap.c
index 3818fd07e50f..cbfbce18783d 100644
--- a/tools/power/acpi/os_specific/service_layers/osunixmap.c
+++ b/tools/power/acpi/os_specific/service_layers/osunixmap.c
@@ -54,7 +54,7 @@ ACPI_MODULE_NAME("osunixmap")
#ifndef O_BINARY
#define O_BINARY 0
#endif
-#if defined(_dragon_fly) || defined(_free_BSD)
+#if defined(_dragon_fly) || defined(_free_BSD) || defined(_QNX)
#define MMAP_FLAGS MAP_SHARED
#else
#define MMAP_FLAGS MAP_PRIVATE