summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2018-05-17 20:46:45 +0000
committerkettenis <kettenis@openbsd.org>2018-05-17 20:46:45 +0000
commit9d439f8ca853990711154111182448e0868fcff5 (patch)
tree7b2071240f95ab1d45d4c0b2082598a94596e6e4
parentDrop memory barrier in _atomic_lock() implementation since the callers now (diff)
downloadwireguard-openbsd-9d439f8ca853990711154111182448e0868fcff5.tar.xz
wireguard-openbsd-9d439f8ca853990711154111182448e0868fcff5.zip
Sprinkle some #ifndef SMALL_KERNEL such that RAMDISK kernels cuild again.
pointed out by stsp@
-rw-r--r--sys/dev/acpi/acpi.c6
-rw-r--r--sys/dev/acpi/dsdt.c8
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index ffffae80f5e..6a486cc51ae 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.342 2018/05/17 20:21:15 kettenis Exp $ */
+/* $OpenBSD: acpi.c,v 1.343 2018/05/17 20:46:45 kettenis Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -919,6 +919,8 @@ acpi_register_gpio(struct acpi_softc *sc, struct aml_node *devnode)
aml_parse_resource(&res, acpi_gpio_parse_events, devnode);
}
+#ifndef SMALL_KERNEL
+
void
acpi_register_gsb(struct acpi_softc *sc, struct aml_node *devnode)
{
@@ -936,6 +938,8 @@ acpi_register_gsb(struct acpi_softc *sc, struct aml_node *devnode)
printf("%s: _REG failed\n", node->name);
}
+#endif
+
void
acpi_attach(struct device *parent, struct device *self, void *aux)
{
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index 1a995166004..75cd70721d8 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.238 2018/05/17 20:21:15 kettenis Exp $ */
+/* $OpenBSD: dsdt.c,v 1.239 2018/05/17 20:46:45 kettenis Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
*
@@ -2517,6 +2517,8 @@ aml_rwgpio(struct aml_value *conn, int bpos, int blen, struct aml_value *val,
}
}
+#ifndef SMALL_KERNEL
+
void
aml_rwgsb(struct aml_value *conn, int bpos, int blen, struct aml_value *val,
int mode, int flag)
@@ -2607,6 +2609,8 @@ aml_rwgsb(struct aml_value *conn, int bpos, int blen, struct aml_value *val,
buf[0] = err;
}
+#endif
+
void
aml_rwindexfield(struct aml_value *fld, struct aml_value *val, int mode)
{
@@ -2708,10 +2712,12 @@ aml_rwfield(struct aml_value *fld, int bpos, int blen, struct aml_value *val,
aml_rwgpio(ref2, bpos, blen, val, mode,
fld->v_field.flags);
break;
+#ifndef SMALL_KERNEL
case ACPI_OPREG_GSB:
aml_rwgsb(ref2, fld->v_field.bitpos + bpos, blen,
val, mode, fld->v_field.flags);
break;
+#endif
default:
aml_rwgen(ref1, fld->v_field.bitpos + bpos, blen,
val, mode, fld->v_field.flags);