I want to change my vote :-) The problem isn't a spurious extra "#else"
(which Paul's patch removed) ...  it is a missing "#endif"

Here's a patch that puts the #else back, adds the #endif, and fixes the
whitespace to make this nested mess of pre-processor noise a bit more
legible. 
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>