This reverts commit e5cb966c.

It causes new build regressions with gcc-4.2 which is
pretty common on non-x86 platforms.
Reported-by: NJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>