Needed to merge trace/ftrace/urgent to get:

  Commit 59300b36 ("ftrace: Check if pages were allocated before calling free_pages()")

To clean up the code that is affected by it as well.