bring in stuff from recent netbsd -- correct number of buffers now being allocated
bring in stuff from recent netbsd -- correct number of buffers now being
allocated

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