From 2c99bfc394de2d69d331119810785cd3ca75e826 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Mon, 11 Jul 2011 15:28:16 -0400 Subject: [PATCH] --- yaml --- r: 258085 b: refs/heads/master c: 747f2925836b678d2a0de980d70101fd35620f2a h: refs/heads/master i: 258083: 8dff6fc89a22f55ef8e7bd7ede64d21f6af2c7d6 v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/paravirt.h | 4 ++++ trunk/arch/ia64/kernel/paravirt.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e2525f99b0cd..79cfde2caafc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c404b578fab699c4708279938078d9404b255a4 +refs/heads/master: 747f2925836b678d2a0de980d70101fd35620f2a diff --git a/trunk/arch/ia64/include/asm/paravirt.h b/trunk/arch/ia64/include/asm/paravirt.h index 2eb0a981a09a..32551d304cd7 100644 --- a/trunk/arch/ia64/include/asm/paravirt.h +++ b/trunk/arch/ia64/include/asm/paravirt.h @@ -281,6 +281,10 @@ paravirt_init_missing_ticks_accounting(int cpu) pv_time_ops.init_missing_ticks_accounting(cpu); } +struct jump_label_key; +extern struct jump_label_key paravirt_steal_enabled; +extern struct jump_label_key paravirt_steal_rq_enabled; + static inline int paravirt_do_steal_accounting(unsigned long *new_itm) { diff --git a/trunk/arch/ia64/kernel/paravirt.c b/trunk/arch/ia64/kernel/paravirt.c index a21d7bb9c69c..100868216c55 100644 --- a/trunk/arch/ia64/kernel/paravirt.c +++ b/trunk/arch/ia64/kernel/paravirt.c @@ -634,6 +634,8 @@ struct pv_irq_ops pv_irq_ops = { * pv_time_ops * time operations */ +struct jump_label_key paravirt_steal_enabled; +struct jump_label_key paravirt_steal_rq_enabled; static int ia64_native_do_steal_accounting(unsigned long *new_itm)