diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-03-23 19:41:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 22:46:10 -0400 |
commit | 5140a357ea77527f4a93c5846217417658fdb35d (patch) | |
tree | a7df66f84e40d739dc00c50976954adbc4d6a761 | |
parent | 135a9fcf45f8d41b4ab008114792f4f6c6572675 (diff) |
kvm: stop including asm-generic/bitops/le.h directly
asm-generic/bitops/le.h is only intended to be included directly from
asm-generic/bitops/ext2-non-atomic.h or asm-generic/bitops/minix-le.h
which implements generic ext2 or minix bit operations.
This stops including asm-generic/bitops/le.h directly and use ext2
non-atomic bit operations instead.
It seems odd to use ext2_set_bit() on kvm, but it will replaced with
__set_bit_le() after introducing little endian bit operations for all
architectures. This indirect step is necessary to maintain bisectability
for some architectures which have their own little-endian bit operations.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1fa0d292119a..5e6dd4a6cbc5 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -52,7 +52,6 @@ | |||
52 | #include <asm/io.h> | 52 | #include <asm/io.h> |
53 | #include <asm/uaccess.h> | 53 | #include <asm/uaccess.h> |
54 | #include <asm/pgtable.h> | 54 | #include <asm/pgtable.h> |
55 | #include <asm-generic/bitops/le.h> | ||
56 | 55 | ||
57 | #include "coalesced_mmio.h" | 56 | #include "coalesced_mmio.h" |
58 | #include "async_pf.h" | 57 | #include "async_pf.h" |
@@ -1439,7 +1438,7 @@ void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot, | |||
1439 | if (memslot && memslot->dirty_bitmap) { | 1438 | if (memslot && memslot->dirty_bitmap) { |
1440 | unsigned long rel_gfn = gfn - memslot->base_gfn; | 1439 | unsigned long rel_gfn = gfn - memslot->base_gfn; |
1441 | 1440 | ||
1442 | generic___set_le_bit(rel_gfn, memslot->dirty_bitmap); | 1441 | ext2_set_bit(rel_gfn, memslot->dirty_bitmap); |
1443 | } | 1442 | } |
1444 | } | 1443 | } |
1445 | 1444 | ||