This mirrors the change introduced by 7d0ae808 of same title
in Linus' tree; it's not obvious as a merge resolution since we moved
the function.
Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>