diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 13:40:41 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 13:40:49 +0000 |
commit | 96a3eab338c01e172745b1686c51c1be96ce9ead (patch) | |
tree | 5a53947a192549d9edf63550258e1bddf6f1d794 /virt/kvm/kvm_main.c | |
parent | b01ee53dda8bd81855b7cda0dfb7f27d1524d87f (diff) | |
parent | a5a928c51f807262a13e6e3412e0e1324f6b7aeb (diff) |
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
* 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)
ARM: Remove redundant ';' from avic_irq_set_priority()
ARM: mx3: Let mx31 and mx35 share the same CCM header file
ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's
Update to v3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 7287bf5d1c9e..a91f980077d8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1543,7 +1543,7 @@ void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot, if (memslot && memslot->dirty_bitmap) { unsigned long rel_gfn = gfn - memslot->base_gfn; - if (!__test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap)) + if (!test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap)) memslot->nr_dirty_pages++; } } |