12013 fix smatch build for GCC4Reviewed by: Dan McDonald <danmcd@joyent.com>Approved by: Robert Mustacchi <rm@fingolfin.org>
11972 resync smatchReviewed by: Robert Mustacchi <rm@fingolfin.org>Approved by: Dan McDonald <danmcd@joyent.com>