Linux 3.15.8
Greg KH
maintainerI'm announcing the release of the 3.15.8 kernel.
All users of the 3.15 kernel series must upgrade.
The updated 3.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.15.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 6 ++-- arch/parisc/include/uapi/asm/signal.h | 2 - arch/powerpc/platforms/pseries/dlpar.c | 1 arch/powerpc/platforms/pseries/reconfig.c | 1 arch/s390/kernel/ptrace.c | 12 ++++++-- arch/x86/kernel/entry_32.S | 9 +++--- arch/xtensa/mm/init.c | 2 - block/blk-cgroup.c | 7 ++++ block/blk-tag.c | 33 ++++------------------- block/compat_ioctl.c | 1 drivers/ata/ahci.c | 1 drivers/ata/libata-core.c | 12 ++++++-- drivers/base/platform.c | 9 ++++-- drivers/block/zram/zram_drv.c | 22 ++++++++++++--- drivers/char/hw_random/core.c | 6 ++++ drivers/char/hw_random/virtio-rng.c | 10 ++++++ drivers/gpu/drm/radeon/cik.c | 2 + drivers/gpu/drm/radeon/evergreen.c | 1 drivers/gpu/drm/radeon/r600.c | 1 drivers/gpu/drm/radeon/si.c | 1 drivers/hwmon/smsc47m192.c | 4 ++ drivers/input/input.c | 6 ++-- drivers/input/mouse/synaptics.c | 5 ++- drivers/media/dvb-frontends/tda10071.c | 6 +++- drivers/media/usb/dvb-usb-v2/af9035.c | 40 +++++++++++++++++++++++---- drivers/media/usb/hdpvr/hdpvr-video.c | 6 ++-- drivers/media/v4l2-core/v4l2-dv-timings.c | 4 +- drivers/parport/Kconfig | 12 ++++---- drivers/pinctrl/pinctrl-st.c | 2 - drivers/staging/media/omap4iss/Kconfig | 2 - fs/coredump.c | 2 - fs/fuse/inode.c | 5 --- fs/namei.c | 3 +- fs/nfs/nfs3acl.c | 43 ++++++++++++++++++++++++++++++ fs/nfs/nfs3proc.c | 4 +- include/linux/libata.h | 1 include/uapi/linux/fuse.h | 3 ++ kernel/trace/trace.c | 2 - kernel/trace/trace_clock.c | 9 +++--- mm/hugetlb.c | 1 mm/memory.c | 2 - mm/slab_common.c | 2 - net/wireless/nl80211.c | 11 +++---- 43 files changed, 222 insertions(+), 92 deletions(-)
Amit Shah (1):
hwrng: virtio - ensure reads happen after successful probe
Andrew Gallagher (1):
fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT
Antti Palosaari (2):
media: af9035: override tuner id when bad value set into eeprom
media: tda10071: force modulation to QPSK on DVB-S
Arnd Bergmann (1):
media: staging: tighten omap4iss dependencies
Christian König (1):
drm/radeon: fix irq ring buffer overflow handling
Christoph Hellwig (2):
nfs: only show Posix ACLs in listxattr if actually present
block: don't assume last put of shared tags is for the host
Dmitry Torokhov (1):
Input: fix defuzzing logic
Greg Kroah-Hartman (1):
Linux 3.15.8
Guenter Roeck (2):
hwmon: (smsc47m192) Fix temperature limit and vrm write operations
platform_get_irq: Revert to platform_get_resource if of_irq_get fails
Hans Verkuil (1):
media: hdpvr: fix two audio bugs
Hans de Goede (1):
Input: synaptics - add min/max quirk for pnp-id LEN2002 (Edge E531)
Jerome Glisse (1):
drm/radeon: fix cut and paste issue for hawaii.
Johannes Berg (1):
nl80211: move set_qos_map command into split state
John David Anglin (1):
parisc: Remove SA_RESTORER define
Kevin Hao (1):
libata: support the ata host which implements a queue depth less than 32
Konstantin Khlebnikov (1):
mm: do not call do_fault_around for non-linear fault
Linus Torvalds (1):
Fix gcc-4.9.0 miscompilation of load_balance() in scheduler
Martin Schwidefsky (1):
s390/ptrace: fix PSW mask check
Max Filippov (1):
xtensa: fix sysmem reservation at the end of existing block
Maxime COQUELIN (1):
pinctrl: st: Fix irqmux handler
Miklos Szeredi (1):
fuse: s_time_gran fix
Mikulas Patocka (2):
block: provide compat ioctl for BLKZEROOUT
slab_common: fix the check for duplicate slab names
Minchan Kim (1):
zram: avoid lockdep splat by revalidate_disk
Naoya Horiguchi (1):
mm: hugetlb: fix copy_hugetlb_page_range()
Randy Dunlap (1):
parport: fix menu breakage
Rickard Strandqvist (1):
media: media: v4l2-core: v4l2-dv-timings.c: Cleaning up code wrong value used in aspect ratio
Romain Degez (1):
ahci: add support for the Promise FastTrak TX8660 SATA HBA (ahci mode)
Silesh C V (1):
coredump: fix the setting of PF_DUMPCORE
Sven Wegener (1):
x86_32, entry: Store badsys error code in %eax
Tejun Heo (2):
libata: introduce ata_host->n_tags to avoid oops on SAS controllers
blkcg: don't call into policy draining if root_blkg is already gone
Tony Luck (1):
tracing: Fix wraparound problems in "uptime" trace clock
Tyrel Datwyler (1):
powerpc/pseries: dynamically added OF nodes need to call of_node_init
Vasily Averin (1):
fs: umount on symlink leaks mnt count
Greg KH
maintainerMakefile +4 -2
@@ -1,8 +1,8 @@ VERSION = 3 PATCHLEVEL = 15 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = -NAME = Shuffling Zombie Juror +NAME = Double Funky Skunk # *DOCUMENTATION* # To see a list of typical targets execute "make help"
@@ -669,6 +669,8 @@ KBUILD_CFLAGS += -fomit-frame-pointer endif endif +KBUILD_CFLAGS += $(call cc-option, -fno-var-tracking-assignments) + ifdef CONFIG_DEBUG_INFO KBUILD_CFLAGS += -g KBUILD_AFLAGS += -Wa,--gdwarf-2
arch/parisc/include/uapi/asm/signal.h +0 -2
@@ -69,8 +69,6 @@#define SA_NOMASK SA_NODEFER#define SA_ONESHOT SA_RESETHAND -#define SA_RESTORER 0x04000000/* obsolete -- ignored */ -#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192
arch/powerpc/platforms/pseries/dlpar.c +1 -0
@@ -86,6 +86,7 @@ static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa, }of_node_set_flag (dn,OF_DYNAMIC ); +of_node_init (dn);return dn; }
arch/powerpc/platforms/pseries/reconfig.c +1 -0
@@ -69,6 +69,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist np->properties = proplist;of_node_set_flag (np,OF_DYNAMIC ); +of_node_init (np); np->parent =derive_parent (path);if (IS_ERR (np->parent)) {
arch/s390/kernel/ptrace.c +10 -2
@@ -334,9 +334,14 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)unsigned long mask =PSW_MASK_USER ; mask |=is_ri_task (child) ?PSW_MASK_RI :0 ; -if ((data & ~mask) !=PSW_USER_BITS ) +if ((data ^PSW_USER_BITS ) & ~mask) +/* Invalid psw mask. */ +return -EINVAL ; +if ((data &PSW_MASK_ASC ) ==PSW_ASC_HOME ) +/* Invalid address-space-control bits */ return -EINVAL ;if ((data &PSW_MASK_EA ) && !(data &PSW_MASK_BA )) +/* Invalid addressing mode bits */ return -EINVAL ; } *(addr_t *)((addr_t ) &task_pt_regs (child)->psw + addr) = data;
@@ -672,9 +677,12 @@ static int __poke_user_compat(struct task_struct *child, mask |=is_ri_task (child) ?PSW32_MASK_RI :0 ;/* Build a 64 bit psw mask from 31 bit mask. */ -if ((tmp & ~mask) !=PSW32_USER_BITS ) +if ((tmp ^PSW32_USER_BITS ) & ~mask)/* Invalid psw mask. */ return -EINVAL ; +if ((data &PSW32_MASK_ASC ) ==PSW32_ASC_HOME ) +/* Invalid address-space-control bits */ +return -EINVAL ; regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER ) | (regs->psw.mask &PSW_MASK_BA ) | (__u64)(tmp & mask) <<32 ;
arch/x86/kernel/entry_32.S +5 -4
@@ -433,8 +433,8 @@ sysenter_do_call: cmpl $(NR_syscalls), %eax jae sysenter_badsys call *sys_call_table(,%eax,4) - movl %eax,PT_EAX(%esp) sysenter_after_call: + movl %eax,PT_EAX(%esp) LOCKDEP_SYS_EXIT DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF
@@ -514,6 +514,7 @@ ENTRY(system_call) jae syscall_badsys syscall_call: call *sys_call_table(,%eax,4) +syscall_after_call: movl %eax,PT_EAX(%esp) # store the return value syscall_exit: LOCKDEP_SYS_EXIT
@@ -683,12 +684,12 @@ syscall_fault: END(syscall_fault) syscall_badsys: - movl $-ENOSYS,PT_EAX(%esp) - jmp syscall_exit + movl $-ENOSYS,%eax + jmp syscall_after_call END(syscall_badsys) sysenter_badsys: - movl $-ENOSYS,PT_EAX(%esp) + movl $-ENOSYS,%eax jmp sysenter_after_call END(syscall_badsys) CFI_ENDPROC
arch/xtensa/mm/init.c +1 -1
@@ -191,7 +191,7 @@ int __init mem_reserve(unsigned long start, unsigned long end, int must_exist)return -EINVAL ; } -if (it && start - it->start < bank_sz) { +if (it && start - it->start <= bank_sz) {if (start == it->start) {if (end - it->start < bank_sz) { it->start = end;
block/blk-cgroup.c +7 -0
@@ -872,6 +872,13 @@ void blkcg_drain_queue(struct request_queue *q) {lockdep_assert_held (q->queue_lock); +/* +* @q could be exiting and already have destroyed all blkgs as +* indicated by NULL root_blkg. If so, don't confuse policies. +*/ +if (!q->root_blkg) +return ; +blk_throtl_drain (q); }
block/blk-tag.c +7 -26
@@ -27,18 +27,15 @@ struct request *blk_queue_find_tag(struct request_queue *q, int tag)EXPORT_SYMBOL (blk_queue_find_tag);/** -* __blk_free_tags - release a given set of tag maintenance info +* blk_free_tags - release a given set of tag maintenance info * @bqt: the tag map to free * -* Tries to free the specified @bqt. Returns true if it was -* actually freed and false if there are still references using it +* Drop the reference count on @bqt and frees it when the last reference +* is dropped. */ -static int __blk_free_tags (struct blk_queue_tag *bqt) +void blk_free_tags (struct blk_queue_tag *bqt) { -int retval; - - retval =atomic_dec_and_test (&bqt->refcnt); -if (retval) { +if (atomic_dec_and_test (&bqt->refcnt)) {BUG_ON (find_first_bit (bqt->tag_map, bqt->max_depth) < bqt->max_depth);
@@ -50,9 +47,8 @@ static int __blk_free_tags(struct blk_queue_tag *bqt)kfree (bqt); } - -return retval; } +EXPORT_SYMBOL (blk_free_tags);/** * __blk_queue_free_tags - release tag maintenance info
@@ -69,28 +65,13 @@ void __blk_queue_free_tags(struct request_queue *q)if (!bqt)return ; -__blk_free_tags (bqt); +blk_free_tags (bqt); q->queue_tags =NULL ;queue_flag_clear_unlocked (QUEUE_FLAG_QUEUED , q); }/** -* blk_free_tags - release a given set of tag maintenance info -* @bqt: the tag map to free -* -* For externally managed @bqt frees the map. Callers of this -* function must guarantee to have released all the queues that -* might have been using this tag map. -*/ -void blk_free_tags (struct blk_queue_tag *bqt) -{ -if (unlikely (!__blk_free_tags (bqt))) -BUG (); -} -EXPORT_SYMBOL (blk_free_tags); - -/** * blk_queue_free_tags - release tag maintenance info * @q: the request queue for the device *
block/compat_ioctl.c +1 -0
@@ -690,6 +690,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)case BLKROSET :case BLKDISCARD :case BLKSECDISCARD : +case BLKZEROOUT :/* * the ones below are implemented in blkdev_locked_ioctl, * but we call blkdev_ioctl, which gets the lock for us
drivers/ata/ahci.c +1 -0
@@ -456,6 +456,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {/* Promise */ { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */ + { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode *//* Asmedia */ { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */
drivers/ata/libata-core.c +10 -2
@@ -4787,6 +4787,10 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)* ata_qc_new - Request an available ATA command, for queueing * @ap: target port * +* Some ATA host controllers may implement a queue depth which is less +* than ATA_MAX_QUEUE. So we shouldn't allocate a tag which is beyond +* the hardware limitation. +* * LOCKING: * None. */
@@ -4794,14 +4798,15 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)static struct ata_queued_cmd *ata_qc_new (struct ata_port *ap) {struct ata_queued_cmd *qc =NULL ; +unsigned int max_queue = ap->host->n_tags;unsigned int i, tag;/* no command while frozen */ if (unlikely (ap->pflags &ATA_PFLAG_FROZEN ))return NULL ; -for (i =0 ; i <ATA_MAX_QUEUE ; i++) { - tag = (i + ap->last_tag +1 ) %ATA_MAX_QUEUE ; +for (i =0 , tag = ap->last_tag +1 ; i < max_queue; i++, tag++) { + tag = tag < max_queue ? tag :0 ;/* the last tag is reserved for internal command. */ if (tag ==ATA_TAG_INTERNAL )
@@ -6088,6 +6093,7 @@ void ata_host_init(struct ata_host *host, struct device *dev, {spin_lock_init (&host->lock);mutex_init (&host->eh_mutex); + host->n_tags =ATA_MAX_QUEUE -1 ; host->dev = dev; host->ops = ops; }
@@ -6169,6 +6175,8 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) {int i, rc; + host->n_tags =clamp (sht->can_queue,1 ,ATA_MAX_QUEUE -1 ); +/* host must have been started */ if (!(host->flags &ATA_HOST_STARTED )) {dev_err (host->dev,"BUG: trying to register unstarted host\n" );
drivers/base/platform.c +7 -2
@@ -89,8 +89,13 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)return dev->archdata.irqs[num];#else struct resource *r; -if (IS_ENABLED (CONFIG_OF_IRQ ) && dev->dev.of_node) -return of_irq_get (dev->dev.of_node, num); +if (IS_ENABLED (CONFIG_OF_IRQ ) && dev->dev.of_node) { +int ret; + + ret =of_irq_get (dev->dev.of_node, num); +if (ret >=0 || ret == -EPROBE_DEFER ) +return ret; + } r =platform_get_resource (dev,IORESOURCE_IRQ , num);
drivers/block/zram/zram_drv.c +18 -4
@@ -622,11 +622,18 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)memset (&zram->stats,0 ,sizeof (zram->stats)); zram->disksize =0 ; -if (reset_capacity) { +if (reset_capacity)set_capacity (zram->disk,0 ); -revalidate_disk (zram->disk); - } +up_write (&zram->init_lock); + +/* +* Revalidate disk out of the init_lock to avoid lockdep splat. +* It's okay because disk's capacity is protected by init_lock +* so that revalidate_disk always sees up-to-date capacity. +*/ +if (reset_capacity) +revalidate_disk (zram->disk); } static ssize_t disksize_store(struct device *dev,
@@ -666,8 +673,15 @@ static ssize_t disksize_store(struct device *dev, zram->comp = comp; zram->disksize = disksize;set_capacity (zram->disk, zram->disksize >>SECTOR_SHIFT ); -revalidate_disk (zram->disk);up_write (&zram->init_lock); + +/* +* Revalidate disk out of the init_lock to avoid lockdep splat. +* It's okay because disk's capacity is protected by init_lock +* so that revalidate_disk always sees up-to-date capacity. +*/ +revalidate_disk (zram->disk); +return len; out_destroy_comp:
drivers/char/hw_random/core.c +6 -0
@@ -68,6 +68,12 @@ static void add_early_randomness(struct hwrng *rng)unsigned char bytes[16 ];int bytes_read; +/* +* Currently only virtio-rng cannot return data during device +* probe, and that's handled in virtio-rng.c itself. If there +* are more such devices, this call to rng_get_data can be +* made conditional here instead of doing it per-device. +*/ bytes_read =rng_get_data (rng, bytes,sizeof (bytes),1 );if (bytes_read >0 )add_device_randomness (bytes, bytes_read);
drivers/char/hw_random/virtio-rng.c +10 -0
@@ -30,6 +30,8 @@ static unsigned int data_avail;static DECLARE_COMPLETION (have_data);static bool busy; +static bool probe_done; +static void random_recv_done (struct virtqueue *vq) {/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */
@@ -56,6 +58,13 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) {int ret; +/* +* Don't ask host for data till we're setup. This call can +* happen during hwrng_register(), after commit d9e7972619. +*/ +if (unlikely (!probe_done)) +return 0 ; +if (!busy) { busy = true;init_completion (&have_data);
@@ -110,6 +119,7 @@ static int probe_common(struct virtio_device *vdev)return err; } + probe_done = true;return 0 ; }
drivers/gpu/drm/radeon/cik.c +2 -0
@@ -2290,6 +2290,7 @@ static void cik_tiling_mode_table_init(struct radeon_device *rdev) gb_tile_moden =0 ;break ; } + rdev->config.cik.macrotile_mode_array[reg_offset] = gb_tile_moden;WREG32 (GB_MACROTILE_MODE0 + (reg_offset *4 ), gb_tile_moden); } }else if (num_pipe_configs ==8 ) {
@@ -7363,6 +7364,7 @@ static inline u32 cik_get_ih_wptr(struct radeon_device *rdev) tmp =RREG32 (IH_RB_CNTL ); tmp |=IH_WPTR_OVERFLOW_CLEAR ;WREG32 (IH_RB_CNTL , tmp); + wptr &= ~RB_OVERFLOW ; }return (wptr & rdev->ih.ptr_mask); }
drivers/gpu/drm/radeon/evergreen.c +1 -0
@@ -4759,6 +4759,7 @@ static u32 evergreen_get_ih_wptr(struct radeon_device *rdev) tmp =RREG32 (IH_RB_CNTL ); tmp |=IH_WPTR_OVERFLOW_CLEAR ;WREG32 (IH_RB_CNTL , tmp); + wptr &= ~RB_OVERFLOW ; }return (wptr & rdev->ih.ptr_mask); }
drivers/gpu/drm/radeon/r600.c +1 -0
@@ -3792,6 +3792,7 @@ static u32 r600_get_ih_wptr(struct radeon_device *rdev) tmp =RREG32 (IH_RB_CNTL ); tmp |=IH_WPTR_OVERFLOW_CLEAR ;WREG32 (IH_RB_CNTL , tmp); + wptr &= ~RB_OVERFLOW ; }return (wptr & rdev->ih.ptr_mask); }
drivers/gpu/drm/radeon/si.c +1 -0
@@ -6090,6 +6090,7 @@ static inline u32 si_get_ih_wptr(struct radeon_device *rdev) tmp =RREG32 (IH_RB_CNTL ); tmp |=IH_WPTR_OVERFLOW_CLEAR ;WREG32 (IH_RB_CNTL , tmp); + wptr &= ~RB_OVERFLOW ; }return (wptr & rdev->ih.ptr_mask); }
drivers/hwmon/smsc47m192.c +3 -1
@@ -86,7 +86,7 @@ static inline u8 IN_TO_REG(unsigned long val, int n)*/ static inline s8 TEMP_TO_REG (int val) { -return clamp_val (SCALE (val,1 ,1000 ),-128000 ,127000 ); +return SCALE (clamp_val (val,-128000 ,127000 ),1 ,1000 ); }static inline int TEMP_FROM_REG (s8 val)
@@ -384,6 +384,8 @@ static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, err =kstrtoul (buf,10 , &val);if (err)return err; +if (val >255 ) +return -EINVAL ; data->vrm = val;return count;
drivers/input/input.c +4 -2
@@ -257,9 +257,10 @@ static int input_handle_abs_event(struct input_dev *dev, }static int input_get_disposition (struct input_dev *dev, -unsigned int type,unsigned int code,int value) +unsigned int type,unsigned int code,int *pval) {int disposition =INPUT_IGNORE_EVENT ; +int value = *pval;switch (type) {
@@ -357,6 +358,7 @@ static int input_get_disposition(struct input_dev *dev,break ; } + *pval = value;return disposition; }
@@ -365,7 +367,7 @@ static void input_handle_event(struct input_dev *dev, {int disposition; - disposition =input_get_disposition (dev, type, code, value); + disposition =input_get_disposition (dev, type, code, &value);if ((disposition &INPUT_PASS_TO_DEVICE ) && dev->event) dev->event (dev, type, code, value);
drivers/input/mouse/synaptics.c +3 -2
@@ -132,7 +132,8 @@ static const struct min_max_quirk min_max_pnpid_table[] = {1232 ,5710 ,1156 ,4696 }, { - (const char *const []){"LEN0034" ,"LEN0036" ,"LEN2004" ,NULL }, + (const char *const []){"LEN0034" ,"LEN0036" ,"LEN2002" , +"LEN2004" ,NULL },1024 ,5112 ,2024 ,4832 }, {
@@ -168,7 +169,7 @@ static const char * const topbuttonpad_pnp_ids[] = {"LEN0049" ,"LEN2000" ,"LEN2001" ,/* Edge E431 */ -"LEN2002" , +"LEN2002" ,/* Edge E531 */ "LEN2003" ,"LEN2004" ,/* L440 */ "LEN2005",
drivers/media/dvb-frontends/tda10071.c +5 -1
@@ -668,6 +668,7 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)struct dtv_frontend_properties *c = &fe->dtv_property_cache;int ret, i;u8 mode, rolloff, pilot, inversion, div; +fe_modulation_t modulation; dev_dbg(&priv->i2c->dev, "%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",
@@ -702,10 +703,13 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)switch (c->delivery_system) {case SYS_DVBS : + modulation =QPSK ; rolloff =0 ; pilot =2 ;break ;case SYS_DVBS2 : + modulation = c->modulation; +switch (c->rolloff) {case ROLLOFF_20 : rolloff =2 ;
@@ -750,7 +754,7 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)for (i =0 , mode =0xff ; i <ARRAY_SIZE (TDA10071_MODCOD ); i++) {if (c->delivery_system ==TDA10071_MODCOD [i].delivery_system && - c->modulation ==TDA10071_MODCOD [i].modulation && + modulation ==TDA10071_MODCOD [i].modulation && c->fec_inner ==TDA10071_MODCOD [i].fec) { mode =TDA10071_MODCOD [i].val; dev_dbg(&priv->i2c->dev, "%s: mode found=%02x\n",
drivers/media/usb/dvb-usb-v2/af9035.c +33 -7
@@ -704,15 +704,41 @@ static int af9035_read_config(struct dvb_usb_device *d)if (ret <0 ) goto err; -if (tmp ==0x00 ) -dev_dbg (&d->udev->dev, -"%s: [%d]tuner not set, using default\n" , - __func__, i); -else +dev_dbg (&d->udev->dev,"%s: [%d]tuner=%02x\n" , + __func__, i, tmp); + +/* tuner sanity check */ +if (state->chip_type ==0x9135 ) { +if (state->chip_version ==0x02 ) { +/* IT9135 BX (v2) */ +switch (tmp) { +case AF9033_TUNER_IT9135_60 : +case AF9033_TUNER_IT9135_61 : +case AF9033_TUNER_IT9135_62 : + state->af9033_config[i].tuner = tmp; +break ; + } + }else { +/* IT9135 AX (v1) */ +switch (tmp) { +case AF9033_TUNER_IT9135_38 : +case AF9033_TUNER_IT9135_51 : +case AF9033_TUNER_IT9135_52 : + state->af9033_config[i].tuner = tmp; +break ; + } + } + }else { +/* AF9035 */ state->af9033_config[i].tuner = tmp; + } -dev_dbg (&d->udev->dev,"%s: [%d]tuner=%02x\n" , - __func__, i, state->af9033_config[i].tuner); +if (state->af9033_config[i].tuner != tmp) { +dev_info (&d->udev->dev, +"%s: [%d] overriding tuner from %02x to %02x\n" , +KBUILD_MODNAME , i, tmp, + state->af9033_config[i].tuner); + }switch (state->af9033_config[i].tuner) {case AF9033_TUNER_TUA9001 :
drivers/media/usb/hdpvr/hdpvr-video.c +3 -3
@@ -82,7 +82,7 @@ static void hdpvr_read_bulk_callback(struct urb *urb) }/*=========================================================================*/ -/* bufffer bits */ +/* buffer bits */ /* function expects dev->io_mutex to be hold by caller */ int hdpvr_cancel_queue (struct hdpvr_device *dev)
@@ -926,7 +926,7 @@ static int hdpvr_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_MPEG_AUDIO_ENCODING :if (dev->flags &HDPVR_FLAG_AC3_CAP ) { opt->audio_codec = ctrl->val; -return hdpvr_set_audio (dev, opt->audio_input, +return hdpvr_set_audio (dev, opt->audio_input +1 , opt->audio_codec); }return 0 ;
@@ -1198,7 +1198,7 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,v4l2_ctrl_new_std_menu (hdl, &hdpvr_ctrl_ops,V4L2_CID_MPEG_AUDIO_ENCODING , ac3 ?V4L2_MPEG_AUDIO_ENCODING_AC3 :V4L2_MPEG_AUDIO_ENCODING_AAC , -0x7 ,V4L2_MPEG_AUDIO_ENCODING_AAC ); +0x7 , ac3 ? dev->options.audio_codec :V4L2_MPEG_AUDIO_ENCODING_AAC ); v4l2_ctrl_new_std_menu(hdl, &hdpvr_ctrl_ops, V4L2_CID_MPEG_VIDEO_ENCODING, V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 0x3,
drivers/media/v4l2-core/v4l2-dv-timings.c +2 -2
@@ -599,10 +599,10 @@ struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait) aspect.denominator =9 ; }else if (ratio ==34 ) { aspect.numerator =4 ; - aspect.numerator =3 ; + aspect.denominator =3 ; }else if (ratio ==68 ) { aspect.numerator =15 ; - aspect.numerator =9 ; + aspect.denominator =9 ; }else { aspect.numerator = hor_landscape +99 ; aspect.denominator =100 ;
drivers/parport/Kconfig +6 -6
@@ -5,6 +5,12 @@ # Parport configuration. # +config ARCH_MIGHT_HAVE_PC_PARPORT + bool + help + Select this config option from the architecture Kconfig if + the architecture might have PC parallel port hardware. + menuconfig PARPORT tristate "Parallel port support" depends on HAS_IOMEM
@@ -31,12 +37,6 @@ menuconfig PARPORT If unsure, say Y. -config ARCH_MIGHT_HAVE_PC_PARPORT - bool - help - Select this config option from the architecture Kconfig if - the architecture might have PC parallel port hardware. - if PARPORT config PARPORT_PC
drivers/pinctrl/pinctrl-st.c +1 -1
@@ -1467,7 +1467,7 @@ static void st_gpio_irqmux_handler(unsigned irq, struct irq_desc *desc) status =readl (info->irqmux_base); -for_each_set_bit (n, &status,ST_GPIO_PINS_PER_BANK ) +for_each_set_bit (n, &status, info->nbanks)__gpio_irq_handler (&info->banks[n]);chained_irq_exit (chip, desc);
drivers/staging/media/omap4iss/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VIDEO_OMAP4 bool "OMAP 4 Camera support" - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C && ARCH_OMAP4 + depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4 select VIDEOBUF2_DMA_CONTIG ---help--- Driver for an OMAP 4 ISS controller.
fs/coredump.c +1 -1
@@ -306,7 +306,7 @@ static int zap_threads(struct task_struct *tsk, struct mm_struct *mm,if (unlikely (nr <0 ))return nr; - tsk->flags =PF_DUMPCORE ; + tsk->flags |=PF_DUMPCORE ;if (atomic_read (&mm->mm_users) == nr +1 ) goto done;/*
fs/fuse/inode.c +1 -4
@@ -907,9 +907,6 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) fc->writeback_cache =1 ;if (arg->time_gran && arg->time_gran <=1000000000 ) fc->sb->s_time_gran = arg->time_gran; -else - fc->sb->s_time_gran =1000000000 ; - }else { ra_pages = fc->max_read /PAGE_CACHE_SIZE ; fc->no_lock =1 ;
@@ -938,7 +935,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)FUSE_SPLICE_WRITE |FUSE_SPLICE_MOVE |FUSE_SPLICE_READ |FUSE_FLOCK_LOCKS |FUSE_IOCTL_DIR |FUSE_AUTO_INVAL_DATA |FUSE_DO_READDIRPLUS |FUSE_READDIRPLUS_AUTO |FUSE_ASYNC_DIO | -FUSE_WRITEBACK_CACHE ; +FUSE_WRITEBACK_CACHE |FUSE_NO_OPEN_SUPPORT ; req->in.h.opcode =FUSE_INIT ; req->in.numargs =1 ; req->in.args[0 ].size =sizeof (*arg);
fs/namei.c +2 -1
@@ -2256,9 +2256,10 @@ done: goto out; } path->dentry = dentry; - path->mnt =mntget (nd->path.mnt); + path->mnt = nd->path.mnt;if (should_follow_link (dentry, nd->flags &LOOKUP_FOLLOW ))return 1 ; +mntget (path->mnt);follow_mount (path); error =0 ; out:
fs/nfs/nfs3acl.c +43 -0
46 lines not on this page · raw message
fs/nfs/nfs3proc.c +2 -2
@@ -891,7 +891,7 @@ static const struct inode_operations nfs3_dir_inode_operations = { .getattr = nfs_getattr, .setattr = nfs_setattr, #ifdef CONFIG_NFS_V3_ACL - .listxattr = generic_listxattr, + .listxattr = nfs3_listxattr, .getxattr = generic_getxattr, .setxattr = generic_setxattr, .removexattr = generic_removexattr,
@@ -905,7 +905,7 @@ static const struct inode_operations nfs3_file_inode_operations = { .getattr = nfs_getattr, .setattr = nfs_setattr, #ifdef CONFIG_NFS_V3_ACL - .listxattr = generic_listxattr, + .listxattr = nfs3_listxattr, .getxattr = generic_getxattr, .setxattr = generic_setxattr, .removexattr = generic_removexattr,
include/linux/libata.h +1 -0
@@ -593,6 +593,7 @@ struct ata_host {struct device *dev;void __iomem *const *iomap;unsigned int n_ports; +unsigned int n_tags;/* nr of NCQ tags */ void *private_data;struct ata_port_operations *ops;unsigned long flags;
include/uapi/linux/fuse.h +3 -0
@@ -101,6 +101,7 @@* - add FATTR_CTIME * - add ctime and ctimensec to fuse_setattr_in * - add FUSE_RENAME2 request +* - add FUSE_NO_OPEN_SUPPORT flag */ #ifndef _LINUX_FUSE_H
@@ -229,6 +230,7 @@ struct fuse_file_lock {* FUSE_READDIRPLUS_AUTO: adaptive readdirplus * FUSE_ASYNC_DIO: asynchronous direct I/O submission * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes +* FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens */ #define FUSE_ASYNC_READ (1 << 0)#define FUSE_POSIX_LOCKS (1 << 1)
@@ -247,6 +249,7 @@ struct fuse_file_lock {#define FUSE_READDIRPLUS_AUTO (1 << 14)#define FUSE_ASYNC_DIO (1 << 15)#define FUSE_WRITEBACK_CACHE (1 << 16) +#define FUSE_NO_OPEN_SUPPORT (1 << 17)/** * CUSE INIT request/reply flags
kernel/trace/trace.c +1 -1
@@ -823,7 +823,7 @@ static struct { { trace_clock_local, "local", 1 }, { trace_clock_global, "global", 1 }, { trace_clock_counter, "counter", 0 }, - { trace_clock_jiffies, "uptime", 1 }, + { trace_clock_jiffies, "uptime", 0 }, { trace_clock, "perf", 1 },ARCH_TRACE_CLOCKS };
kernel/trace/trace_clock.c +5 -4
@@ -59,13 +59,14 @@ u64 notrace trace_clock(void)/* * trace_jiffy_clock(): Simply use jiffies as a clock counter. +* Note that this use of jiffies_64 is not completely safe on +* 32-bit systems. But the window is tiny, and the effect if +* we are affected is that we will have an obviously bogus +* timestamp on a trace event - i.e. not life threatening. */ u64 notrace trace_clock_jiffies(void) { -u64 jiffy = jiffies -INITIAL_JIFFIES ; - -/* Return nsecs */ -return (u64 )jiffies_to_usecs (jiffy) *1000ULL ; +return jiffies_64_to_clock_t (jiffies_64 -INITIAL_JIFFIES ); }/*
mm/hugetlb.c +1 -0
@@ -2461,6 +2461,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, }else {if (cow)huge_ptep_set_wrprotect (src, addr, src_pte); + entry =huge_ptep_get (src_pte); ptepage =pte_page (entry);get_page (ptepage);page_dup_rmap (ptepage);
mm/memory.c +1 -1
@@ -3515,7 +3515,7 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,* if page by the offset is not ready to be mapped (cold cache or * something). */ -if (vma->vm_ops->map_pages) { +if (vma->vm_ops->map_pages && !(flags &FAULT_FLAG_NONLINEAR )) { pte =pte_offset_map_lock (mm, pmd, address, &ptl);do_fault_around (vma, address, pte, pgoff, flags);if (!pte_same (*pte, orig_pte))
mm/slab_common.c +1 -1
@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size)continue ; } -#if !defined(CONFIG_SLUB ) || !defined(CONFIG_SLUB_DEBUG_ON ) +#if !defined(CONFIG_SLUB )if (!strcmp (s->name, name)) {pr_err ("%s (%s): Cache name already exists.\n" , __func__, name);
net/wireless/nl80211.c +5 -6
@@ -1470,18 +1470,17 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, }CMD (start_p2p_device,START_P2P_DEVICE );CMD (set_mcast_rate,SET_MCAST_RATE ); +#ifdef CONFIG_NL80211_TESTMODE +CMD (testmode_cmd,TESTMODE ); +#endif if (state->split) {CMD (crit_proto_start,CRIT_PROTOCOL_START );CMD (crit_proto_stop,CRIT_PROTOCOL_STOP );if (dev->wiphy.flags &WIPHY_FLAG_HAS_CHANNEL_SWITCH )CMD (channel_switch,CHANNEL_SWITCH ); +CMD (set_qos_map,SET_QOS_MAP ); } -CMD (set_qos_map,SET_QOS_MAP ); - -#ifdef CONFIG_NL80211_TESTMODE -CMD (testmode_cmd,TESTMODE ); -#endif - +/* add into the if now */ #undef CMDif (dev->ops->connect || dev->ops->auth) {