Arnd Bergmann d0f33ac9ae mm, x86: fix native_pud_clear build error ... We still get a build error in random configurations, after this has been modified a few times: In file included from include/linux/mm.h:68:0, from include/linux/suspend.h:8, from arch/x86/kernel/asm-offsets.c:12: arch/x86/include/asm/pgtable.h:66:26: error: redefinition of 'native_pud_clear' #define pud_clear(pud) native_pud_clear(pud) My interpretation is that the build error comes from a typo in __PAGETABLE_PUD_FOLDED, so fix that typo now, and remove the incorrect #ifdef around the native_pud_clear definition. Fixes: 3e761a42e1 ("mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()") Fixes: a00cc7d9dd ("mm, x86: add support for PUD-sized transparent hugepages") Link: http://lkml.kernel.org/r/20170314121330.182155-1-arnd@arndb.de Signed-off-by: Arnd Bergmann <arnd@arndb.de> Ackedy-by: Dave Jiang <dave.jiang@intel.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Garnier <thgarnie@google.com> Cc: Kees Cook <keescook@chromium.org> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Hugh Dickins <hughd@google.com> Cc: Borislav Petkov <bp@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2017-03-16 16:56:18 -07:00
..
crypto	crypto: glue_helper - Add skcipher xts helpers	2016-11-28 21:23:20 +08:00
fpu	x86/fpu/xstate: Move XSAVES state init to a function	2017-01-25 08:25:12 +01:00
numachip
trace	This release has a few updates:	2016-12-15 13:49:34 -08:00
uv	x86/platform/UV: Add Support for UV4 Hubless NMIs	2017-02-01 10:20:59 +01:00
xen	xen/privcmd: Add IOCTL_PRIVCMD_DM_OP	2017-02-14 15:13:43 -05:00
a.out-core.h	sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>	2017-03-02 08:42:37 +01:00
acenv.h
acpi.h	x86/amd: Simplify AMD E400 aware idle routine	2016-12-09 21:23:21 +01:00
agp.h
alternative-asm.h
alternative.h	x86/alternatives: Add stack frame dependency to alternative_call_2()	2016-09-24 09:30:03 +02:00
amd_nb.h	x86/amd_nb: Add SMN and Indirect Data Fabric access for AMD Fam17h	2016-11-16 20:46:38 +01:00
apb_timer.h
apic_flat_64.h
apic.h	sched/headers, x86/apic: Remove the <linux/pm.h> header inclusion from <asm/apic.h>	2017-03-03 01:45:40 +01:00
apicdef.h
apm.h	x86, asm: use bool for bitops and other assembly outputs	2016-06-08 12:41:20 -07:00
arch_hweight.h	x86/hweight: Get rid of the special calling convention	2016-06-08 15:01:02 +02:00
archrandom.h	x86, asm: Use CC_SET()/CC_OUT() and static_cpu_has() in archrandom.h	2016-06-08 12:41:20 -07:00
asm-offsets.h
asm-prototypes.h	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
asm.h	x86, asm: define CC_SET() and CC_OUT() macros	2016-06-08 12:41:20 -07:00
atomic64_32.h	locking/atomic, arch/x86: Implement atomic{,64}_fetch_{add,sub,and,or,xor}()	2016-06-16 10:48:31 +02:00
atomic64_64.h	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-07-25 15:34:18 -07:00
atomic.h	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-07-25 15:34:18 -07:00
barrier.h
bios_ebda.h	x86/boot: Reorganize and clean up the BIOS area reservation code	2016-07-21 10:11:57 +02:00
bitops.h	mm: optimize PageWaiters bit use for unlock_page()	2016-12-29 11:03:15 -08:00
boot.h	x86/KASLR: Build identity mappings on demand	2016-05-07 07:38:39 +02:00
bootparam_utils.h
bug.h
bugs.h	x86/mm/mpx: Work around MPX erratum SKD046	2016-05-20 09:07:40 +02:00
cache.h
cacheflush.h	mm: add arch-independent testcases for RODATA	2017-02-27 18:43:48 -08:00
calgary.h
ce4100.h
checksum_32.h	x86/uaccess: Move thread_info::addr_limit to thread_struct	2016-07-15 10:26:30 +02:00
checksum_64.h	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
checksum.h
clocksource.h	x86/vdso: Remove direct HPET access through the vDSO	2016-04-13 10:28:34 +02:00
cmdline.h
cmpxchg_32.h
cmpxchg_64.h
cmpxchg.h	x86/cmpxchg, locking/atomics: Remove superfluous definitions	2016-09-30 10:56:01 +02:00
compat.h	x86/coredump: Always use user_regs_struct for compat_elf_gregset_t	2016-11-24 06:01:05 +01:00
cpu_device_id.h
cpu.h	xen: features and fixes for 4.8-rc0	2016-07-27 11:35:37 -07:00
cpufeature.h	x86/cpufeature: Provide helper to set bugs bits	2016-12-09 21:23:20 +01:00
cpufeatures.h	x86/cpufeature: Add 5-level paging detection	2017-03-09 11:48:47 -08:00
cpumask.h
crash.h
current.h
debugreg.h
delay.h
desc_defs.h	scripts/spelling.txt: add "an union" pattern and fix typo instances	2017-02-27 18:43:46 -08:00
desc.h	x86/asm: Tidy up TSS limit code	2017-03-01 17:03:22 +01:00
device.h	treewide: Move dma_ops from struct dev_archdata into struct device	2017-01-24 12:23:35 -05:00
disabled-features.h	x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated	2016-06-30 09:11:32 +02:00
div64.h	math64, timers: Fix 32bit mul_u64_u32_shr() and friends	2017-01-14 11:31:50 +01:00
dma-mapping.h	treewide: Consolidate get_dma_ops() implementations	2017-01-24 12:23:35 -05:00
dma.h
dmi.h
dwarf2.h
e820.h	x86/e820: Make e820_search_gap() static and remove unused variables	2016-12-28 09:20:29 +01:00
edac.h
efi.h	x86/efi: Allow invocation of arbitrary runtime services	2017-02-07 10:42:09 +01:00
elf.h	x86/elf: Add HWCAP2 to expose ring 3 MONITOR/MWAIT	2017-02-04 08:51:09 +01:00
emergency-restart.h
entry_arch.h
espfix.h
exec.h
export.h	x86: move exports to actual definitions	2016-08-07 23:47:15 -04:00
extable.h	x86: separate extable.h, switch sections.h to it	2016-09-27 21:15:23 -04:00
fb.h
fixmap.h
floppy.h	x86/floppy: Use designated initializers	2016-12-18 09:25:38 +01:00
frame.h
ftrace.h	ftrace/x86: Implement HAVE_FUNCTION_GRAPH_RET_ADDR_PTR	2016-08-24 12:15:15 +02:00
futex.h
gart.h
genapic.h
geode.h
hardirq.h	x86/irq: Do not substract irq_tlb_count from irq_call_count	2016-08-11 11:14:59 +02:00
highmem.h
hpet.h
hugetlb.h	Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict	2016-04-22 10:13:53 +02:00
hw_breakpoint.h
hw_irq.h	x86/irq: Cure live lock in fixup_irqs()	2016-03-18 14:51:06 +01:00
hypertransport.h
hypervisor.h	virt, sched: Add generic vCPU pinning support	2016-09-05 13:52:38 +02:00
i8259.h
ia32_unistd.h
ia32.h
imr.h
inat_types.h
inat.h	x86/insn: Add AVX-512 support to the instruction decoder	2016-07-21 09:37:11 -03:00
init.h	x86/power/64: Always create temporary identity mapping correctly	2016-08-08 22:04:30 +02:00
insn.h	x86/insn: Add AVX-512 support to the instruction decoder	2016-07-21 09:37:11 -03:00
inst.h
intel_mid_vrtc.h
intel_pmc_ipc.h	platform/x86: intel_pmc_ipc: read s0ix residency API	2017-02-24 23:48:46 -08:00
intel_pt.h
intel_punit_ipc.h
intel_rdt_common.h	x86/cqm: Share PQR_ASSOC related data between CQM and CAT	2016-10-26 23:12:39 +02:00
intel_rdt.h	sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>	2017-03-02 08:42:31 +01:00
intel_scu_ipc.h	x86/platform/intel-mid: Implement power off sequence	2016-09-08 08:03:58 +02:00
intel_telemetry.h	intel_telemetry: Constify telemetry_core_ops structures	2016-05-05 13:58:55 -07:00
intel-family.h	x86: intel-family.h: Add GEMINI_LAKE SOC	2017-03-01 00:14:13 -05:00
intel-mid.h	x86/platform/intel-mid: Make intel_scu_device_register() static	2017-01-09 23:13:36 +01:00
io_apic.h
io.h	x86/mm: Improve documentation for low-level device I/O functions	2017-01-28 09:37:51 +01:00
iomap.h
iommu_table.h
iommu.h	treewide: Constify most dma_map_ops structures	2017-01-24 12:23:35 -05:00
iosf_mbi.h
ipi.h
irq_regs.h
irq_remapping.h
irq_vectors.h
irq_work.h	x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage	2016-04-13 11:37:41 +02:00
irq.h	nmi_backtrace: add more trigger_*_cpu_backtrace() methods	2016-10-07 18:46:30 -07:00
irqdomain.h
irqflags.h	nmi_backtrace: generate one-line reports for idle cpus	2016-10-07 18:46:30 -07:00
ist.h
jump_label.h
kasan.h
kaslr.h	x86/mm/64: Enable KASLR for vmemmap memory region	2016-08-10 16:10:06 +02:00
kbdleds.h
Kbuild	sched/cputime: Remove generic asm headers	2017-02-01 09:14:07 +01:00
kdebug.h	x86/dumpstack: Remove kernel text addresses from stack dump	2016-10-25 18:40:37 +02:00
kexec-bzimage64.h
kexec.h	x86/panic: replace smp_send_stop() with kdump friendly version in panic path	2016-10-11 15:06:32 -07:00
kgdb.h	x86/asm: Stop depending on ptrace.h in alternative.h	2016-04-29 11:56:40 +02:00
kmap_types.h
kmemcheck.h
kprobes.h	kprobes: move kprobe declarations to asm-generic/kprobes.h	2017-02-27 18:43:45 -08:00
kvm_emulate.h	kvm: svm: Use the hardware provided GPA instead of page walk	2017-01-09 14:47:58 +01:00
kvm_guest.h
kvm_host.h	KVM: x86: remove code for lazy FPU handling	2017-02-17 12:28:01 +01:00
kvm_page_track.h	kvm/page_track: call notifiers with kvm_page_track_notifier_node	2016-11-04 12:13:20 +01:00
kvm_para.h
kvmclock.h	kvmclock: export kvmclock clocksource and data pointers	2017-02-08 17:16:19 +01:00
lguest_hcall.h	x86/fpu, lguest: Remove CR0.TS support	2016-11-01 07:47:54 +01:00
lguest.h
linkage.h	x86/entry/32: Remove asmlinkage_protect()	2016-05-05 08:37:31 +02:00
livepatch.h	x86: Audit and remove any remaining unnecessary uses of module.h	2016-07-14 15:07:00 +02:00
local64.h
local.h	x86, asm: change the GEN_*_RMWcc() macros to not quote the condition	2016-06-08 12:41:20 -07:00
mach_timer.h
mach_traps.h
math_emu.h
mc146818rtc.h	rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h	2016-06-04 00:20:00 +02:00
mce.h	x86/ras, EDAC, acpi: Assign MCE notifier handlers a priority	2017-01-24 09:14:57 +01:00
microcode_amd.h	x86/microcode/AMD: Check patch level only on the BSP	2017-01-23 10:02:50 +01:00
microcode_intel.h	x86/microcode/intel: Add a helper which gives the microcode revision	2017-01-09 23:11:14 +01:00
microcode.h	Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts	2017-01-31 08:38:17 +01:00
misc.h
mmconfig.h
mmu_context.h	x86/ldt: Make all size computations unsigned	2016-12-10 00:24:39 +01:00
mmu.h	x86/mpx: Move bd_addr to mm_context_t	2016-12-17 12:29:56 +01:00
mmx.h
mmzone_32.h
mmzone_64.h
mmzone.h
module.h
mpspec_def.h
mpspec.h	x86/acpi: Introduce persistent storage for cpuid <-> apicid mapping	2016-09-21 21:18:38 +02:00
mpx.h	sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>	2017-03-02 08:42:37 +01:00
mshyperv.h	hv: export current Hyper-V clocksource	2017-02-10 15:40:19 +01:00
msi.h
msidef.h
msr-index.h	Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2017-03-01 23:34:38 +01:00
msr-trace.h
msr.h	x86/MSR: Carve out bare minimum accessors	2017-01-23 10:02:45 +01:00
mtrr.h	x86/mtrr: Fix Xorg crashes in Qemu sessions	2016-03-29 12:23:26 +02:00
mwait.h	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/idle.h>	2017-03-02 08:42:26 +01:00
nmi.h
nops.h
numa_32.h
numa.h
olpc_ofw.h
olpc.h
page_32_types.h	x86/asm, x86/microcode: Add __PAGE_OFFSET_BASE define on 32-bit	2016-07-27 14:59:59 +02:00
page_32.h
page_64_types.h	x86/mm: Enable KASLR for physical mapping memory regions	2016-07-08 17:35:15 +02:00
page_64.h
page_types.h
page.h	x86/boot: Split out kernel_ident_mapping_init()	2016-05-07 07:38:39 +02:00
paravirt_types.h	mm, x86: add support for PUD-sized transparent hugepages	2017-02-24 17:46:54 -08:00
paravirt.h	mm, x86: add support for PUD-sized transparent hugepages	2017-02-24 17:46:54 -08:00
parport.h
pat.h	x86/xen, pat: Remove PAT table init code from Xen	2016-03-29 12:23:27 +02:00
pci_64.h
pci_x86.h
pci-direct.h
pci-functions.h
pci.h	x86/PCI: VMD: Request userspace control of PCIe hotplug indicators	2016-09-23 08:41:08 -05:00
percpu.h	x86: Remove x86_test_and_clear_bit_percpu()	2016-11-18 12:07:57 +01:00
perf_event_p4.h
perf_event.h	perf/x86/intel/pt: Don't die on VMXON	2016-04-28 10:32:42 +02:00
pgalloc.h	arch: x86: charge page tables to kmemcg	2016-07-26 16:19:19 -07:00
pgtable_32_types.h
pgtable_32.h	x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C	2017-02-07 08:07:01 -05:00
pgtable_64_types.h	x86/mm/64: Enable KASLR for vmemmap memory region	2016-08-10 16:10:06 +02:00
pgtable_64.h	mm, x86: add support for PUD-sized transparent hugepages	2017-02-24 17:46:54 -08:00
pgtable_types.h	arch, mm: convert all architectures to use 5level-fixup.h	2017-03-09 11:48:47 -08:00
pgtable-2level_types.h
pgtable-2level.h	mm, x86: add support for PUD-sized transparent hugepages	2017-02-24 17:46:54 -08:00
pgtable-3level_types.h
pgtable-3level.h	mm, x86: fix native_pud_clear build error	2017-03-16 16:56:18 -07:00
pgtable.h	mm, x86: fix native_pud_clear build error	2017-03-16 16:56:18 -07:00
pkeys.h	x86/pkeys: Check against max pkey to avoid overflows	2017-03-01 10:51:50 +01:00
platform_sst_audio.h
pm-trace.h
pmc_core.h	platform/x86: Add PMC Driver for Intel Core SoC	2016-05-27 11:47:56 -07:00
pmem.h	x86/mce: Improve memcpy_mcsafe()	2016-09-05 11:47:31 +02:00
posix_types.h
preempt.h	sched/x86: Do not clear PREEMPT_NEED_RESCHED on preempt count reset	2016-11-16 10:29:04 +01:00
probe_roms.h
processor-cyrix.h
processor-flags.h
processor.h	4.11 is going to be a relatively large release for KVM, with a little over	2017-02-22 18:22:53 -08:00
prom.h
proto.h
ptrace.h	x86/entry: Get rid of two-phase syscall entry work	2016-06-14 10:54:39 -07:00
purgatory.h	kexec, x86/purgatory: Unbreak it and clean it up	2017-03-10 20:55:09 +01:00
pvclock-abi.h
pvclock.h	clocksource: Use a plain u64 instead of cycle_t	2016-12-25 11:04:12 +01:00
qrwlock.h
qspinlock_paravirt.h
qspinlock.h	x86/paravirt: Change vcp_is_preempted() arg type to long	2017-02-21 12:48:06 +01:00
realmode.h	x86/asm/head: Rename 'stack_start' -> 'initial_stack'	2016-08-18 18:41:29 +02:00
reboot_fixups.h
reboot.h
required-features.h	x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated	2016-06-30 09:11:32 +02:00
rio.h
rmwcc.h	x86, asm: change GEN_*_RMWcc() to use CC_SET()/CC_OUT()	2016-06-08 12:41:20 -07:00
rwsem.h	locking/rwsem/x86: Add stack frame dependency for ____down_write()	2016-10-18 12:21:16 +02:00
seccomp.h
sections.h	x86: separate extable.h, switch sections.h to it	2016-09-27 21:15:23 -04:00
segment.h	x86/arch_prctl/64: Remove FSBASE/GSBASE < 4G optimization	2016-04-29 11:56:41 +02:00
serial.h
setup_arch.h
setup.h	x86/asm: Stop depending on ptrace.h in alternative.h	2016-04-29 11:56:40 +02:00
shmparam.h
sigcontext.h
sigframe.h
sighandling.h
signal.h	x86/signal: Add SA_{X32,IA32}_ABI sa_flags	2016-09-14 21:28:11 +02:00
simd.h
smap.h
smp.h	x86/panic: replace smp_send_stop() with kdump friendly version in panic path	2016-10-11 15:06:32 -07:00
sparsemem.h
special_insns.h	x86/fpu: Remove clts()	2016-11-01 07:47:55 +01:00
spinlock_types.h	x86, locking/spinlocks: Remove ticket (spin)lock implementation	2016-09-30 10:56:00 +02:00
spinlock.h	locking/spinlocks/x86, paravirt: Remove paravirt_ticketlocks_enabled	2017-01-14 09:33:46 +01:00
sta2x11.h
stackprotector.h
stacktrace.h	x86/unwind: Include __schedule() in stack traces	2017-01-12 09:28:28 +01:00
string_32.h
string_64.h	x86/mce: Improve memcpy_mcsafe()	2016-09-05 11:47:31 +02:00
string.h
suspend_32.h
suspend_64.h
suspend.h
svm.h	x86/kvm/svm: Simplify cpu_has_svm()	2016-06-16 00:04:31 +02:00
swiotlb.h	dma-mapping: use unsigned long for dma_attrs	2016-08-04 08:50:07 -04:00
switch_to.h	x86/unwind: Include __schedule() in stack traces	2017-01-12 09:28:28 +01:00
sync_bitops.h	x86, bitops: remove use of "sbb" to return CF	2016-06-08 12:41:20 -07:00
sys_ia32.h
syscall.h	x86/asm: Move the thread_info::status field to thread_struct	2016-09-15 08:25:12 +02:00
syscalls.h
sysfb.h
tce.h
text-patching.h	x86/asm: Stop depending on ptrace.h in alternative.h	2016-04-29 11:56:40 +02:00
thread_info.h	sched/core, x86: Make struct thread_info arch specific again	2016-10-20 13:27:47 +02:00
time.h
timer.h
timex.h
tlb.h
tlbflush.h	x86/tlb: Fix tlb flushing when lguest clears PGE	2017-03-12 11:19:29 +01:00
topology.h	sched/x86: Change CONFIG_SCHED_ITMT to CONFIG_SCHED_MC_PRIO	2016-11-30 08:27:08 +01:00
trace_clock.h
traps.h	x86/mm: Improve stack-overflow #PF handling	2016-09-08 08:47:20 +02:00
tsc.h	clocksource: Use a plain u64 instead of cycle_t	2016-12-25 11:04:12 +01:00
uaccess_32.h	x86/uaccess: Enable hardened usercopy	2016-07-26 14:41:48 -07:00
uaccess_64.h	x86/uaccess: Enable hardened usercopy	2016-07-26 14:41:48 -07:00
uaccess.h	x86/uaccess, sched/preempt: Verify access_ok() context	2016-12-06 10:32:40 +01:00
unaligned.h
unistd.h	x86/syscalls: Add compat_sys_preadv64v2/compat_sys_pwritev64v2	2016-07-15 10:30:26 +02:00
unwind.h	x86/unwind: Dump stack data on warnings	2016-12-19 11:47:05 +01:00
uprobes.h
user32.h
user_32.h
user_64.h
user.h
vdso.h	x86/arch_prctl/vdso: Add ARCH_MAP_VDSO_*	2016-09-14 21:28:09 +02:00
vga.h
vgtod.h	clocksource: Use a plain u64 instead of cycle_t	2016-12-25 11:04:12 +01:00
virtext.h	x86/kvm/svm: Simplify cpu_has_svm()	2016-06-16 00:04:31 +02:00
vm86.h
vmx.h	kvm: x86: mmu: Rename EPT_VIOLATION_READ/WRITE/INSTR constants	2017-01-27 15:46:38 +01:00
vsyscall.h
vvar.h
word-at-a-time.h
x2apic.h
x86_init.h	x86/init: Fix a couple of comment typos	2016-12-19 11:34:16 +01:00
xor_32.h	x86/cpufeature: Replace cpu_has_xmm with boot_cpu_has() usage	2016-04-13 11:37:40 +02:00
xor_64.h
xor_avx.h	x86/cpufeature: Replace cpu_has_avx with boot_cpu_has() usage	2016-04-13 11:37:40 +02:00
xor.h