Linux 2.6.30.7
Subsystems (14)
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 30 -EXTRAVERSION = .6 +EXTRAVERSION = .7 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/sparc/include/asm/pgtable_64.h +9 -3
@@ -726,11 +726,17 @@ extern unsigned long pte_file(pte_t);extern pte_t pgoff_to_pte (unsigned long );#define PTE_FILE_MAX_BITS (64UL - PAGE_SHIFT - 1UL) -extern unsigned long *sparc64_valid_addr_bitmap; +extern unsigned long sparc64_valid_addr_bitmap[];/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ -#define kern_addr_valid (addr) \ - (test_bit(__pa((unsigned long)(addr))>>22, sparc64_valid_addr_bitmap)) +static inline bool kern_addr_valid (unsigned long addr) +{ +unsigned long paddr =__pa (addr); + +if ((paddr >>41UL ) !=0UL ) +return false; +return test_bit (paddr >>22 , sparc64_valid_addr_bitmap); +}extern int page_in_phys_avail (unsigned long paddr);
arch/sparc/kernel/irq_64.c +1 -1
@@ -902,7 +902,7 @@ void notrace init_irqwork_curcpu(void)* Therefore you cannot make any OBP calls, not even prom_printf, * from these two routines. */ -static void __cpuinit register_one_mondo (unsigned long paddr,unsigned long type,unsigned long qmask) +static void __cpuinit notrace register_one_mondo(unsigned long paddr, unsigned long type, unsigned long qmask) {unsigned long num_entries = (qmask +1 ) /64 ;unsigned long status;
arch/sparc/kernel/ktlb.S +38 -4
50 lines not on this page · raw message
arch/sparc/kernel/nmi.c +1 -1
@@ -103,7 +103,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) }if (!touched &&__get_cpu_var (last_irq_sum) == sum) {local_inc (&__get_cpu_var (alert_counter)); -if (local_read (&__get_cpu_var (alert_counter)) ==5 * nmi_hz) +if (local_read (&__get_cpu_var (alert_counter)) ==30 * nmi_hz)die_nmi ("BUG: NMI Watchdog detected LOCKUP" , regs, panic_on_timeout); }else {
arch/sparc/kernel/sys32.S +1 -1
@@ -134,7 +134,7 @@ SIGN1(sys32_getpeername, sys_getpeername, %o0) SIGN1(sys32_getsockname, sys_getsockname, %o0) SIGN2(sys32_ioprio_get, sys_ioprio_get, %o0, %o1) SIGN3(sys32_ioprio_set, sys_ioprio_set, %o0, %o1, %o2) -SIGN2(sys32_splice, sys_splice, %o0, %o1) +SIGN2(sys32_splice, sys_splice, %o0, %o2) SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5) SIGN2(sys32_tee, sys_tee, %o0, %o1) SIGN1(sys32_vmsplice, compat_sys_vmsplice, %o0)
arch/sparc/mm/init_64.c +24 -19
81 lines not on this page · raw message
arch/sparc/mm/init_64.h +5 -2
@@ -5,10 +5,13 @@* marked non-static so that assembler code can get at them. */ -#define MAX_PHYS_ADDRESS (1UL << 42UL) -#define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) +#define MAX_PHYS_ADDRESS (1UL << 41UL) +#define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL)#define KPTE_BITMAP_BYTES \ ((MAX_PHYS_ADDRESS / KPTE_BITMAP_CHUNK_SZ) / 8) +#define VALID_ADDR_BITMAP_CHUNK_SZ (4UL * 1024UL * 1024UL) +#define VALID_ADDR_BITMAP_BYTES \ + ((MAX_PHYS_ADDRESS / VALID_ADDR_BITMAP_CHUNK_SZ) / 8)extern unsigned long kern_linear_pte_xor[2 ];extern unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES /sizeof (unsigned long )];
arch/sparc/prom/misc_64.c +1 -1
@@ -88,7 +88,7 @@ void prom_cmdline(void)/* Drop into the prom, but completely terminate the program. * No chance of continuing. */ -void prom_halt (void ) +void notrace prom_halt(void) {#ifdef CONFIG_SUN_LDOMS if (ldom_domaining_enabled)
arch/sparc/prom/printf.c +3 -4
@@ -14,14 +14,14 @@*/ #include <linux/kernel.h> +#include <linux/compiler.h> #include <asm/openprom.h> #include <asm/oplib.h> static char ppbuf[1024 ]; -void -prom_write (const char *buf,unsigned int n) +void notrace prom_write(const char *buf, unsigned int n) {char ch;
@@ -33,8 +33,7 @@ prom_write(const char *buf, unsigned int n) } } -void -prom_printf (const char *fmt, ...) +void notrace prom_printf(const char *fmt, ...) {va_list args;int i;
drivers/md/dm-exception-store.c +13 -0
@@ -171,6 +171,14 @@ static int set_chunk_size(struct dm_exception_store *store,*/ chunk_size_ulong =round_up (chunk_size_ulong,PAGE_SIZE >>9 ); +return dm_exception_store_set_chunk_size (store, chunk_size_ulong, + error); +} + +int dm_exception_store_set_chunk_size (struct dm_exception_store *store, +unsigned long chunk_size_ulong, +char **error) +{/* Check chunk_size is a power of 2 */ if (!is_power_of_2 (chunk_size_ulong)) { *error ="Chunk size is not a power of 2" ;
@@ -183,6 +191,11 @@ static int set_chunk_size(struct dm_exception_store *store,return -EINVAL ; } +if (chunk_size_ulong >INT_MAX >>SECTOR_SHIFT ) { + *error ="Chunk size is too high" ; +return -EINVAL ; + } + store->chunk_size = chunk_size_ulong; store->chunk_mask = chunk_size_ulong -1 ; store->chunk_shift =ffs (chunk_size_ulong) -1 ;
drivers/md/dm-exception-store.h +4 -0
@@ -168,6 +168,10 @@ static inline chunk_t sector_to_chunk(struct dm_exception_store *store,int dm_exception_store_type_register (struct dm_exception_store_type *type);int dm_exception_store_type_unregister (struct dm_exception_store_type *type); +int dm_exception_store_set_chunk_size (struct dm_exception_store *store, +unsigned long chunk_size_ulong, +char **error); +int dm_exception_store_create (struct dm_target *ti,int argc,char **argv,unsigned *args_used,struct dm_exception_store **store);
drivers/md/dm-raid1.c +7 -1
@@ -648,7 +648,13 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)*/ dm_rh_inc_pending (ms->rh, &sync);dm_rh_inc_pending (ms->rh, &nosync); - ms->log_failure =dm_rh_flush (ms->rh) ?1 :0 ; + +/* +* If the flush fails on a previous call and succeeds here, +* we must not reset the log_failure variable. We need +* userspace interaction to do that. +*/ + ms->log_failure =dm_rh_flush (ms->rh) ?1 : ms->log_failure;/* * Dispatch io.
drivers/md/dm-snap-persistent.c +53 -35
180 lines not on this page · raw message
drivers/net/e100.c +1 -1
@@ -1764,7 +1764,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 ; }
drivers/net/ppp_generic.c +18 -16
@@ -1383,7 +1383,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)/* create a fragment for each channel */ bits =B ; -while (nfree >0 && len >0 ) { +while (len >0 ) { list = list->next;if (list == &ppp->channels) { i =0 ;
@@ -1430,29 +1430,31 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)*otherwise divide it according to the speed *of the channel we are going to transmit on */ -if (pch->speed ==0 ) { - flen = totlen/nfree ; -if (nbigger >0 ) { - flen++; - nbigger--; - } - }else { - flen = (((totfree - nzero)*(totlen + hdrlen*totfree)) / - ((totspeed*totfree)/pch->speed)) - hdrlen; -if (nbigger >0 ) { - flen += ((totfree - nzero)*pch->speed)/totspeed; - nbigger -= ((totfree - nzero)*pch->speed)/ +if (nfree >0 ) { +if (pch->speed ==0 ) { + flen = totlen/nfree ; +if (nbigger >0 ) { + flen++; + nbigger--; + } + }else { + flen = (((totfree - nzero)*(totlen + hdrlen*totfree)) / + ((totspeed*totfree)/pch->speed)) - hdrlen; +if (nbigger >0 ) { + flen += ((totfree - nzero)*pch->speed)/totspeed; + nbigger -= ((totfree - nzero)*pch->speed)/ totspeed; + } } + nfree--; } - nfree--;/* *check if we are on the last channel or *we exceded the lenght of the data to *fragment */ -if ((nfree ==0 ) || (flen > len)) +if ((nfree <=0 ) || (flen > len)) flen = len;/* *it is not worth to tx on slow channels:
@@ -1466,7 +1468,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)continue ; } - mtu = pch->chan->mtu +2 - hdrlen; + mtu = pch->chan->mtu - hdrlen;if (mtu <4 ) mtu =4 ;if (flen > mtu)
drivers/net/pppol2tp.c +1 -0
@@ -2682,6 +2682,7 @@ out_unregister_pppol2tp_proto: static void __exit pppol2tp_exit(void) {unregister_pppox_proto (PX_PROTO_OL2TP ); +unregister_pernet_gen_device (pppol2tp_net_id, &pppol2tp_net_ops);proto_unregister (&pppol2tp_sk_proto); }
drivers/pci/iov.c +23 -0
@@ -595,6 +595,29 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, }/** +* pci_sriov_resource_alignment - get resource alignment for VF BAR +* @dev: the PCI device +* @resno: the resource number +* +* Returns the alignment of the VF BAR found in the SR-IOV capability. +* This is not the same as the resource size which is defined as +* the VF BAR size multiplied by the number of VFs. The alignment +* is just the VF BAR size. +*/ +int pci_sriov_resource_alignment (struct pci_dev *dev,int resno) +{ +struct resource tmp; +enum pci_bar_type type; +int reg =pci_iov_resource_bar (dev, resno, &type); + +if (!reg) +return 0 ; + +__pci_read_base (dev, type, &tmp, reg); +return resource_alignment (&tmp); +} + +/** * pci_restore_iov_state - restore the state of the IOV capability * @dev: the PCI device */
drivers/pci/pci.h +13 -0
@@ -234,6 +234,7 @@ extern int pci_iov_init(struct pci_dev *dev);extern void pci_iov_release (struct pci_dev *dev);extern int pci_iov_resource_bar (struct pci_dev *dev,int resno,enum pci_bar_type *type); +extern int pci_sriov_resource_alignment (struct pci_dev *dev,int resno);extern void pci_restore_iov_state (struct pci_dev *dev);extern int pci_iov_bus_range (struct pci_bus *bus);#else
@@ -259,4 +260,16 @@ static inline int pci_iov_bus_range(struct pci_bus *bus) }#endif /* CONFIG_PCI_IOV */ +static inline int pci_resource_alignment (struct pci_dev *dev, +struct resource *res) +{ +#ifdef CONFIG_PCI_IOV +int resno = res - dev->resource; + +if (resno >=PCI_IOV_RESOURCES && resno <=PCI_IOV_RESOURCE_END ) +return pci_sriov_resource_alignment (dev, resno); +#endif +return resource_alignment (res); +} +#endif /* DRIVERS_PCI_H */
drivers/pci/setup-bus.c +2 -2
@@ -25,7 +25,7 @@#include <linux/ioport.h> #include <linux/cache.h> #include <linux/slab.h> - +#include "pci.h" static void pbus_assign_resources_sorted (const struct pci_bus *bus) {
@@ -355,7 +355,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned longcontinue ; r_size =resource_size (r);/* For bridges size != alignment */ - align =resource_alignment (r); + align =pci_resource_alignment (dev, r); order =__ffs (align) -20 ;if (order >11 ) { dev_warn(&dev->dev, "BAR %d bad alignment %llx: "
drivers/pci/setup-res.c +3 -3
@@ -145,7 +145,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) size =resource_size (res); min = (res->flags &IORESOURCE_IO ) ?PCIBIOS_MIN_IO :PCIBIOS_MIN_MEM ; - align =resource_alignment (res); + align =pci_resource_alignment (dev, res);if (!align) { dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus " "alignment) %pR flags %#lx\n",
@@ -236,7 +236,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)if (!(r->flags) || r->parent)continue ; - r_align =resource_alignment (r); + r_align =pci_resource_alignment (dev, r);if (!r_align) { dev_warn(&dev->dev, "BAR %d: bogus alignment " "%pR flags %#lx\n",
@@ -248,7 +248,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)struct resource_list *ln = list->next;if (ln) - align =resource_alignment (ln->res); + align =pci_resource_alignment (ln->dev, ln->res);if (r_align > align) { tmp =kmalloc (sizeof (*tmp),GFP_KERNEL );
drivers/scsi/sd.c +21 -24
70 lines not on this page · raw message
fs/jffs2/wbuf.c +10 -0
@@ -1268,10 +1268,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); }
fs/nilfs2/btnode.c +1 -1
@@ -206,6 +206,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc,* We cannot call radix_tree_preload for the kernels older * than 2.6.23, because it is not exported for modules. */ +retry: err =radix_tree_preload (GFP_NOFS & ~__GFP_HIGHMEM);if (err) goto failed_unlock;
@@ -216,7 +217,6 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, (unsigned long long )oldkey, (unsigned long long)newkey); -retry:spin_lock_irq (&btnc->tree_lock); err =radix_tree_insert (&btnc->page_tree, newkey, obh->b_page);spin_unlock_irq (&btnc->tree_lock);
mm/slub.c +2 -2
@@ -2490,8 +2490,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) {
@@ -2502,6 +2500,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
@@ -498,7 +498,7 @@ int net_assign_generic(struct net *net, int id, void *data)*/ ng->len = id; -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);
net/dccp/proto.c +1 -0
@@ -1159,6 +1159,7 @@ static void __exit dccp_fini(void)kmem_cache_destroy (dccp_hashinfo.bind_bucket_cachep);dccp_ackvec_exit ();dccp_sysctl_exit (); +percpu_counter_destroy (&dccp_orphan_count); }module_init (dccp_init);
net/ipv4/ip_gre.c +1 -1
@@ -952,7 +952,7 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev) addend +=4 ; } dev->needed_headroom = addend + hlen; - mtu -= dev->hard_header_len - addend; + mtu -= dev->hard_header_len + addend;if (mtu <68 ) mtu =68 ;
sound/pci/oxygen/oxygen_lib.c +3 -0
@@ -260,6 +260,9 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])* chip didn't if the first EEPROM word was overwritten. */ subdevice =oxygen_read_eeprom (chip,2 ); +/* use default ID if EEPROM is missing */ +if (subdevice ==0xffff ) + subdevice =0x8788 ;/* * We use only the subsystem device ID for searching because it is * unique even without the subsystem vendor ID, which may have been
sound/pci/oxygen/oxygen_pcm.c +2 -0
@@ -469,9 +469,11 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,oxygen_write16_masked (chip,OXYGEN_I2S_MULTICH_FORMAT ,oxygen_rate (hw_params) | chip->model.dac_i2s_format | +oxygen_i2s_mclk (hw_params) |oxygen_i2s_bits (hw_params),OXYGEN_I2S_RATE_MASK |OXYGEN_I2S_FORMAT_MASK | +OXYGEN_I2S_MCLK_MASK |OXYGEN_I2S_BITS_MASK );oxygen_update_dac_routing (chip);oxygen_update_spdif_source (chip);
I'm announcing the release of the 2.6.30.7 kernel. All users of the 2.6.30 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.30.6 and 2.6.30.7
The updated 2.6.30.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.30.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.30.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/sparc/include/asm/pgtable_64.h | 12 +++- arch/sparc/kernel/irq_64.c | 2 arch/sparc/kernel/ktlb.S | 42 +++++++++++++++-- arch/sparc/kernel/nmi.c | 2 arch/sparc/kernel/sys32.S | 2 arch/sparc/mm/init_64.c | 43 +++++++++-------- arch/sparc/mm/init_64.h | 7 ++ arch/sparc/prom/misc_64.c | 2 arch/sparc/prom/printf.c | 7 +- drivers/md/dm-exception-store.c | 13 +++++ drivers/md/dm-exception-store.h | 4 + drivers/md/dm-raid1.c | 8 ++- drivers/md/dm-snap-persistent.c | 88 +++++++++++++++++++++--------------- drivers/net/e100.c | 2 drivers/net/ppp_generic.c | 34 +++++++------ drivers/net/pppol2tp.c | 1 drivers/pci/iov.c | 23 +++++++++ drivers/pci/pci.h | 13 +++++ drivers/pci/setup-bus.c | 4 - drivers/pci/setup-res.c | 6 +- drivers/scsi/sd.c | 45 ++++++++---------- fs/jffs2/wbuf.c | 10 ++++ fs/nilfs2/btnode.c | 2 mm/slub.c | 4 - net/core/net_namespace.c | 2 net/dccp/proto.c | 1 net/ipv4/ip_gre.c | 2 sound/pci/oxygen/oxygen_lib.c | 3 + sound/pci/oxygen/oxygen_pcm.c | 2 30 files changed, 264 insertions(+), 124 deletions(-)
Ben McKeegan (1):
ppp: fix lost fragments in ppp_mp_explode() (resubmit)
Chris Wright (1):
PCI SR-IOV: correct broken resource alignment calculations
Clemens Ladisch (2):
sound: oxygen: handle cards with missing EEPROM
sound: oxygen: fix MCLK rate for 192 kHz playback
David S. Miller (3):
sparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds.
sparc64: Validate linear D-TLB misses.
sparc64: Fix bootup with mcount in some configs.
Eric Dumazet (3):
pppol2tp: calls unregister_pernet_gen_device() at unload time
net: net_assign_generic() fix
slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU
Greg Kroah-Hartman (1):
Linux 2.6.30.7
James Bottomley (1):
SCSI: sd: fix bug in SCSI async probing
Jonathan Brassow (1):
dm raid1: do not allow log_failure variable to unset after being set
Krzysztof Hałasa (1):
E100: fix interaction with swiotlb on X86.
Massimo Cirillo (1):
JFFS2: add missing verify buffer allocation/deallocation
Mathieu Desnoyers (1):
sparc: sys32.S incorrect compat-layer splice() system call
Mikulas Patocka (4):
dm snapshot: refactor zero_disk_area to use chunk_io dm snapshot: fix header corruption race on invalidation dm exception store: split set_chunk_size
dm snapshot: fix on disk chunk size validation
Ryusuke Konishi (1):
nilfs2: fix preempt count underflow in nilfs_btnode_prepare_change_key
Tom Goff (1):
gre: Fix MTU calculation for bound GRE tunnels
Wei Yongjun (1):
dccp: missing destroy of percpu counter variable while unload module