This includes the remainder of arch-specific part of the SH merge.
This patch only effects arch/sh and include/asm-sh, against current BK.