I updated Yakui's patch, so it could be applied after x86.git#testing

Please check it

YH