'cpu_has_pse' has changed to boot_cpu_has(X86_FEATURE_PSE), fix this
up in the merge commit when merging the x86/urgent tree that includes
the following commit:

  103f6112 ("x86/mm/xen: Suppress hugetlbfs in PV guests")
Signed-off-by: NIngo Molnar <mingo@kernel.org>