Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict

Browse source

'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:

  103f6112f2 ("x86/mm/xen: Suppress hugetlbfs in PV guests")

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2016-04-22 10:12:19 +02:00

parent abfb9498ee ea5dfb5fae

commit b2eafe890d

4 changed files with 42 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

Documentation/x86/x86_64/mm.txt

View file

1

arch/x86/include/asm/hugetlb.h

View file

12

arch/x86/kernel/cpu/mshyperv.c

View file

30

drivers/edac/sb_edac.c

View file