I'm reverting the compile-time fixes to replace them with a bigger change,
which also happens to fix the compilation problem.  The change is in next
patches.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>