diff --git a/sys/compat/linuxkpi/common/include/linux/acpi.h b/sys/compat/linuxkpi/common/include/linux/acpi.h --- a/sys/compat/linuxkpi/common/include/linux/acpi.h +++ b/sys/compat/linuxkpi/common/include/linux/acpi.h @@ -32,6 +32,7 @@ #define _LINUX_ACPI_H_ #include +#include #if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) diff --git a/sys/compat/linuxkpi/common/include/linux/acpi.h b/sys/compat/linuxkpi/common/include/linux/uuid.h copy from sys/compat/linuxkpi/common/include/linux/acpi.h copy to sys/compat/linuxkpi/common/include/linux/uuid.h --- a/sys/compat/linuxkpi/common/include/linux/acpi.h +++ b/sys/compat/linuxkpi/common/include/linux/uuid.h @@ -1,17 +1,19 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2020 Vladimir Kondratyev + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software was developed by Björn Zeeb under sponsorship from + * the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * modification, are permitted provided that the following conditions + * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -28,19 +30,11 @@ * $FreeBSD$ */ -#ifndef _LINUX_ACPI_H_ -#define _LINUX_ACPI_H_ - -#include - -#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) - -#include -#include - -#define ACPI_HANDLE(dev) \ - ((dev)->bsddev != NULL ? bsd_acpi_get_handle((dev)->bsddev) : NULL) +#ifndef __LKPI_LINUX_UUID_H +#define __LKPI_LINUX_UUID_H -#endif +typedef struct { + char x[16]; +} guid_t; -#endif /* _LINUX_ACPI_H_ */ +#endif /* __LKPI_LINUX_UUID_H */