Merge branch 'x86/mm'

Depends on the simplifications from commit 1d7e707a ("Revert "x86/module: prepare module loading for ROX allocations of text"")

Signed-off-by: Peter Zijlstra <peterz@infradead.org>