diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 13:27:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 13:27:46 -0700 |
| commit | 50e6f8511a6b6a61611dae36794b5400cdc80ea1 (patch) | |
| tree | 07a73ce25a630f4a749215d0068612e0425e09e3 /drivers | |
| parent | 30f5f739266dc83c5512c0b496a1e93651668baa (diff) | |
| parent | b2c75c446ae72387916e2caf6e6dca815b6e5e6e (diff) | |
Merge tag 'stable/for-linus-3.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull xen fixes from Konrad Rzeszutek Wilk:
"Two bug-fixes for regressions:
- xen/tmem stopped working after a certain combination of
modprobe/swapon was used
- cpu online/offlining would trigger WARN_ON."
* tag 'stable/for-linus-3.10-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/tmem: Don't over-write tmem_frontswap_poolid after tmem_frontswap_init set it.
xen/smp: Fixup NOHZ per cpu data when onlining an offline CPU.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/tmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index cc072c66c76..0f0493c6337 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c @@ -379,10 +379,10 @@ static int xen_tmem_init(void) #ifdef CONFIG_FRONTSWAP if (tmem_enabled && frontswap) { char *s = ""; - struct frontswap_ops *old_ops = - frontswap_register_ops(&tmem_frontswap_ops); + struct frontswap_ops *old_ops; tmem_frontswap_poolid = -1; + old_ops = frontswap_register_ops(&tmem_frontswap_ops); if (IS_ERR(old_ops) || old_ops) { if (IS_ERR(old_ops)) return PTR_ERR(old_ops); |