Keep compilers happy on BG/Q

Change-Id: I99439b002f95145504c359fddc61dc701431d8f0