Of course it isn't -stable material, I don't know what Oliver's on.
Maybe he noticed akpm's "unbreak arm" comment and thought it was
fixing some pre-existing breakage: no, akpm restored swap.h to
fix the arm build. Then after this commit, we had to restore
pagemap.h to fix avr32 and !CONFIG_SWAP builds.
Prime material for -unstable, I'm ashamed to say.
Hugh
--