| commit | 1cd731df09decfc7e9b4b86190efa262851f68e9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 05 16:01:11 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 05 16:01:11 2014 -0800 |
| tree | 2ce721ab61a4234820a3d33c08f3d868a484ef65 | |
| parent | 251aa0fddd6149e730737c8619862a0160b00a5a [diff] | |
| parent | afca50132cfa7bfc5646676d8c67dc18454f38f8 [diff] |
Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen fixes from Konrad Rzeszutek Wilk:
"Bug-fixes:
- Revert "xen/grant-table: Avoid m2p_override during mapping" as it
broke Xen ARM build.
- Fix CR4 not being set on AP processors in Xen PVH mode"
* tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/pvh: set CR4 flags for APs
Revert "xen/grant-table: Avoid m2p_override during mapping"