diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-28 18:15:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-28 18:15:33 -0800 |
| commit | 6c334f4f6aeb0916bfc15ff731073e9f24de0189 (patch) | |
| tree | 6e3140bdca215b1b5a74a8856458e753186979fb /drivers | |
| parent | 67d2433ee7aa631bc3ab14c2af6bbc1d44d13a00 (diff) | |
| parent | 69e8f430e243d657c2053f097efebc2e2cd559f0 (diff) | |
| download | linux-6c334f4f6aeb0916bfc15ff731073e9f24de0189.tar.gz linux-6c334f4f6aeb0916bfc15ff731073e9f24de0189.tar.bz2 linux-6c334f4f6aeb0916bfc15ff731073e9f24de0189.zip | |
Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/granttable: Disable grant v2 for HVM domains.
x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/grant-table.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 1cd94daa71db..b4d4eac761db 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -948,9 +948,12 @@ static void gnttab_request_version(void) int rc; struct gnttab_set_version gsv; - gsv.version = 2; + if (xen_hvm_domain()) + gsv.version = 1; + else + gsv.version = 2; rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1); - if (rc == 0) { + if (rc == 0 && gsv.version == 2) { grant_table_version = 2; gnttab_interface = &gnttab_v2_ops; } else if (grant_table_version == 2) { |