git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.28-rc7' into core/locking
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
xen
/
xen-ops.h
diff --git
a/arch/x86/xen/xen-ops.h
b/arch/x86/xen/xen-ops.h
index d7422dc2a55c33fd1a77cee38fc877110ff3a24e..9e1afae8461f1eabc04e625c06d9ef329a73b8f2 100644
(file)
--- a/
arch/x86/xen/xen-ops.h
+++ b/
arch/x86/xen/xen-ops.h
@@
-49,7
+49,7
@@
bool xen_vcpu_stolen(int vcpu);
void xen_mark_init_mm_pinned(void);
void xen_mark_init_mm_pinned(void);
-void
__init
xen_setup_vcpu_info_placement(void);
+void xen_setup_vcpu_info_placement(void);
#ifdef CONFIG_SMP
void xen_smp_init(void);
#ifdef CONFIG_SMP
void xen_smp_init(void);