mako: kernel: pick a change to fix build with gcc 4.7