From 636c04dbf2dd0cbfde838848b5888836a85dc0eb Mon Sep 17 00:00:00 2001 From: rin Date: Sun, 7 Apr 2019 02:58:02 +0000 Subject: [PATCH] Fix previous. We define _KERNEL for rump in opt_rumpkernel.h. XXX This works because arch's with _RUMP_NATIVEABI=yes and therefore XXX without _RUMPKERNEL (amd64 and i386) do not have their own XXX setdisklabel(9). We may need another macro, e.g., _RUMP. --- sys/kern/subr_disklabel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index 6cf5ccaccfdf..e00e00c7cfb4 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_disklabel.c,v 1.2 2019/04/05 01:10:32 christos Exp $ */ +/* $NetBSD: subr_disklabel.c,v 1.3 2019/04/07 02:58:02 rin Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -32,13 +32,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_disklabel.c,v 1.2 2019/04/05 01:10:32 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_disklabel.c,v 1.3 2019/04/07 02:58:02 rin Exp $"); #include #include #include -#if !defined(__HAVE_SETDISKLABEL) || !defined(_KERNEL) +#if !defined(__HAVE_SETDISKLABEL) || defined(_RUMPKERNEL) #ifdef DEBUG #define DPRINTF(a, ...) printf(a, ##__VA_ARGS__)