Linux 2.6.27.34
Subsystems (6)
I'm announcing the release of the 2.6.27.34 kernel. All users of the 2.6.27 kernel series are very strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.27.33 and 2.6.27.34
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 +- drivers/net/e100.c | 2 +- fs/jffs2/wbuf.c | 10 ++++++++++ mm/slub.c | 4 ++-- net/core/net_namespace.c | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-)
Eric Dumazet (2):
net: net_assign_generic() fix
slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU
Greg Kroah-Hartman (1):
Linux 2.6.27.34
Krzysztof Hałasa (1):
E100: fix interaction with swiotlb on X86.
Massimo Cirillo (1):
JFFS2: add missing verify buffer allocation/deallocation
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .33 +EXTRAVERSION = .34 NAME = Trembling Tortoise # *DOCUMENTATION*
drivers/net/e100.c +1 -1
@@ -1842,7 +1842,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, nic->ru_running =RU_SUSPENDED ;pci_dma_sync_single_for_device (nic->pdev, rx->dma_addr,sizeof (struct rfd ), -PCI_DMA_BIDIRECTIONAL ); +PCI_DMA_FROMDEVICE );return -ENODATA ; }
fs/jffs2/wbuf.c +10 -0
@@ -1271,10 +1271,20 @@ int jffs2_nor_wbuf_flash_setup(struct jffs2_sb_info *c) {if (!c->wbuf)return -ENOMEM ; +#ifdef CONFIG_JFFS2_FS_WBUF_VERIFY + c->wbuf_verify =kmalloc (c->wbuf_pagesize,GFP_KERNEL ); +if (!c->wbuf_verify) { +kfree (c->wbuf); +return -ENOMEM ; + } +#endif return 0 ; }void jffs2_nor_wbuf_flash_cleanup (struct jffs2_sb_info *c) { +#ifdef CONFIG_JFFS2_FS_WBUF_VERIFY +kfree (c->wbuf_verify); +#endif kfree (c->wbuf); }
mm/slub.c +2 -2
@@ -2447,8 +2447,6 @@ static inline int kmem_cache_close(struct kmem_cache *s)*/ void kmem_cache_destroy (struct kmem_cache *s) { -if (s->flags &SLAB_DESTROY_BY_RCU ) -rcu_barrier ();down_write (&slub_lock); s->refcount--;if (!s->refcount) {
@@ -2459,6 +2457,8 @@ void kmem_cache_destroy(struct kmem_cache *s) "still has objects.\n", s->name, __func__);dump_stack (); } +if (s->flags &SLAB_DESTROY_BY_RCU ) +rcu_barrier ();sysfs_slab_remove (s); }else up_write (&slub_lock);
net/core/net_namespace.c +1 -1
@@ -446,7 +446,7 @@ int net_assign_generic(struct net *net, int id, void *data) ng->len = id;INIT_RCU_HEAD (&ng->rcu); -memcpy (&ng->ptr, &old_ng->ptr, old_ng->len); +memcpy (&ng->ptr, &old_ng->ptr, old_ng->len *sizeof (void *));rcu_assign_pointer (net->gen, ng);call_rcu (&old_ng->rcu, net_generic_release);