Patch from Nicolas Pitre

... with a bit of reorg to make the core code a bit more generic too.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King