summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 01:14:58 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 01:14:58 +0200
commite33ab8f275cf6e0e0bf6c9c44149de46222b36cc (patch)
treee0f1117cb4295bc99593f4850c9257d22bd37c4a /drivers/xen
parentMerge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git:/... (diff)
parentxen: do not clear and mask evtchns in __xen_evtchn_do_upcall (diff)
parentxen/p2m: Create entries in the P2M_MFN trees's to track 1-1 mappings (diff)
parentxen/setup: Fix for incorrect xen_extra_mem_start initialization under 32-bit (diff)
parentxen mmu: fix a race window causing leave_mm BUG() (diff)
downloadlinux-e33ab8f275cf6e0e0bf6c9c44149de46222b36cc.tar.xz
linux-e33ab8f275cf6e0e0bf6c9c44149de46222b36cc.zip
Merge branches 'stable/irq', 'stable/p2m.bugfixes', 'stable/e820.bugfixes' and 'stable/mmu.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/irq' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: do not clear and mask evtchns in __xen_evtchn_do_upcall * 'stable/p2m.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/p2m: Create entries in the P2M_MFN trees's to track 1-1 mappings * 'stable/e820.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/setup: Fix for incorrect xen_extra_mem_start initialization under 32-bit xen/setup: Ignore E820_UNUSABLE when setting 1-1 mappings. * 'stable/mmu.bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen mmu: fix a race window causing leave_mm BUG()