Commit 5140a357 authored Mar 23, 2011 by Akinobu Mita Committed by Linus Torvalds Mar 23, 2011

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>

parent 135a9fcf

virt/kvm/kvm_main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@
		#include <asm/io.h>
		#include <asm/uaccess.h>
		#include <asm/pgtable.h>
		#include <asm-generic/bitops/le.h>

		#include "coalesced_mmio.h"
		#include "async_pf.h"
		@@ -1439,7 +1438,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;

		generic___set_le_bit(rel_gfn, memslot->dirty_bitmap);
		ext2_set_bit(rel_gfn, memslot->dirty_bitmap);
		}
		}

Admin message