Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 356794
b: refs/heads/master
c: e11ae1a
h: refs/heads/master
v: v3
  • Loading branch information
Gleb Natapov authored and Marcelo Tosatti committed Dec 15, 2012
1 parent a031d82 commit d49cec5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f888f5acd0cd806d4fd9f4067276b3855a13309
refs/heads/master: e11ae1a102b46f76441e328a2743ae5d6e201423
4 changes: 0 additions & 4 deletions trunk/arch/x86/kvm/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ EXPORT_SYMBOL(kvm_cpu_has_pending_timer);
*/
int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
{
struct kvm_pic *s;

if (!irqchip_in_kernel(v->kvm))
return v->arch.interrupt.pending;

Expand All @@ -60,8 +58,6 @@ EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);
*/
int kvm_cpu_get_interrupt(struct kvm_vcpu *v)
{
struct kvm_pic *s;

if (!irqchip_in_kernel(v->kvm))
return v->arch.interrupt.nr;

Expand Down

0 comments on commit d49cec5

Please sign in to comment.