diff options
| -rw-r--r-- | sys/dev/vinum/vinumconfig.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c index ec890b0..e1d7d0e 100644 --- a/sys/dev/vinum/vinumconfig.c +++ b/sys/dev/vinum/vinumconfig.c @@ -99,13 +99,8 @@ throw_rude_remark(int error, char *msg,...) static int finishing; /* don't recurse */ int was_finishing; -<<<<<<< vinumconfig.c - if ((vinum_conf.flags & VF_LOCKED) == 0) /* bug catcher */ - panic ("throw_rude_remark: called without config lock"); -======= if ((vinum_conf.flags & VF_LOCKED) == 0) /* bug catcher */ panic ("throw_rude_remark: called without config lock"); ->>>>>>> 1.44 va_start(ap, msg); if ((ioctl_reply != NULL) /* we're called from the user */ &&(!(vinum_conf.flags & VF_READING_CONFIG))) { /* and not reading from disk: return msg */ |
