Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / arch / x86 / include / asm / vsyscall.h

diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
index eaea1d3..143e98b 100644 (file)
--- a/arch/x86/include/asm/vsyscall.h
+++ b/arch/x86/include/asm/vsyscall.h
@@ -22,6 +22,7 @@ enum vsyscall_num {
 /* kernel space (writeable) */
 extern int vgetcpu_mode;
 extern struct timezone sys_tz;
 /* kernel space (writeable) */
 extern int vgetcpu_mode;
 extern struct timezone sys_tz;

+extern unsigned long vsyscall_pgprot;

 
 #include <asm/vvar.h>
 
 
 #include <asm/vvar.h>