Module Name: src
Committed By: riastradh
Date: Mon Feb 28 17:15:30 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c
src/sys/external/bsd/drm2/linux: linux_acpi.c
Log Message:
drm: Fix ACPI crud in ALL kernel build.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/linux/linux_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.10 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.10 Sun Feb 27 14:24:27 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Mon Feb 28 17:15:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_bios.c,v 1.10 2022/02/27 14:24:27 riastradh Exp $ */
+/* $NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.10 2022/02/27 14:24:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/pci.h>
@@ -41,7 +41,12 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.
#include "radeon.h"
#include "radeon_reg.h"
+#ifdef __NetBSD__
+#include <dev/acpi/acpireg.h>
+#define _COMPONENT ACPI_DISPLAY_COMPONENT
+ACPI_MODULE_NAME("radeon_acpi")
#include <linux/nbsd-namespace-acpi.h>
+#endif
/*
* BIOS.
Index: src/sys/external/bsd/drm2/linux/linux_acpi.c
diff -u src/sys/external/bsd/drm2/linux/linux_acpi.c:1.1 src/sys/external/bsd/drm2/linux/linux_acpi.c:1.2
--- src/sys/external/bsd/drm2/linux/linux_acpi.c:1.1 Sun Feb 27 14:22:21 2022
+++ src/sys/external/bsd/drm2/linux/linux_acpi.c Mon Feb 28 17:15:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_acpi.c,v 1.1 2022/02/27 14:22:21 riastradh Exp $ */
+/* $NetBSD: linux_acpi.c,v 1.2 2022/02/28 17:15:30 riastradh Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -27,10 +27,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_acpi.c,v 1.1 2022/02/27 14:22:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_acpi.c,v 1.2 2022/02/28 17:15:30 riastradh Exp $");
+
+#include <dev/acpi/acpireg.h>
#include <linux/acpi.h>
+#define _COMPONENT ACPI_BUS_COMPONENT
+ACPI_MODULE_NAME("linux_acpi")
+
union acpi_object *
acpi_evaluate_dsm(acpi_handle handle, const guid_t *uuid, u64 rev, u64 func,
union acpi_object *argv4)
