diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-21 12:06:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-21 12:06:54 -0700 |
| commit | 8ca7de91640a9840a0d29021d17492be7fd8232b (patch) | |
| tree | 4f6df5e453f36737b7ac1ec75118aa5aaf7f7243 /include | |
| parent | e05e279e6fc940a2adb9d4d4bf2b814dfc286176 (diff) | |
| parent | bd49940a35ec7d488ae63bd625639893b3385b97 (diff) | |
| download | linux-stable-8ca7de91640a9840a0d29021d17492be7fd8232b.tar.gz linux-stable-8ca7de91640a9840a0d29021d17492be7fd8232b.tar.bz2 linux-stable-8ca7de91640a9840a0d29021d17492be7fd8232b.zip | |
Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
- Fix M2P batching re-using the incorrect structure field.
In v3.5 we added batching for M2P override (Machine Frame Number ->
Physical Frame Number), but the original MFN was saved in an
incorrect structure - and we would oops/restore when restoring with
the old MFN.
- Disable BIOS SMP MP table search.
A bootup issue that we had ignored until we found that on DL380 G6 it
was needed.
* tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/boot: Disable BIOS SMP MP table search.
xen/m2p: do not reuse kmap_op->dev_bus_addr
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/grant_table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 11e27c3af3cb..f19fff8650e9 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h @@ -187,6 +187,7 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, struct gnttab_map_grant_ref *kmap_ops, struct page **pages, unsigned int count); int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, - struct page **pages, unsigned int count, bool clear_pte); + struct gnttab_map_grant_ref *kunmap_ops, + struct page **pages, unsigned int count); #endif /* __ASM_GNTTAB_H__ */ |