Merge ^/head r311684 through r311691.

This commit is contained in:
Dimitry Andric 2017-01-08 18:17:35 +00:00
commit 657db61c20
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/projects/clang400-import/; revision=311692

View File

@ -183,7 +183,7 @@ gv_set_sd_state(struct gv_sd *s, int newstate, int flags)
* Only do this if we're forced, since it usually is done
* internally, and then we do use the force flag.
*/
if (!flags & GV_SETSTATE_FORCE)
if (!(flags & GV_SETSTATE_FORCE))
return (GV_ERR_SETSTATE);
break;