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>

diff --cc include/asm-x86/acpi.h
Simple merge

diff --cc include/asm-x86/amd_iommu_types.h
Simple merge

diff --cc include/asm-x86/atomic_64.h
Simple merge

diff --cc include/asm-x86/cpufeature.h
Simple merge

diff --cc include/asm-x86/device.h
Simple merge

diff --cc include/asm-x86/dma-mapping.h
index ad9cd6d,71b6f7d..5d200e7
--- 1/include/asm-x86/dma-mapping.h
--- 2/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@@ -249,5 -212,25 +249,5 @@@ static inline int dma_get_cache_alignme
  
  #define dma_is_consistent(d, h)       (1)
  
 -#ifdef CONFIG_X86_32
 -#  define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
 -struct dma_coherent_mem {
 -      void            *virt_base;
 -      u32             device_base;
 -      int             size;
 -      int             flags;
 -      unsigned long   *bitmap;
 -};
 -
 -extern int
 -dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
 -                          dma_addr_t device_addr, size_t size, int flags);
 -
 -extern void
 -dma_release_declared_memory(struct device *dev);
 -
 -extern void *
 -dma_mark_declared_memory_occupied(struct device *dev,
 -                                dma_addr_t device_addr, size_t size);
 -#endif /* CONFIG_X86_32 */
 +#include <asm-generic/dma-coherent.h>
- #endif
+ #endif /* ASM_X86__DMA_MAPPING_H */

diff --cc include/asm-x86/efi.h
Simple merge

diff --cc include/asm-x86/genapic_32.h
index 754d635,4904c67..34280f0
--- 1/include/asm-x86/genapic_32.h
--- 2/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
@@@ -118,7 -118,6 +118,7 @@@ enum uv_system_type {UV_NONE, UV_LEGACY
  #define get_uv_system_type()          UV_NONE
  #define is_uv_system()                        0
  #define uv_wakeup_secondary(a, b)     1
 +#define uv_system_init()              do {} while (0)
  
  
- #endif
+ #endif /* ASM_X86__GENAPIC_32_H */

diff --cc include/asm-x86/genapic_64.h
Simple merge

diff --cc include/asm-x86/geode.h
Simple merge

diff --cc include/asm-x86/gpio.h
index c4c91b3,f9e8f89..497fb98
--- 1/include/asm-x86/gpio.h
--- 2/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@@ -53,4 -57,6 +53,4 @@@ static inline int irq_to_gpio(unsigned 
  
  #endif /* CONFIG_GPIOLIB */
  
- #endif /* _ASM_I386_GPIO_H */
 -#endif /* CONFIG_X86_RDC321X */
 -
+ #endif /* ASM_X86__GPIO_H */

diff --cc include/asm-x86/hw_irq.h
Simple merge

diff --cc include/asm-x86/i387.h
Simple merge

diff --cc include/asm-x86/idle.h
index cbb6491,dc9c794..baa3f78
--- 1/include/asm-x86/idle.h
--- 2/include/asm-x86/idle.h
+++ b/include/asm-x86/idle.h
@@@ -10,6 -10,4 +10,6 @@@ void idle_notifier_register(struct noti
  void enter_idle(void);
  void exit_idle(void);
  
- #endif
 +void c1e_remove_cpu(int cpu);
 +
+ #endif /* ASM_X86__IDLE_H */

diff --cc include/asm-x86/io.h
Simple merge

diff --cc include/asm-x86/iommu.h
Simple merge

diff --cc include/asm-x86/irq_vectors.h
Simple merge

diff --cc include/asm-x86/kexec.h
Simple merge

diff --cc include/asm-x86/kgdb.h
Simple merge

diff --cc include/asm-x86/kvm_host.h
index c2e34c2,920823d..6979454
--- 1/include/asm-x86/kvm_host.h
--- 2/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@@ -731,8 -728,4 +731,8 @@@ asmlinkage void kvm_handle_fault_on_reb
        KVM_EX_ENTRY " 666b, 667b \n\t" \
        ".popsection"
  
- #endif
 +#define KVM_ARCH_WANT_MMU_NOTIFIER
 +int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
 +int kvm_age_hva(struct kvm *kvm, unsigned long hva);
 +
+ #endif /* ASM_X86__KVM_HOST_H */

diff --cc include/asm-x86/mach-summit/mach_apic.h
Simple merge

diff --cc include/asm-x86/mce.h
Simple merge

diff --cc include/asm-x86/mman.h
Simple merge

diff --cc include/asm-x86/mmconfig.h
Simple merge

diff --cc include/asm-x86/mmzone_32.h
Simple merge

diff --cc include/asm-x86/msr.h
Simple merge

diff --cc include/asm-x86/percpu.h
Simple merge

diff --cc include/asm-x86/pgtable.h
Simple merge

diff --cc include/asm-x86/pgtable_64.h
Simple merge

diff --cc include/asm-x86/processor.h
Simple merge

diff --cc include/asm-x86/required-features.h
Simple merge

diff --cc include/asm-x86/spinlock.h
Simple merge

diff --cc include/asm-x86/swiotlb.h
Simple merge

diff --cc include/asm-x86/uaccess.h
index 5f702d1,1838f39..48ebc0a
--- 1/include/asm-x86/uaccess.h
--- 2/include/asm-x86/uaccess.h
+++ b/include/asm-x86/uaccess.h
@@@ -450,5 -450,4 +450,5 @@@ extern struct movsl_mask 
  # include "uaccess_64.h"
  #endif
  
- #endif
+ #endif /* ASM_X86__UACCESS_H */
 +

diff --cc include/asm-x86/uaccess_64.h
Simple merge

diff --cc include/asm-x86/uv/uv_bau.h
Simple merge

diff --cc include/asm-x86/xen/hypervisor.h
Simple merge