Make the Kernel leaner---from @morfic
Linaro 4.8 fixes