| Message ID | 1361389302-11968-2-git-send-email-khilman@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 20, 2013 at 11:41:38AM -0800, Kevin Hilman wrote: > So that it can build on !KVM systems too. > > Signed-off-by: Kevin Hilman <khilman@linaro.org> > --- > kernel/context_tracking.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c > index 74f68f4..6fe96b1 100644 > --- a/kernel/context_tracking.c > +++ b/kernel/context_tracking.c > @@ -1,5 +1,7 @@ > #include <linux/context_tracking.h> > +#ifdef CONFIG_KVM > #include <linux/kvm_host.h> > +#endif The header should take care of the off-case, no need to ifdef its inclusion. > #include <linux/rcupdate.h> > #include <linux/sched.h> > #include <linux/hardirq.h> > @@ -62,6 +64,7 @@ void user_exit(void) > local_irq_restore(flags); > } > > +#ifdef CONFIG_KVM > void guest_enter(void) > { > if (vtime_accounting_enabled()) > @@ -79,6 +82,7 @@ void guest_exit(void) > __guest_exit(); > } > EXPORT_SYMBOL_GPL(guest_exit); > +#endif Kvm might be built as a module so we can't actually do this unfortunately. Thanks. > > void context_tracking_task_switch(struct task_struct *prev, > struct task_struct *next) > -- > 1.8.1.2 >
diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 74f68f4..6fe96b1 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -1,5 +1,7 @@ #include <linux/context_tracking.h> +#ifdef CONFIG_KVM #include <linux/kvm_host.h> +#endif #include <linux/rcupdate.h> #include <linux/sched.h> #include <linux/hardirq.h> @@ -62,6 +64,7 @@ void user_exit(void) local_irq_restore(flags); } +#ifdef CONFIG_KVM void guest_enter(void) { if (vtime_accounting_enabled()) @@ -79,6 +82,7 @@ void guest_exit(void) __guest_exit(); } EXPORT_SYMBOL_GPL(guest_exit); +#endif void context_tracking_task_switch(struct task_struct *prev, struct task_struct *next)
So that it can build on !KVM systems too. Signed-off-by: Kevin Hilman <khilman@linaro.org> --- kernel/context_tracking.c | 4 ++++ 1 file changed, 4 insertions(+)