diff options
| author | Linus Torvalds <[email protected]> | 2012-02-14 23:20:11 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-02-14 23:20:11 +0000 |
| commit | 694ce18ec3485f5b0a4f3820073f5e2b0b4e0870 (patch) | |
| tree | e979926df34b41e17024107ee4731739608d8b51 /arch/arm/include/asm/assembler.h | |
| parent | Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwa... (diff) | |
| parent | xenbus_dev: add missing error check to watch handling (diff) | |
| download | kernel-694ce18ec3485f5b0a4f3820073f5e2b0b4e0870.tar.gz kernel-694ce18ec3485f5b0a4f3820073f5e2b0b4e0870.zip | |
Merge tag 'stable/for-linus-fixes-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Two fixes for VCPU offlining; One to fix the string format exposed
by the xen-pci[front|back] to conform to the one used in majority of
PCI drivers; Two fixes to make the code more resilient to invalid
configurations.
Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
* tag 'stable/for-linus-fixes-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xenbus_dev: add missing error check to watch handling
xen/pci[front|back]: Use %d instead of %1x for displaying PCI devfn.
xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback
xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic.
xen/bootup: During bootup suppress XENBUS: Unable to read cpu state
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
0 files changed, 0 insertions, 0 deletions