From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Feb 2009 23:40:48 +0000 (+0100)
Subject: Merge branch 'x86/uaccess' into core/percpu
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/uaccess' into core/percpu
---

5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1
diff --cc arch/x86/include/asm/paravirt.h
index c85e7475e17,32bc6c2c138..ff691736f5e
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@@ -1466,13 -1387,8 +1466,11 @@@ static inline void __set_fixmap(unsigne
  }
  
  void _paravirt_nop(void);
 +u32 _paravirt_ident_32(u32);
 +u64 _paravirt_ident_64(u64);
 +
  #define paravirt_nop	((void *)_paravirt_nop)
  
- void paravirt_use_bytelocks(void);
- 
  #ifdef CONFIG_SMP
  
  static inline int __raw_spin_is_locked(struct raw_spinlock *lock)