Thread (11 messages) 11 messages, 4 authors, 2008-12-23

Re: linux-next: manual merge of the kvm tree

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2008-12-22 21:41:48

On Mon, 2008-12-22 at 15:39 -0600, Hollis Blanchard wrote:
On Mon, 2008-12-22 at 16:13 +1100, Benjamin Herrenschmidt wrote:
quoted
On Mon, 2008-12-22 at 14:52 +1100, Stephen Rothwell wrote:
quoted
The former patch changes the _tlbia() to _tlbil_all() in
kvm_arch_vcpu_put().  The latter restructures this code.

I don't know enough to fix this up, so for today I have merely used the
kvm tree version.  Please come up with something better (if needed) and I
can use that as a merge resolution.
Hollis, can you have a look ? I suspect whatever is in the kvm tree is
ok, provided it doesn't use the old names such as _tlbia() or _tlbie()
which don't exist anymore for nohash...
I've stopped calling _tlbia() in KVM, so I think the easiest solution
would be to drop the KVM part of your patch, Ben.
Patch is in Paulus -next already so we'll have to do a manual resolve.
Also, you'll need to include ../mm/mmu_decl.h to get to _tlbil_* ..
sorry about that.

Cheers,
Ben.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help