Linux 2.6.16.10
Subsystems (22)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 16 -EXTRAVERSION = .9 +EXTRAVERSION = .10 NAME=Sliding Snow Leopard # *DOCUMENTATION*
arch/i386/kernel/apm.c +1 -1
@@ -1081,7 +1081,7 @@ static int apm_console_blank(int blank)break ; } -if (error ==APM_NOT_ENGAGED && state !=APM_STATE_READY ) { +if (error ==APM_NOT_ENGAGED ) {static int tried;int eng_error;if (tried++ ==0 ) {
drivers/char/agp/efficeon-agp.c +7 -1
@@ -64,6 +64,12 @@ static struct gatt_mask efficeon_generic {.mask = 0x00000001, .type = 0} }; +/* This function does the same thing as mask_memory() for this chipset... */ +static inline unsigned long efficeon_mask_memory (unsigned long addr) +{ +return addr |0x00000001 ; +} +static struct aper_size_info_lvl2 efficeon_generic_sizes[4 ] = { {256 ,65536 ,0 },
@@ -251,7 +257,7 @@ static int efficeon_insert_memory(struct last_page =NULL ;for (i =0 ; i < count; i++) {int index = pg_start + i; -unsigned long insert = mem->memory[i]; +unsigned long insert =efficeon_mask_memory (mem->memory[i]); page = (unsigned int *) efficeon_private.l1_table[index >>10 ];
drivers/char/ipmi/ipmi_bt_sm.c +1 -1
@@ -165,7 +165,7 @@ static int bt_start_transaction(struct s {unsigned int i; -if ((size <2 ) || (size >IPMI_MAX_MSG_LENGTH )) +if ((size <2 ) || (size > (IPMI_MAX_MSG_LENGTH -2 )))return -1 ;if ((bt->state !=BT_STATE_IDLE ) && (bt->state !=BT_STATE_HOSED ))
drivers/char/tty_io.c +6 -2
@@ -2706,7 +2706,11 @@ #else }task_lock (p);if (p->files) { -rcu_read_lock (); +/* +* We don't take a ref to the file, so we must +* hold ->file_lock instead. +*/ +spin_lock (&p->files->file_lock); fdt =files_fdtable (p->files);for (i=0 ; i < fdt->max_fds; i++) { filp =fcheck_files (p->files, i);
@@ -2721,7 +2725,7 @@ #elsebreak ; } } -rcu_read_unlock (); +spin_unlock (&p->files->file_lock); }task_unlock (p); }while_each_task_pid (session,PIDTYPE_SID , p);
drivers/i2c/busses/i2c-i801.c +5 -0
@@ -478,6 +478,11 @@ static s32 i801_access(struct i2c_adapte ret =i801_transaction (); } +/* Some BIOSes don't like it when PEC is enabled at reboot or resume +time, so we forcibly disable it after every transaction. */ +if (hwpec) +outb_p (0 ,SMBAUXCTL ); +if (block)return ret;if (ret)
drivers/i2c/chips/m41t00.c +4 -4
@@ -129,13 +129,13 @@ m41t00_set_tlet(ulong arg)if ((i2c_smbus_write_byte_data (save_client,0 , tm.tm_sec &0x7f ) <0 ) || (i2c_smbus_write_byte_data (save_client,1 , tm.tm_min &0x7f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,2 , tm.tm_hour &0x7f ) + || (i2c_smbus_write_byte_data (save_client,2 , tm.tm_hour &0x3f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,4 , tm.tm_mday &0x7f ) + || (i2c_smbus_write_byte_data (save_client,4 , tm.tm_mday &0x3f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,5 , tm.tm_mon &0x7f ) + || (i2c_smbus_write_byte_data (save_client,5 , tm.tm_mon &0x1f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,6 , tm.tm_year &0x7f ) + || (i2c_smbus_write_byte_data (save_client,6 , tm.tm_year &0xff ) <0 ))dev_warn (&save_client->dev,"m41t00: can't write to rtc chip\n" );
drivers/ide/pci/alim15x3.c +2 -0
@@ -731,6 +731,8 @@ static unsigned int __devinit ata66_ali1if (m5229_revision <=0x20 ) tmpbyte = (tmpbyte & (~0x02 )) |0x01 ; +else if (m5229_revision ==0xc7 ) + tmpbyte |=0x03 ;else tmpbyte |=0x01 ;
drivers/macintosh/therm_adt746x.c +2 -2
@@ -627,8 +627,8 @@ thermostat_init(void)if (therm_type ==ADT7460 )device_create_file (&of_dev->dev, &dev_attr_sensor2_fan_speed); -#ifndef CONFIG_I2C_KEYWEST -request_module ("i2c-keywest" ); +#ifndef CONFIG_I2C_POWERMAC +request_module ("i2c-powermac" );#endif return i2c_add_driver (&thermostat_driver);
drivers/mtd/nand/Kconfig +8 -9
@@ -178,17 +178,16 @@ config MTD_NAND_DISKONCHIP_BBTWRITE Even if you leave this disabled, you can enable BBT writes at module load time (assuming you build diskonchip as a module) with the module parameter "inftl_bbt_write=1". - - config MTD_NAND_SHARPSL - bool "Support for NAND Flash on Sharp SL Series (C7xx + others)" - depends on MTD_NAND && ARCH_PXA - - config MTD_NAND_NANDSIM - bool "Support for NAND Flash Simulator" - depends on MTD_NAND && MTD_PARTITIONS +config MTD_NAND_SHARPSL + tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" + depends on MTD_NAND && ARCH_PXA + +config MTD_NAND_NANDSIM + tristate "Support for NAND Flash Simulator" + depends on MTD_NAND && MTD_PARTITIONS help The simulator may simulate verious NAND flash chips for the MTD nand layer. - + endmenu
drivers/scsi/3w-9xxx.c +6 -2
@@ -85,7 +85,7 @@ #include <scsi/scsi_cmnd.h>#include "3w-9xxx.h" /* Globals */ -#define TW_DRIVER_VERSION "2.26.02.005" +#define TW_DRIVER_VERSION "2.26.02.007"static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT ];static unsigned int twa_device_extension_count;static int twa_major =-1 ;
@@ -1944,9 +1944,13 @@ static void twa_scsiop_execute_scsi_comp }if (tw_dev->srb[request_id]->use_sg ==1 ) {struct scatterlist *sg = (struct scatterlist *)tw_dev->srb[request_id]->request_buffer; -char *buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; +char *buf; +unsigned long flags =0 ; +local_irq_save (flags); + buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset;memcpy (buf, tw_dev->generic_buffer_virt[request_id], sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 ); +local_irq_restore (flags); } } }/* End twa_scsiop_execute_scsi_complete() */
drivers/scsi/3w-xxxx.c +3 -0
@@ -1508,10 +1508,12 @@ static void tw_transfer_internal(TW_Devistruct scsi_cmnd *cmd = tw_dev->srb[request_id];void *buf;unsigned int transfer_len; +unsigned long flags =0 ;if (cmd->use_sg) {struct scatterlist *sg = (struct scatterlist *)cmd->request_buffer; +local_irq_save (flags); buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len); }else {
@@ -1526,6 +1528,7 @@ static void tw_transfer_internal(TW_Devi sg = (struct scatterlist *)cmd->request_buffer;kunmap_atomic (buf - sg->offset,KM_IRQ0 ); +local_irq_restore (flags); } }
drivers/video/fbmem.c +10 -4
@@ -669,13 +669,19 @@ fb_write(struct file *file, const char _ total_size = info->fix.smem_len;if (p > total_size) -return 0 ; +return -EFBIG ; -if (count >= total_size) +if (count > total_size) { + err = -EFBIG ; count = total_size; + } + +if (count + p > total_size) { +if (!err) + err = -ENOSPC ; -if (count + p > total_size) count = total_size - p; + } buffer =kmalloc ((count >PAGE_SIZE ) ?PAGE_SIZE : count,GFP_KERNEL );
@@ -717,7 +723,7 @@ fb_write(struct file *file, const char _kfree (buffer); -return (err) ? err : cnt; +return (cnt) ? cnt : err; }#ifdef CONFIG_KMOD
fs/locks.c +7 -2
@@ -2212,7 +2212,12 @@ void steal_locks(fl_owner_t from)lock_kernel (); j =0 ; -rcu_read_lock (); + +/* +* We are not taking a ref to the file structures, so +* we need to acquire ->file_lock. +*/ +spin_lock (&files->file_lock); fdt =files_fdtable (files);for (;;) {unsigned long set;
@@ -2230,7 +2235,7 @@ void steal_locks(fl_owner_t from) set >>=1 ; } } -rcu_read_unlock (); +spin_unlock (&files->file_lock);unlock_kernel (); }EXPORT_SYMBOL (steal_locks);
fs/open.c +20 -4
@@ -330,7 +330,10 @@ out:asmlinkage long sys_ftruncate (unsigned int fd,unsigned long length) { -return do_sys_ftruncate (fd, length,1 ); +long ret =do_sys_ftruncate (fd, length,1 ); +/* avoid REGPARM breakage on x86: */ +prevent_tail_call (ret); +return ret; }/* LFS versions of truncate are only needed on 32 bit machines */
@@ -342,7 +345,10 @@ asmlinkage long sys_truncate64(const chaasmlinkage long sys_ftruncate64 (unsigned int fd,loff_t length) { -return do_sys_ftruncate (fd, length,0 ); +long ret =do_sys_ftruncate (fd, length,0 ); +/* avoid REGPARM breakage on x86: */ +prevent_tail_call (ret); +return ret; }#endif
@@ -1083,20 +1089,30 @@ long do_sys_open(int dfd, const char __uasmlinkage long sys_open (const char __user *filename,int flags,int mode) { +long ret; +if (force_o_largefile ()) flags |=O_LARGEFILE ; -return do_sys_open (AT_FDCWD , filename, flags, mode); + ret =do_sys_open (AT_FDCWD , filename, flags, mode); +/* avoid REGPARM breakage on x86: */ +prevent_tail_call (ret); +return ret; }EXPORT_SYMBOL_GPL (sys_open);asmlinkage long sys_openat (int dfd,const char __user *filename,int flags,int mode) { +long ret; +if (force_o_largefile ()) flags |=O_LARGEFILE ; -return do_sys_open (dfd, filename, flags, mode); + ret =do_sys_open (dfd, filename, flags, mode); +/* avoid REGPARM breakage on x86: */ +prevent_tail_call (ret); +return ret; }EXPORT_SYMBOL_GPL (sys_openat);
fs/proc/base.c +15 -6
@@ -294,16 +294,20 @@ static int proc_fd_link(struct inode *in files =get_files_struct (task);if (files) { -rcu_read_lock (); +/* +* We are not taking a ref to the file structure, so we must +* hold ->file_lock. +*/ +spin_lock (&files->file_lock); file =fcheck_files (files, fd);if (file) { *mnt =mntget (file->f_vfsmnt); *dentry =dget (file->f_dentry); -rcu_read_unlock (); +spin_unlock (&files->file_lock);put_files_struct (files);return 0 ; } -rcu_read_unlock (); +spin_unlock (&files->file_lock);put_files_struct (files); }return -ENOENT ;
@@ -1485,7 +1489,12 @@ static struct dentry *proc_lookupfd(struif (!files) goto out_unlock; inode->i_mode =S_IFLNK ; -rcu_read_lock (); + +/* +* We are not taking a ref to the file structure, so we must +* hold ->file_lock. +*/ +spin_lock (&files->file_lock); file =fcheck_files (files, fd);if (!file) goto out_unlock2;
@@ -1493,7 +1502,7 @@ static struct dentry *proc_lookupfd(stru inode->i_mode |=S_IRUSR |S_IXUSR ;if (file->f_mode &2 ) inode->i_mode |=S_IWUSR |S_IXUSR ; -rcu_read_unlock (); +spin_unlock (&files->file_lock);put_files_struct (files); inode->i_op = &proc_pid_link_inode_operations; inode->i_size =64 ;
@@ -1503,7 +1512,7 @@ static struct dentry *proc_lookupfd(strureturn NULL ; out_unlock2: -rcu_read_unlock (); +spin_unlock (&files->file_lock);put_files_struct (files); out_unlock:iput (inode);
ipc/util.c +1 -2
@@ -182,8 +182,7 @@ static int grow_ary(struct ipc_ids* ids,if (new ==NULL )return size; new->size = newsize; -memcpy (new->p, ids->entries->p,sizeof (struct kern_ipc_perm *)*size + -sizeof (struct ipc_id_ary )); +memcpy (new->p, ids->entries->p,sizeof (struct kern_ipc_perm *)*size);for (i=size;i<newsize;i++) { new->p[i] =NULL ; }
kernel/uid16.c +46 -13
109 lines not on this page · raw message
net/core/dev.c +1 -1
@@ -2932,11 +2932,11 @@ void netdev_run_todo(void)switch (dev->reg_state) {case NETREG_REGISTERING : + dev->reg_state =NETREG_REGISTERED ; err =netdev_register_sysfs (dev);if (err)printk (KERN_ERR "%s: failed sysfs registration (%d)\n" , dev->name, err); - dev->reg_state =NETREG_REGISTERED ;break ;case NETREG_UNREGISTERING :
net/ipv4/tcp_output.c +3 -1
@@ -537,7 +537,9 @@ int tcp_fragment(struct sock *sk, struct buff =sk_stream_alloc_skb (sk, nsize,GFP_ATOMIC );if (buff ==NULL )return -ENOMEM ;/* We'll just try again later. */ -sk_charge_skb (sk, buff); + + buff->truesize = skb->len - len; + skb->truesize -= buff->truesize;/* Correct the sequence numbers. */ TCP_SKB_CB (buff)->seq =TCP_SKB_CB (skb)->seq + len;
net/ipv6/exthdrs.c +12 -0
@@ -489,6 +489,18 @@ int ipv6_parse_hopopts(struct sk_buff *s {struct inet6_skb_parm *opt =IP6CB (skb); +/* +* skb->nh.raw is equal to skb->data, and +* skb->h.raw - skb->nh.raw is always equal to +* sizeof(struct ipv6hdr) by definition of +* hop-by-hop options. +*/ +if (!pskb_may_pull (skb,sizeof (struct ipv6hdr ) +8 ) || + !pskb_may_pull (skb,sizeof (struct ipv6hdr ) + ((skb->h.raw[1 ] +1 ) <<3 ))) { +kfree_skb (skb); +return -1 ; + } + opt->hop =sizeof (struct ipv6hdr );if (ip6_parse_tlv (tlvprochopopt_lst, skb)) { skb->h.raw += (skb->h.raw[1 ]+1 )<<3 ;
net/ipv6/xfrm6_policy.c +5 -3
@@ -191,16 +191,18 @@ error:static inline void _decode_session6 (struct sk_buff *skb,struct flowi *fl) { -u16 offset =sizeof (struct ipv6hdr ); +u16 offset = skb->h.raw - skb->nh.raw;struct ipv6hdr *hdr = skb->nh.ipv6h; -struct ipv6_opt_hdr *exthdr = (struct ipv6_opt_hdr *)(skb->nh.raw + offset); -u8 nexthdr = skb->nh.ipv6h->nexthdr; +struct ipv6_opt_hdr *exthdr; +u8 nexthdr = skb->nh.raw[IP6CB (skb)->nhoff];memset (fl,0 ,sizeof (struct flowi ));ipv6_addr_copy (&fl->fl6_dst, &hdr->daddr);ipv6_addr_copy (&fl->fl6_src, &hdr->saddr);while (pskb_may_pull (skb, skb->nh.raw + offset +1 - skb->data)) { + exthdr = (struct ipv6_opt_hdr *)(skb->nh.raw + offset); +switch (nexthdr) {case NEXTHDR_ROUTING :case NEXTHDR_HOP :
security/selinux/ss/mls.c +1 -1
@@ -264,7 +264,7 @@ int mls_context_to_sid(char oldc,if (!selinux_mls_enabled) {if (def_sid !=SECSID_NULL && oldc) - *scontext +=strlen (*scontext); + *scontext +=strlen (*scontext)+1 ;return 0 ; }
sound/oss/dmasound/tas_common.c +2 -2
@@ -195,8 +195,8 @@ tas_init(int driver_id, const char *drivprintk (KERN_INFO "tas driver [%s])\n" , driver_name); -#ifndef CONFIG_I2C_KEYWEST -request_module ("i2c-keywest" ); +#ifndef CONFIG_I2C_POWERMAC +request_module ("i2c-powermac" );#endif tas_node =find_devices ("deq" );if (tas_node ==NULL )
sound/ppc/daca.c +1 -1
@@ -256,7 +256,7 @@ int __init snd_pmac_daca_init(struct snd#ifdef CONFIG_KMOD if (current->fs->root) -request_module ("i2c-keywest" ); +request_module ("i2c-powermac" );#endif /* CONFIG_KMOD */ mix =kmalloc (sizeof (*mix),GFP_KERNEL );
sound/ppc/tumbler.c +1 -1
@@ -1314,7 +1314,7 @@ int __init snd_pmac_tumbler_init(struct#ifdef CONFIG_KMOD if (current->fs->root) -request_module ("i2c-keywest" ); +request_module ("i2c-powermac" );#endif /* CONFIG_KMOD */ mix =kmalloc (sizeof (*mix),GFP_KERNEL );