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 --cc arch/x86/include/asm/idle.h
index 0000000000000000000000000000000000000000,8ed93761a74f75a34d30f6e2fe8ca6fbf63db388..44c89c3a23e9a1f9507536b4d84f0f6b3d225c61
mode 000000,100644..100644
--- /dev/null
--- 2/arch/x86/include/asm/idle.h
+++ b/arch/x86/include/asm/idle.h
@@@ -1,0 -1,15 +1,16 @@@
+ #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 */

diff --cc arch/x86/include/asm/iommu.h
index 0000000000000000000000000000000000000000,0c770f8aa002d69c21ec13b9b4745cc70e82260e..98e28ea8cd167afb5c1bf8bd3a04f320365e2edf
mode 000000,100644..100644
--- /dev/null
--- 2/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@@ -1,0 -1,46 +1,50 @@@
+ #ifndef _ASM_X86_IOMMU_H
+ #define _ASM_X86_IOMMU_H
+ 
+ extern void pci_iommu_shutdown(void);
+ extern void no_iommu_init(void);
+ extern struct dma_mapping_ops nommu_dma_ops;
+ 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;
+ extern int gart_iommu_aperture_disabled;
+ 
+ extern void early_gart_iommu_check(void);
+ extern void gart_iommu_init(void);
+ extern void gart_iommu_shutdown(void);
+ extern void __init gart_parse_options(char *);
+ extern void gart_iommu_hole_init(void);
+ 
+ #else
+ #define gart_iommu_aperture            0
+ #define gart_iommu_aperture_allowed    0
+ #define gart_iommu_aperture_disabled   1
+ 
+ static inline void early_gart_iommu_check(void)
+ {
+ }
+ static inline void gart_iommu_init(void)
+ {
+ }
+ static inline void gart_iommu_shutdown(void)
+ {
+ }
+ static inline void gart_parse_options(char *options)
+ {
+ }
+ static inline void gart_iommu_hole_init(void)
+ {
+ }
+ #endif
+ 
+ #endif /* _ASM_X86_IOMMU_H */