From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 6 Oct 2008 14:15:57 +0000 (+0200)
Subject: Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
X-Git-Tag: v2.6.28-rc1~734^2~4
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0;p=linux-2.6-omap-h63xx.git

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>
---

b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0
diff --cc include/asm-x86/dma-mapping.h
index ad9cd6d49bf,71b6f7d22e9..5d200e78bd8
--- a/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/genapic_32.h
index 754d635f90f,4904c672e4f..34280f02766
--- a/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/gpio.h
index c4c91b37c10,f9e8f8918a9..497fb980d96
--- a/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/idle.h
index cbb64912361,dc9c7944847..baa3f783d27
--- a/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);
  
 +void c1e_remove_cpu(int cpu);
 +
- #endif
+ #endif /* ASM_X86__IDLE_H */
diff --cc include/asm-x86/kvm_host.h
index c2e34c27590,920823d53d6..69794547f51
--- a/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"
  
 +#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
+ #endif /* ASM_X86__KVM_HOST_H */
diff --cc include/asm-x86/uaccess.h
index 5f702d1d521,1838f3959a5..48ebc0ad40e
--- a/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 */
 +