Fix #ifdef DDB/#ifdef SMALL_KERNEL uses so all four combinations

(DDB/SMALL_KERNEL, DDB/!SMALL_KERNEL, !DDB/!SMALL_KERNEL,
!DDB/SMALL_KERNEL) can compile. A DDB bsd.rd is thus possible again.

Correction to my original diff from miod@

"If it compiles, commit" deraadt@

diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index 7f4a319..d1de06d 100644 (file)
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.173 2010/07/23 18:38:46 jordan Exp $ */
+/* $OpenBSD: dsdt.c,v 1.174 2010/07/27 02:00:36 krw Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -328,7 +328,7 @@ aml_findopcode(int opcode)
        return NULL;
 }
 
-#ifndef SMALL_KERNEL
+#if defined(DDB) || !defined(SMALL_KERNEL)
 const char *
 aml_mnem(int opcode, uint8_t *pos)
 {
@@ -363,7 +363,7 @@ aml_mnem(int opcode, uint8_t *pos)
        }
        return ("xxx");
 }
-#endif /* SMALL_KERNEL */
+#endif /* defined(DDB) || !defined(SMALL_KERNEL) */
 
 struct aml_notify_data {
        struct aml_node         *node;
@@ -2612,7 +2612,7 @@ aml_xstore(struct aml_scope *scope, struct aml_value *lhs , int64_t ival,
        aml_freevalue(&tmp);
 }
 
-#ifndef SMALL_KERNEL
+#ifdef DDB
 /* Disassembler routines */
 void aml_disprintf(void *arg, const char *fmt, ...);
 
@@ -2979,7 +2979,7 @@ aml_disasm(struct aml_scope *scope, int lvl,
                dbprintf(arg,"\n");
        }
 }
-#endif /* SMALL_KERNEL */
+#endif /* DDB */
 
 int aml_busy;