Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  x86: canonicalize remaining header guards
  x86: drop double underscores from header guards
  x86: Fix ASM_X86__ header guards
  x86, um: get rid of uml-config.h
  x86, um: get rid of arch/um/Kconfig.arch
  x86, um: get rid of arch/um/os symlink
  x86, um: get rid of excessive includes of uml-config.h
  x86, um: get rid of header symlinks
  x86, um: merge Kconfig.i386 and Kconfig.x86_64
  x86, um: get rid of sysdep symlink
  x86, um: trim the junk from uml ptrace-*.h
  x86, um: take vm-flags.h to sysdep
  x86, um: get rid of uml asm/arch
  x86, um: get rid of uml highmem.h
  x86, um: get rid of uml unistd.h
  x86, um: get rid of system.h -> system.h include
  x86, um: uml atomic.h is not needed anymore
  x86, um: untangle uml ldt.h
  x86, um: get rid of more uml asm/arch uses
  x86, um: remove dead header (uml module-generic.h; never used these days)
  ...

diff --combined arch/x86/include/asm/idle.h
index 32227f0188dde8ef9d7de11f845a5d79c8b97953,8ed93761a74f75a34d30f6e2fe8ca6fbf63db388..44c89c3a23e9a1f9507536b4d84f0f6b3d225c61
--- 1/include/asm-x86/idle.h
--- 2/arch/x86/include/asm/idle.h
+++ b/arch/x86/include/asm/idle.h
@@@ -1,16 -1,15 +1,16 @@@
- #ifndef ASM_X86__IDLE_H
- #define ASM_X86__IDLE_H
+ #ifndef _ASM_X86_IDLE_H
+ #define _ASM_X86_IDLE_H
  
  #define IDLE_START 1
  #define IDLE_END 2
  
  struct notifier_block;
  void idle_notifier_register(struct notifier_block *n);
 +void idle_notifier_unregister(struct notifier_block *n);
  
  void enter_idle(void);
  void exit_idle(void);
  
  void c1e_remove_cpu(int cpu);
  
- #endif /* ASM_X86__IDLE_H */
+ #endif /* _ASM_X86_IDLE_H */

diff --combined arch/x86/include/asm/iommu.h
index 2daaffcda52f86df2c04d6359674dfb8511723fc,0c770f8aa002d69c21ec13b9b4745cc70e82260e..98e28ea8cd167afb5c1bf8bd3a04f320365e2edf
--- 1/include/asm-x86/iommu.h
--- 2/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@@ -1,5 -1,5 +1,5 @@@
- #ifndef ASM_X86__IOMMU_H
- #define ASM_X86__IOMMU_H
+ #ifndef _ASM_X86_IOMMU_H
+ #define _ASM_X86_IOMMU_H
  
  extern void pci_iommu_shutdown(void);
  extern void no_iommu_init(void);
@@@ -7,13 -7,9 +7,13 @@@ extern struct dma_mapping_ops nommu_dma
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int dmar_disabled;
 +extern int forbid_dac;
  
  extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);
  
 +/* 10 seconds */
 +#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
 +
  #ifdef CONFIG_GART_IOMMU
  extern int gart_iommu_aperture;
  extern int gart_iommu_aperture_allowed;
@@@ -47,4 -43,4 +47,4 @@@ static inline void gart_iommu_hole_init
  }
  #endif
  
- #endif /* ASM_X86__IOMMU_H */
+ #endif /* _ASM_X86_IOMMU_H */