git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
include
/
asm-sh
/
processor.h
diff --git
a/include/asm-sh/processor.h
b/include/asm-sh/processor.h
index
b7cba4e
..
4747738
100644
(file)
--- a/
include/asm-sh/processor.h
+++ b/
include/asm-sh/processor.h
@@
-276,5
+276,11
@@
static inline void prefetch(void *x)
#define prefetchw(x) prefetch(x)
#endif
+#ifdef CONFIG_VSYSCALL
+extern int vsyscall_init(void);
+#else
+#define vsyscall_init() do { } while (0)
+#endif
+
#endif /* __KERNEL__ */
#endif /* __ASM_SH_PROCESSOR_H */