On Mon, May 04, 2015 at 11:45:41AM -0700, Cong Wang wrote:

<snip>

> Should be the same issue. Please give the attached patch a try,
> it is compile-tested only.
> 
> Thanks!

<snip>

Thank you.

I have just booted with the above path and the "oops" is gone

So although the patch may not be optimal, it does seem to take care of the issue.