Der... if you use max_t it helps if you give it a type. 

Note to self: Always just apply the tested patches, don't try to port 
them by hand. You're not clever enough.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>