OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[uclinux-h8/linux.git]
/
arch
/
powerpc
/
kvm
/
book3s_hv.c
diff --git
a/arch/powerpc/kvm/book3s_hv.c
b/arch/powerpc/kvm/book3s_hv.c
index
9c26c5a
..
54b45b7
100644
(file)
--- a/
arch/powerpc/kvm/book3s_hv.c
+++ b/
arch/powerpc/kvm/book3s_hv.c
@@
-2019,7
+2019,7
@@
static bool can_split_piggybacked_subcores(struct core_info *cip)
return false;
n_subcores += (cip->subcore_threads[sub] - 1) >> 1;
}
- if (
n_subcores > 3 || large_sub < 0
)
+ if (
large_sub < 0 || !subcore_config_ok(n_subcores + 1, 2)
)
return false;
/*