diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-16 00:12:55 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-16 00:12:55 +0400 |
| commit | f741656d646f7a5b56ba86765205b954237e7956 (patch) | |
| tree | 8ff5072258e72929ea1ef311d33a765e0aeb35e8 /drivers/xen | |
| parent | ac89758697195a8155f3861a34f0b41c6e562fcb (diff) | |
| parent | e9daff24a266307943457086533041bd971d0ef9 (diff) | |
| download | linux-f741656d646f7a5b56ba86765205b954237e7956.tar.xz | |
Merge tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull xen fixes from Konrad Rzeszutek Wilk:
"Two fixes:
- A simple bug-fix for redundant NULL check.
- CVE-2013-0228/XSA-42: x86/xen: don't assume %ds is usable in
xen_iret for 32-bit PVOPS
and two reverts:
- Revert the PVonHVM kexec. The patch introduces a regression with
older hypervisor stacks, such as Xen 4.1."
* tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
Revert "xen PVonHVM: use E820_Reserved area for shared_info"
Revert "xen/PVonHVM: fix compile warning in init_hvm_pv_info"
xen: remove redundant NULL check before unregister_and_remove_pcpu().
x86/xen: don't assume %ds is usable in xen_iret for 32-bit PVOPS.
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/pcpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/xen/pcpu.c b/drivers/xen/pcpu.c index 067fcfa1723e..5a27a4599a4a 100644 --- a/drivers/xen/pcpu.c +++ b/drivers/xen/pcpu.c @@ -278,8 +278,7 @@ static int sync_pcpu(uint32_t cpu, uint32_t *max_cpu) * Only those at cpu present map has its sys interface. */ if (info->flags & XEN_PCPU_FLAGS_INVALID) { - if (pcpu) - unregister_and_remove_pcpu(pcpu); + unregister_and_remove_pcpu(pcpu); return 0; } |