We use one kmalloc to allocate two structures needlessly.
Combine these two structures into one.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>