Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

Conflicts: include/asm-x86/dma-mapping.h include/asm-x86/gpio.h include/asm-x86/idle.h include/asm-x86/kvm_host.h include/asm-x86/namei.h include/asm-x86/uaccess.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-26 18:16:26 +00:00 · 2008-10-06 16:15:57 +02:00 · 2008-10-06 16:15:57 +02:00 · b8cd9d056b
commit b8cd9d056b
parent fec6ed1d1f 1503af6619
285 changed files with 849 additions and 849 deletions
--- a/include/asm-x86/a.out-core.h
+++ b/include/asm-x86/a.out-core.h
--- a/include/asm-x86/a.out.h
+++ b/include/asm-x86/a.out.h
--- a/include/asm-x86/acpi.h
+++ b/include/asm-x86/acpi.h
--- a/include/asm-x86/agp.h
+++ b/include/asm-x86/agp.h
--- a/include/asm-x86/alternative.h
+++ b/include/asm-x86/alternative.h
--- a/include/asm-x86/amd_iommu.h
+++ b/include/asm-x86/amd_iommu.h
--- a/include/asm-x86/amd_iommu_types.h
+++ b/include/asm-x86/amd_iommu_types.h
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
--- a/include/asm-x86/apicdef.h
+++ b/include/asm-x86/apicdef.h
--- a/include/asm-x86/arch_hooks.h
+++ b/include/asm-x86/arch_hooks.h
--- a/include/asm-x86/asm.h
+++ b/include/asm-x86/asm.h
--- a/include/asm-x86/atomic_32.h
+++ b/include/asm-x86/atomic_32.h
--- a/include/asm-x86/atomic_64.h
+++ b/include/asm-x86/atomic_64.h
--- a/include/asm-x86/auxvec.h
+++ b/include/asm-x86/auxvec.h
--- a/include/asm-x86/bios_ebda.h
+++ b/include/asm-x86/bios_ebda.h
--- a/include/asm-x86/bitops.h
+++ b/include/asm-x86/bitops.h
--- a/include/asm-x86/boot.h
+++ b/include/asm-x86/boot.h
--- a/include/asm-x86/bootparam.h
+++ b/include/asm-x86/bootparam.h
--- a/include/asm-x86/bug.h
+++ b/include/asm-x86/bug.h
--- a/include/asm-x86/bugs.h
+++ b/include/asm-x86/bugs.h
--- a/include/asm-x86/byteorder.h
+++ b/include/asm-x86/byteorder.h
--- a/include/asm-x86/cache.h
+++ b/include/asm-x86/cache.h
--- a/include/asm-x86/cacheflush.h
+++ b/include/asm-x86/cacheflush.h
--- a/include/asm-x86/calgary.h
+++ b/include/asm-x86/calgary.h
--- a/include/asm-x86/checksum_32.h
+++ b/include/asm-x86/checksum_32.h
--- a/include/asm-x86/checksum_64.h
+++ b/include/asm-x86/checksum_64.h
--- a/include/asm-x86/cmpxchg_32.h
+++ b/include/asm-x86/cmpxchg_32.h
--- a/include/asm-x86/cmpxchg_64.h
+++ b/include/asm-x86/cmpxchg_64.h
--- a/include/asm-x86/compat.h
+++ b/include/asm-x86/compat.h
--- a/include/asm-x86/cpu.h
+++ b/include/asm-x86/cpu.h
--- a/include/asm-x86/cpufeature.h
+++ b/include/asm-x86/cpufeature.h
--- a/include/asm-x86/current.h
+++ b/include/asm-x86/current.h
--- a/include/asm-x86/debugreg.h
+++ b/include/asm-x86/debugreg.h
--- a/include/asm-x86/delay.h
+++ b/include/asm-x86/delay.h
--- a/include/asm-x86/desc.h
+++ b/include/asm-x86/desc.h
--- a/include/asm-x86/desc_defs.h
+++ b/include/asm-x86/desc_defs.h
--- a/include/asm-x86/device.h
+++ b/include/asm-x86/device.h
--- a/include/asm-x86/div64.h
+++ b/include/asm-x86/div64.h
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
--- a/include/asm-x86/dma.h
+++ b/include/asm-x86/dma.h
--- a/include/asm-x86/dmi.h
+++ b/include/asm-x86/dmi.h
--- a/include/asm-x86/ds.h
+++ b/include/asm-x86/ds.h
--- a/include/asm-x86/dwarf2.h
+++ b/include/asm-x86/dwarf2.h
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
--- a/include/asm-x86/edac.h
+++ b/include/asm-x86/edac.h
--- a/include/asm-x86/efi.h
+++ b/include/asm-x86/efi.h
--- a/include/asm-x86/elf.h
+++ b/include/asm-x86/elf.h
--- a/include/asm-x86/emergency-restart.h
+++ b/include/asm-x86/emergency-restart.h
--- a/include/asm-x86/fb.h
+++ b/include/asm-x86/fb.h
--- a/include/asm-x86/fixmap.h
+++ b/include/asm-x86/fixmap.h
--- a/include/asm-x86/fixmap_32.h
+++ b/include/asm-x86/fixmap_32.h
--- a/include/asm-x86/fixmap_64.h
+++ b/include/asm-x86/fixmap_64.h
--- a/include/asm-x86/floppy.h
+++ b/include/asm-x86/floppy.h
--- a/include/asm-x86/ftrace.h
+++ b/include/asm-x86/ftrace.h
--- a/include/asm-x86/futex.h
+++ b/include/asm-x86/futex.h
--- a/include/asm-x86/gart.h
+++ b/include/asm-x86/gart.h
--- a/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
--- a/include/asm-x86/genapic_64.h
+++ b/include/asm-x86/genapic_64.h
--- a/include/asm-x86/geode.h
+++ b/include/asm-x86/geode.h
--- a/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
--- a/include/asm-x86/hardirq_32.h
+++ b/include/asm-x86/hardirq_32.h
--- a/include/asm-x86/hardirq_64.h
+++ b/include/asm-x86/hardirq_64.h
--- a/include/asm-x86/highmem.h
+++ b/include/asm-x86/highmem.h
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
--- a/include/asm-x86/hugetlb.h
+++ b/include/asm-x86/hugetlb.h
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
--- a/include/asm-x86/hypertransport.h
+++ b/include/asm-x86/hypertransport.h
--- a/include/asm-x86/i387.h
+++ b/include/asm-x86/i387.h
--- a/include/asm-x86/i8253.h
+++ b/include/asm-x86/i8253.h
--- a/include/asm-x86/i8259.h
+++ b/include/asm-x86/i8259.h
--- a/include/asm-x86/ia32.h
+++ b/include/asm-x86/ia32.h
--- a/include/asm-x86/ia32_unistd.h
+++ b/include/asm-x86/ia32_unistd.h
--- a/include/asm-x86/idle.h
+++ b/include/asm-x86/idle.h
--- a/include/asm-x86/intel_arch_perfmon.h
+++ b/include/asm-x86/intel_arch_perfmon.h
--- a/include/asm-x86/io.h
+++ b/include/asm-x86/io.h
--- a/include/asm-x86/io_32.h
+++ b/include/asm-x86/io_32.h
--- a/include/asm-x86/io_64.h
+++ b/include/asm-x86/io_64.h
--- a/include/asm-x86/io_apic.h
+++ b/include/asm-x86/io_apic.h
--- a/include/asm-x86/ioctls.h
+++ b/include/asm-x86/ioctls.h
--- a/include/asm-x86/iommu.h
+++ b/include/asm-x86/iommu.h
--- a/include/asm-x86/ipcbuf.h
+++ b/include/asm-x86/ipcbuf.h
--- a/include/asm-x86/ipi.h
+++ b/include/asm-x86/ipi.h
--- a/include/asm-x86/irq.h
+++ b/include/asm-x86/irq.h
--- a/include/asm-x86/irq_regs_32.h
+++ b/include/asm-x86/irq_regs_32.h
--- a/include/asm-x86/irq_vectors.h
+++ b/include/asm-x86/irq_vectors.h
--- a/include/asm-x86/ist.h
+++ b/include/asm-x86/ist.h
--- a/include/asm-x86/k8.h
+++ b/include/asm-x86/k8.h
--- a/include/asm-x86/kdebug.h
+++ b/include/asm-x86/kdebug.h
--- a/include/asm-x86/kexec.h
+++ b/include/asm-x86/kexec.h
--- a/include/asm-x86/kgdb.h
+++ b/include/asm-x86/kgdb.h
--- a/include/asm-x86/kmap_types.h
+++ b/include/asm-x86/kmap_types.h
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
--- a/include/asm-x86/kvm.h
+++ b/include/asm-x86/kvm.h
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
--- a/include/asm-x86/kvm_para.h
+++ b/include/asm-x86/kvm_para.h
--- a/include/asm-x86/kvm_x86_emulate.h
+++ b/include/asm-x86/kvm_x86_emulate.h
--- a/include/asm-x86/ldt.h
+++ b/include/asm-x86/ldt.h
--- a/include/asm-x86/lguest.h
+++ b/include/asm-x86/lguest.h
--- a/include/asm-x86/lguest_hcall.h
+++ b/include/asm-x86/lguest_hcall.h
--- a/include/asm-x86/linkage.h
+++ b/include/asm-x86/linkage.h
--- a/Show more
+++ b/Show more