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 branch 'for-upstream' of git://openrisc.net/jonas/linux
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
paravirt.c
diff --git
a/arch/ia64/kernel/paravirt.c
b/arch/ia64/kernel/paravirt.c
index
a21d7bb
..
1008682
100644
(file)
--- a/
arch/ia64/kernel/paravirt.c
+++ b/
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)