* Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> (switched to email. Please respond via emailed reply-to-all, not via the
> bugzilla web interface).
>
> Does anyone have any theories about this? I went through the
> 4.5.2->4.5.5 changelog searching for "huget" but came up blank..
>
> I'm suspiciously staring at Ingo's change
>
> commit b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc
> Merge: abfb949 ea5dfb5
> Author: Ingo Molnar <mingo@xxxxxxxxxx>
> AuthorDate: Fri Apr 22 10:12:19 2016 +0200
> Commit: Ingo Molnar <mingo@xxxxxxxxxx>
> CommitDate: Fri Apr 22 10:13:53 2016 +0200
>
> Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict
>
> '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:
>
> 103f6112f253 ("x86/mm/xen: Suppress hugetlbfs in PV guests")
>
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
>
> --- a/arch/x86/include/asm/hugetlb.h
> +++ b/arch/x86/include/asm/hugetlb.h
> @@@ -4,6 -4,7 +4,7 @@@
> #include <asm/page.h>
> #include <asm-generic/hugetlb.h>
>
> -#define hugepages_supported() cpu_has_pse
> ++#define hugepages_supported() boot_cpu_has(X86_FEATURE_PSE)
That's really a no-op change, as we simply got rid of cpu_has_pse:
-#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)
... and open coded the boot_cpu_has(X86_FEATURE_PSE) uses. There should be zero
change to the generated code.
Thanks,
Ingo
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>