From 1e977cd95a8f7bf071b4ef831e6971565a1267d1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 27 Dec 2024 22:47:29 +0100 Subject: libirqhelp: Avoid loop between acpi and libirqhelp Now that acpi uses libirqhelp, the latter shouldn't be trying to lookup the former through the FS. --- libirqhelp/irqhelp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libirqhelp/irqhelp.c b/libirqhelp/irqhelp.c index 903339a3..febf2a0c 100644 --- a/libirqhelp/irqhelp.c +++ b/libirqhelp/irqhelp.c @@ -53,6 +53,8 @@ static mach_port_t irqdev = MACH_PORT_NULL; static mach_port_t acpidev = MACH_PORT_NULL; static bool acpi_missing = false; +extern char *netfs_server_name __attribute__ ((weak)); + static error_t get_acpi(void) { @@ -71,6 +73,11 @@ get_acpi(void) } } + /* *We* are acpi. */ + if (&netfs_server_name && netfs_server_name && + strcmp (netfs_server_name, "acpi") == 0) + return ENODEV; + tryacpi = file_name_lookup (_SERVERS_ACPI, O_RDONLY, 0); if (tryacpi == MACH_PORT_NULL) { -- cgit v1.2.3