Fix yet another gcc2 merge problem, this one broke linux kernel compiles