Fix CIRCLEQ_REPLACE.  From Michael Piszczek (mpiszczek_at_ddn_dot_com). guenther@ otto@ ok
Fix CIRCLEQ_REPLACE.  From Michael Piszczek (mpiszczek_at_ddn_dot_com).
guenther@ otto@ ok

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars