Linux 4.9.24
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 23 +SUBLEVEL = 24 EXTRAVERSION = NAME = Roaring Lionus
arch/mips/lantiq/irq.c +21 -17
@@ -269,11 +269,6 @@ static void ltq_hw5_irqdispatch(void) DEFINE_HWx_IRQDISPATCH(5)#endif -static void ltq_hw_irq_handler (struct irq_desc *desc) -{ -ltq_hw_irqdispatch (irq_desc_get_irq (desc) -2 ); -} -#ifdef CONFIG_MIPS_MT_SMP void __init arch_init_ipiirq (int irq,struct irqaction *action) {
@@ -318,19 +313,23 @@ static struct irqaction irq_call = { asmlinkage void plat_irq_dispatch(void) {unsigned int pending =read_c0_status () &read_c0_cause () &ST0_IM ; -int irq; - -if (!pending) { -spurious_interrupt (); -return ; +unsigned int i; + +if ((MIPS_CPU_TIMER_IRQ ==7 ) && (pending &CAUSEF_IP7 )) { +do_IRQ (MIPS_CPU_TIMER_IRQ ); + goto out; + }else { +for (i =0 ; i <MAX_IM ; i++) { +if (pending & (CAUSEF_IP2 << i)) { +ltq_hw_irqdispatch (i); + goto out; + } + } } +pr_alert ("Spurious IRQ: CAUSE=0x%08x\n" ,read_c0_status ()); - pending >>=CAUSEB_IP ; -while (pending) { - irq =fls (pending) -1 ; -do_IRQ (MIPS_CPU_IRQ_BASE + irq); - pending &= ~BIT (irq); - } +out: +return ; }static int icu_map (struct irq_domain *d,unsigned int irq,irq_hw_number_t hw)
@@ -355,6 +354,11 @@ static const struct irq_domain_ops irq_domain_ops = { .map = icu_map, }; +static struct irqaction cascade = { + .handler = no_action, + .name ="cascade" , +}; +int __init icu_of_init (struct device_node *node,struct device_node *parent) {struct device_node *eiu_node;
@@ -386,7 +390,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)mips_cpu_irq_init ();for (i =0 ; i <MAX_IM ; i++) -irq_set_chained_handler (i +2 , ltq_hw_irq_handler); +setup_irq (i +2 , &cascade);if (cpu_has_vint) {pr_info ("Setting up vectored interrupts\n" );
arch/parisc/include/asm/uaccess.h +55 -31
128 lines not on this page · raw message
arch/parisc/lib/lusercopy.S +14 -13
@@ -201,7 +201,7 @@ ENTRY_CFI(pa_memcpy) add dst,len,end /* short copy with less than 16 bytes? */ - cmpib,>>=,n 15,len,.Lbyte_loop + cmpib,COND(>>=),n 15,len,.Lbyte_loop /* same alignment? */ xor src,dst,t0
@@ -216,7 +216,7 @@ ENTRY_CFI(pa_memcpy) /* loop until we are 64-bit aligned */ .Lalign_loop64: extru dst,31,3,t1 - cmpib,=,n 0,t1,.Lcopy_loop_16 + cmpib,=,n 0,t1,.Lcopy_loop_16_start 20: ldb,ma 1(srcspc,src),t1 21: stb,ma t1,1(dstspc,dst) b .Lalign_loop64
@@ -225,6 +225,7 @@ ENTRY_CFI(pa_memcpy) ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done) ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) +.Lcopy_loop_16_start: ldi 31,t0 .Lcopy_loop_16: cmpb,COND(>>=),n t0,len,.Lword_loop
@@ -267,7 +268,7 @@ ENTRY_CFI(pa_memcpy) /* loop until we are 32-bit aligned */ .Lalign_loop32: extru dst,31,2,t1 - cmpib,=,n 0,t1,.Lcopy_loop_4 + cmpib,=,n 0,t1,.Lcopy_loop_8 20: ldb,ma 1(srcspc,src),t1 21: stb,ma t1,1(dstspc,dst) b .Lalign_loop32
@@ -277,7 +278,7 @@ ENTRY_CFI(pa_memcpy) ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) -.Lcopy_loop_4: +.Lcopy_loop_8: cmpib,COND(>>=),n 15,len,.Lbyte_loop 10: ldw 0(srcspc,src),t1
@@ -299,7 +300,7 @@ ENTRY_CFI(pa_memcpy) ASM_EXCEPTIONTABLE_ENTRY(16b,.Lcopy_done) ASM_EXCEPTIONTABLE_ENTRY(17b,.Lcopy_done) - b .Lcopy_loop_4 + b .Lcopy_loop_8 ldo -16(len),len .Lbyte_loop:
@@ -324,7 +325,7 @@ ENTRY_CFI(pa_memcpy) .Lunaligned_copy: /* align until dst is 32bit-word-aligned */ extru dst,31,2,t1 - cmpib,COND(=),n 0,t1,.Lcopy_dstaligned + cmpib,=,n 0,t1,.Lcopy_dstaligned 20: ldb 0(srcspc,src),t1 ldo 1(src),src 21: stb,ma t1,1(dstspc,dst)
@@ -362,7 +363,7 @@ ENTRY_CFI(pa_memcpy) cmpiclr,<> 1,t0,%r0 b,n .Lcase1 .Lcase0: - cmpb,= %r0,len,.Lcda_finish + cmpb,COND(=) %r0,len,.Lcda_finish nop 1: ldw,ma 4(srcspc,src), a3
@@ -376,7 +377,7 @@ ENTRY_CFI(pa_memcpy) 1: ldw,ma 4(srcspc,src), a3 ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) ldo -1(len),len - cmpb,=,n %r0,len,.Ldo0 + cmpb,COND(=),n %r0,len,.Ldo0 .Ldo4: 1: ldw,ma 4(srcspc,src), a0 ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault)
@@ -402,7 +403,7 @@ ENTRY_CFI(pa_memcpy) 1: stw,ma t0, 4(dstspc,dst) ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done) ldo -4(len),len - cmpb,<> %r0,len,.Ldo4 + cmpb,COND(<>) %r0,len,.Ldo4 nop .Ldo0: shrpw a2, a3, %sar, t0
@@ -436,14 +437,14 @@ ENTRY_CFI(pa_memcpy) /* fault exception fixup handlers: */ #ifdef CONFIG_64BIT .Lcopy16_fault: -10: b .Lcopy_done - std,ma t1,8(dstspc,dst) + b .Lcopy_done +10: std,ma t1,8(dstspc,dst) ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done) #endif .Lcopy8_fault: -10: b .Lcopy_done - stw,ma t1,4(dstspc,dst) + b .Lcopy_done +10: stw,ma t1,4(dstspc,dst) ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done) .exit
arch/x86/entry/vdso/vdso32-setup.c +9 -2
@@ -30,8 +30,10 @@ static int __init vdso32_setup(char *s) { vdso32_enabled =simple_strtoul (s,NULL ,0 ); -if (vdso32_enabled >1 ) +if (vdso32_enabled >1 ) {pr_warn ("vdso32 values other than 0 and 1 are no longer allowed; vdso disabled\n" ); + vdso32_enabled =0 ; + }return 1 ; }
@@ -62,13 +64,18 @@ subsys_initcall(sysenter_setup);/* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h> +static const int zero; +static const int one =1 ; +static struct ctl_table abi_table2[] = { { .procname ="vsyscall32" , .data = &vdso32_enabled, .maxlen =sizeof (int ), .mode =0644 , - .proc_handler = proc_dointvec + .proc_handler = proc_dointvec_minmax, + .extra1 = (int *)&zero, + .extra2 = (int *)&one, }, {} };
arch/x86/events/intel/lbr.c +3 -0
@@ -507,6 +507,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].to = msr_lastbranch.to; cpuc->lbr_entries[i].mispred =0 ; cpuc->lbr_entries[i].predicted =0 ; + cpuc->lbr_entries[i].in_tx =0 ; + cpuc->lbr_entries[i].abort =0 ; + cpuc->lbr_entries[i].cycles =0 ; cpuc->lbr_entries[i].reserved =0 ; } cpuc->lbr_stack.nr = i;
arch/x86/include/asm/elf.h +1 -1
@@ -278,7 +278,7 @@ struct task_struct;#define ARCH_DLINFO_IA32 \ do { \ - if (vdso32_enabled) { \ + if (VDSO_CURRENT_BASE) { \ NEW_AUX_ENT(AT_SYSINFO, VDSO_ENTRY); \ NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_CURRENT_BASE); \ } \
arch/x86/include/asm/pmem.h +31 -11
60 lines not on this page · raw message
arch/x86/kernel/signal_compat.c +2 -2
@@ -151,8 +151,8 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from,if (from->si_signo ==SIGSEGV ) {if (from->si_code ==SEGV_BNDERR ) { -compat_uptr_t lower = (unsigned long )&to->si_lower; -compat_uptr_t upper = (unsigned long )&to->si_upper; +compat_uptr_t lower = (unsigned long )from->si_lower; +compat_uptr_t upper = (unsigned long )from->si_upper;put_user_ex (lower, &to->si_lower);put_user_ex (upper, &to->si_upper); }
arch/x86/kvm/vmx.c +8 -2
@@ -6925,14 +6925,20 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, } page =nested_get_page (vcpu, vmptr); -if (page ==NULL || - *(u32 *)kmap (page) !=VMCS12_REVISION ) { +if (page ==NULL ) {nested_vmx_failInvalid (vcpu); +skip_emulated_instruction (vcpu); +return 1 ; + } +if (*(u32 *)kmap (page) !=VMCS12_REVISION ) {kunmap (page); +nested_release_page_clean (page); +nested_vmx_failInvalid (vcpu);skip_emulated_instruction (vcpu);return 1 ; }kunmap (page); +nested_release_page_clean (page); vmx->nested.vmxon_ptr = vmptr;break ;case EXIT_REASON_VMCLEAR :
arch/x86/mm/init.c +30 -11
51 lines not on this page · raw message
arch/x86/platform/efi/quirks.c +4 -0
@@ -201,6 +201,10 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size)return ; } +/* No need to reserve regions that will never be freed. */ +if (md.attribute &EFI_MEMORY_RUNTIME ) +return ; + size += addr %EFI_PAGE_SIZE ; size =round_up (size,EFI_PAGE_SIZE ); addr =round_down (addr,EFI_PAGE_SIZE );
arch/x86/xen/apic.c +1 -1
@@ -145,7 +145,7 @@ static void xen_silent_inquire(int apicid)static int xen_cpu_present_to_apicid (int cpu) {if (cpu_present (cpu)) -return xen_get_apic_id (xen_apic_read (APIC_ID )); +return cpu_data (cpu).apicid;else return BAD_APICID ; }
crypto/ahash.c +50 -29
163 lines not on this page · raw message
crypto/algif_aead.c +6 -6
@@ -39,6 +39,7 @@ struct aead_async_req {struct aead_async_rsgl first_rsgl;struct list_head list;struct kiocb *iocb; +struct sock *sk;unsigned int tsgls;char iv[]; };
@@ -379,12 +380,10 @@ static ssize_t aead_sendpage(struct socket *sock, struct page *page,static void aead_async_cb (struct crypto_async_request *_req,int err) { -struct sock *sk = _req->data; -struct alg_sock *ask =alg_sk (sk); -struct aead_ctx *ctx = ask->private; -struct crypto_aead *tfm =crypto_aead_reqtfm (&ctx->aead_req); -struct aead_request *req =aead_request_cast (_req); +struct aead_request *req = _req->data; +struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aead_async_req *areq =GET_ASYM_REQ (req, tfm); +struct sock *sk = areq->sk;struct scatterlist *sg = areq->tsgl;struct aead_async_rsgl *rsgl;struct kiocb *iocb = areq->iocb;
@@ -447,11 +446,12 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,memset (&areq->first_rsgl,'\0' ,sizeof (areq->first_rsgl));INIT_LIST_HEAD (&areq->list); areq->iocb = msg->msg_iocb; + areq->sk = sk;memcpy (areq->iv, ctx->iv,crypto_aead_ivsize (tfm));aead_request_set_tfm (req, tfm);aead_request_set_ad (req, ctx->aead_assoclen);aead_request_set_callback (req,CRYPTO_TFM_REQ_MAY_BACKLOG , - aead_async_cb, sk); + aead_async_cb, req); used -= ctx->aead_assoclen;/* take over all tx sgls from ctx */
drivers/acpi/ec.c +30 -32
114 lines not on this page · raw message
drivers/acpi/internal.h +2 -2
@@ -172,8 +172,8 @@ struct acpi_ec {struct work_struct work;unsigned long timestamp;unsigned long nr_pending_queries; -bool saved_busy_polling; -unsigned int saved_polling_guard; +bool busy_polling; +unsigned int polling_guard; };extern struct acpi_ec *first_ec;
drivers/acpi/nfit/core.c +5 -1
@@ -1617,7 +1617,11 @@ static int cmp_map(const void *m0, const void *m1)const struct nfit_set_info_map *map0 = m0;const struct nfit_set_info_map *map1 = m1; -return map0->region_offset - map1->region_offset; +if (map0->region_offset < map1->region_offset) +return -1 ; +else if (map0->region_offset > map1->region_offset) +return 1 ; +return 0 ; }/* Retrieve the nth entry referencing this spa */
drivers/acpi/scan.c +12 -7
@@ -1827,15 +1827,20 @@ static void acpi_bus_attach(struct acpi_device *device)return ; device->flags.match_driver = true; -if (!ret) { - ret =device_attach (&device->dev); -if (ret <0 ) -return ; - -if (!ret && device->pnp.type.platform_id) -acpi_default_enumeration (device); +if (ret >0 ) { +acpi_device_set_enumerated (device); + goto ok; } + ret =device_attach (&device->dev); +if (ret <0 ) +return ; + +if (ret >0 || !device->pnp.type.platform_id) +acpi_device_set_enumerated (device); +else +acpi_default_enumeration (device); + ok:list_for_each_entry (child, &device->children, node)acpi_bus_attach (child);
drivers/block/nbd.c +5 -5
@@ -54,7 +54,7 @@ struct nbd_device {struct mutex tx_lock;struct gendisk *disk; -int blksize; +loff_t blksize;loff_t bytesize;/* protects initialization and shutdown of the socket */
@@ -126,7 +126,7 @@ static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev) }static int nbd_size_set (struct nbd_device *nbd,struct block_device *bdev, -int blocksize,int nr_blocks) +loff_t blocksize,loff_t nr_blocks) {int ret;
@@ -135,7 +135,7 @@ static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev,return ret; nbd->blksize = blocksize; - nbd->bytesize = (loff_t )blocksize * (loff_t )nr_blocks; + nbd->bytesize = blocksize * nr_blocks;nbd_size_update (nbd, bdev);
@@ -648,7 +648,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,case NBD_SET_SIZE :return nbd_size_set (nbd, bdev, nbd->blksize, - arg / nbd->blksize); +div_s64 (arg, nbd->blksize));case NBD_SET_SIZE_BLOCKS :return nbd_size_set (nbd, bdev, nbd->blksize, arg);
@@ -817,7 +817,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)debugfs_create_file ("tasks" ,0444 , dir, nbd, &nbd_dbg_tasks_ops);debugfs_create_u64 ("size_bytes" ,0444 , dir, &nbd->bytesize);debugfs_create_u32 ("timeout" ,0444 , dir, &nbd->tag_set.timeout); -debugfs_create_u32 ("blocksize" ,0444 , dir, &nbd->blksize); +debugfs_create_u64 ("blocksize" ,0444 , dir, &nbd->blksize);debugfs_create_file ("flags" ,0444 , dir, nbd, &nbd_dbg_flags_ops);return 0 ;
drivers/block/zram/zram_drv.c +3 -3
@@ -582,13 +582,13 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)if (!handle ||zram_test_flag (meta, index,ZRAM_ZERO )) {bit_spin_unlock (ZRAM_ACCESS , &meta->table[index].value); -clear_page (mem); +memset (mem,0 ,PAGE_SIZE );return 0 ; } cmem =zs_map_object (meta->mem_pool, handle,ZS_MM_RO );if (size ==PAGE_SIZE ) { -copy_page (mem, cmem); +memcpy (mem, cmem,PAGE_SIZE ); }else {struct zcomp_strm *zstrm =zcomp_stream_get (zram->comp);
@@ -780,7 +780,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,if ((clen ==PAGE_SIZE ) && !is_partial_io (bvec)) { src =kmap_atomic (page); -copy_page (cmem, src); +memcpy (cmem, src,PAGE_SIZE );kunmap_atomic (src); }else {memcpy (cmem, src, clen);
drivers/char/Kconfig +4 -1
@@ -571,9 +571,12 @@ config TELCLOCK controlling the behavior of this hardware. config DEVPORT - bool + bool "/dev/port character device" depends on ISA || PCI default y + help + Say Y here if you want to support the /dev/port device. The /dev/port + device is similar to /dev/mem, but for I/O ports. source "drivers/s390/char/Kconfig"
drivers/char/mem.c +52 -30
117 lines not on this page · raw message
drivers/char/virtio_console.c +10 -2
@@ -1136,6 +1136,8 @@ static int put_chars(u32 vtermno, const char *buf, int count) {struct port *port;struct scatterlist sg[1 ]; +void *data; +int ret;if (unlikely (early_put_chars))return early_put_chars (vtermno, buf, count);
@@ -1144,8 +1146,14 @@ static int put_chars(u32 vtermno, const char *buf, int count)if (!port)return -EPIPE ; -sg_init_one (sg, buf, count); -return __send_to_port (port, sg,1 , count, (void *)buf, false); + data =kmemdup (buf, count,GFP_ATOMIC ); +if (!data) +return -ENOMEM ; + +sg_init_one (sg, data, count); + ret =__send_to_port (port, sg,1 , count, data, false); +kfree (data); +return ret; }/*
drivers/cpufreq/cpufreq.c +16 -2
@@ -2404,6 +2404,20 @@ EXPORT_SYMBOL_GPL(cpufreq_boost_enabled);*********************************************************************/ static enum cpuhp_state hp_online; +static int cpuhp_cpufreq_online (unsigned int cpu) +{ +cpufreq_online (cpu); + +return 0 ; +} + +static int cpuhp_cpufreq_offline (unsigned int cpu) +{ +cpufreq_offline (cpu); + +return 0 ; +} +/** * cpufreq_register_driver - register a CPU Frequency driver * @driver_data: A struct cpufreq_driver containing the values#
@@ -2466,8 +2480,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) } ret =cpuhp_setup_state_nocalls (CPUHP_AP_ONLINE_DYN ,"cpufreq:online" , - cpufreq_online, - cpufreq_offline); + cpuhp_cpufreq_online, + cpuhp_cpufreq_offline);if (ret <0 ) goto err_if_unreg; hp_online = ret;
drivers/firmware/efi/libstub/gop.c +4 -2
@@ -149,7 +149,8 @@ setup_gop32(efi_system_table_t *sys_table_arg, struct screen_info *si, status =__gop_query32 (sys_table_arg, gop32, &info, &size, ¤t_fb_base); -if (status ==EFI_SUCCESS && (!first_gop || conout_found)) { +if (status ==EFI_SUCCESS && (!first_gop || conout_found) && + info->pixel_format !=PIXEL_BLT_ONLY ) {/* * Systems that use the UEFI Console Splitter may * provide multiple GOP devices, not all of which are
@@ -266,7 +267,8 @@ setup_gop64(efi_system_table_t *sys_table_arg, struct screen_info *si, status =__gop_query64 (sys_table_arg, gop64, &info, &size, ¤t_fb_base); -if (status ==EFI_SUCCESS && (!first_gop || conout_found)) { +if (status ==EFI_SUCCESS && (!first_gop || conout_found) && + info->pixel_format !=PIXEL_BLT_ONLY ) {/* * Systems that use the UEFI Console Splitter may * provide multiple GOP devices, not all of which are
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -1
@@ -1305,7 +1305,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,if (!fence) {event_free (gpu, event); ret = -ENOMEM ; - goto out_pm_put; + goto out_unlock; } gpu->event[event].fence = fence;
@@ -1345,6 +1345,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,hangcheck_timer_reset (gpu); ret =0 ; +out_unlock:mutex_unlock (&gpu->lock); out_pm_put:
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +1 -1
@@ -714,7 +714,7 @@ nv4a_chipset = { .i2c = nv04_i2c_new, .imem = nv40_instmem_new, .mc = nv44_mc_new, - .mmu = nv44_mmu_new, + .mmu = nv04_mmu_new, .pci = nv40_pci_new, .therm = nv40_therm_new, .timer = nv41_timer_new,
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c +0 -2
@@ -433,8 +433,6 @@ nv50_disp_dptmds_war(struct nvkm_device *device)case 0x94 :case 0x96 :case 0x98 : -case 0xaa : -case 0xac :return true;default :break ;
drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c +1 -1
@@ -198,7 +198,7 @@ nv31_mpeg_intr(struct nvkm_engine *engine) }if (type ==0x00000010 ) { -if (!nv31_mpeg_mthd (mpeg, mthd, data)) +if (nv31_mpeg_mthd (mpeg, mthd, data)) show &= ~0x01000000 ; } }
drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c +1 -1
@@ -172,7 +172,7 @@ nv44_mpeg_intr(struct nvkm_engine *engine) }if (type ==0x00000010 ) { -if (!nv44_mpeg_mthd (subdev->device, mthd, data)) +if (nv44_mpeg_mthd (subdev->device, mthd, data)) show &= ~0x01000000 ; } }
drivers/input/joystick/xpad.c +2 -0
@@ -201,6 +201,7 @@ static const struct xpad_device { { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 }, { 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 }, + { 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE }, { 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f0a, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 },
@@ -329,6 +330,7 @@ static struct usb_device_id xpad_table[] = {XPAD_XBOX360_VENDOR (0x24c6 ),/* PowerA Controllers */ XPAD_XBOXONE_VENDOR (0x24c6 ),/* PowerA Controllers */ XPAD_XBOX360_VENDOR (0x1532 ),/* Razer Sabertooth */ +XPAD_XBOXONE_VENDOR (0x1532 ),/* Razer Wildcat */ XPAD_XBOX360_VENDOR (0x15e4 ),/* Numark X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ { }
drivers/irqchip/irq-imx-gpcv2.c +2 -0
@@ -230,6 +230,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,return -ENOMEM ; } +raw_spin_lock_init (&cd->rlock); + cd->gpc_base =of_iomap (node,0 );if (!cd->gpc_base) {pr_err ("fsl-gpcv2: unable to map gpc registers\n" );
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c +5 -4
@@ -1013,8 +1013,8 @@ EXPORT_SYMBOL(dvb_usbv2_probe);void dvb_usbv2_disconnect (struct usb_interface *intf) {struct dvb_usb_device *d =usb_get_intfdata (intf); -const char *name = d->name; -struct device dev = d->udev->dev; +const char *devname =kstrdup (dev_name (&d->udev->dev),GFP_KERNEL ); +const char *drvname = d->name;dev_dbg (&d->udev->dev,"%s: bInterfaceNumber=%d\n" , __func__, intf->cur_altsetting->desc.bInterfaceNumber);
@@ -1024,8 +1024,9 @@ void dvb_usbv2_disconnect(struct usb_interface *intf)dvb_usbv2_exit (d); -dev_info (&dev,"%s: '%s' successfully deinitialized and disconnected\n" , -KBUILD_MODNAME , name); +pr_info ("%s: '%s:%s' successfully deinitialized and disconnected\n" , +KBUILD_MODNAME , drvname, devname); +kfree (devname); }EXPORT_SYMBOL (dvb_usbv2_disconnect);
drivers/media/usb/dvb-usb/cxusb.c +8 -7
@@ -59,23 +59,24 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d, u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen) { struct cxusb_state *st = d->priv; -int ret, wo; +int ret;if (1 + wlen >MAX_XFER_SIZE ) {warn ("i2c wr: len=%d is too big!\n" , wlen);return -EOPNOTSUPP ; } - wo = (rbuf ==NULL || rlen ==0 );/* write-only */ +if (rlen >MAX_XFER_SIZE ) { +warn ("i2c rd: len=%d is too big!\n" , rlen); +return -EOPNOTSUPP ; + }mutex_lock (&d->data_mutex); st->data[0 ] = cmd;memcpy (&st->data[1 ], wbuf, wlen); -if (wo) - ret =dvb_usb_generic_write (d, st->data,1 + wlen); -else - ret =dvb_usb_generic_rw (d, st->data,1 + wlen, - rbuf, rlen,0 ); + ret =dvb_usb_generic_rw (d, st->data,1 + wlen, st->data, rlen,0 ); +if (!ret && rbuf && rlen) +memcpy (rbuf, st->data, rlen);mutex_unlock (&d->data_mutex);return ret;
drivers/media/usb/dvb-usb/dvb-usb-firmware.c +21 -12
@@ -35,42 +35,51 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 leint usb_cypress_load_firmware (struct usb_device *udev,const struct firmware *fw,int type) { -struct hexline hx; -u8 reset; -int ret,pos=0 ; +struct hexline *hx; +u8 *buf; +int ret, pos =0 ; +u16 cpu_cs_register = cypress[type].cpu_cs_register; + + buf =kmalloc (sizeof (*hx),GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + hx = (struct hexline *)buf;/* stop the CPU */ - reset =1 ; -if ((ret =usb_cypress_writemem (udev,cypress[type].cpu_cs_register,&reset,1 )) !=1 ) + buf[0 ] =1 ; +if (usb_cypress_writemem (udev, cpu_cs_register, buf,1 ) !=1 )err ("could not stop the USB controller CPU." ); -while ((ret =dvb_usb_get_hexline (fw,&hx,&pos)) >0 ) { -deb_fw ("writing to address 0x%04x (buffer: 0x%02x %02x)\n" ,hx.addr,hx.len,hx.chk); - ret =usb_cypress_writemem (udev,hx.addr,hx.data,hx.len); +while ((ret =dvb_usb_get_hexline (fw, hx, &pos)) >0 ) { +deb_fw ("writing to address 0x%04x (buffer: 0x%02x %02x)\n" , hx->addr, hx->len, hx->chk); + ret =usb_cypress_writemem (udev, hx->addr, hx->data, hx->len); -if (ret != hx.len) { +if (ret != hx->len) {err ("error while transferring firmware " "(transferred size: %d, block size: %d)" , - ret,hx.len); + ret, hx->len); ret = -EINVAL ;break ; } }if (ret <0 ) {err ("firmware download failed at %d with %d" ,pos,ret); +kfree (buf);return ret; }if (ret ==0 ) {/* restart the CPU */ - reset =0 ; -if (ret ||usb_cypress_writemem (udev,cypress[type].cpu_cs_register,&reset,1 ) !=1 ) { + buf[0 ] =0 ; +if (usb_cypress_writemem (udev, cpu_cs_register, buf,1 ) !=1 ) {err ("could not restart the USB controller CPU." ); ret = -EINVAL ; } }else ret = -EIO ; +kfree (buf); +return ret; }EXPORT_SYMBOL (usb_cypress_load_firmware);
drivers/net/can/ifi_canfd/ifi_canfd.c +1 -1
@@ -557,7 +557,7 @@ static int ifi_canfd_poll(struct napi_struct *napi, int quota)int work_done =0 ;u32 stcmd =readl (priv->base +IFI_CANFD_STCMD ); -u32 rxstcmd =readl (priv->base +IFI_CANFD_STCMD ); +u32 rxstcmd =readl (priv->base +IFI_CANFD_RXSTCMD );u32 errctr =readl (priv->base +IFI_CANFD_ERROR_CTR );/* Handle bus state changes */
drivers/net/wireless/ath/ath9k/common-spectral.c +7 -1
@@ -528,6 +528,9 @@ int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hif (!(radar_info->pulse_bw_info &SPECTRAL_SCAN_BITMASK ))return 0 ; +if (!spec_priv->rfs_chan_spec_scan) +return 1 ; +/* Output buffers are full, no need to process anything * since there is no space to put the result anyway */
@@ -1072,7 +1075,7 @@ static struct rchan_callbacks rfs_spec_scan_cb = {void ath9k_cmn_spectral_deinit_debug (struct ath_spec_scan_priv *spec_priv) { -if (IS_ENABLED (CONFIG_ATH9K_DEBUGFS )) { +if (IS_ENABLED (CONFIG_ATH9K_DEBUGFS ) && spec_priv->rfs_chan_spec_scan) {relay_close (spec_priv->rfs_chan_spec_scan); spec_priv->rfs_chan_spec_scan =NULL ; }
@@ -1086,6 +1089,9 @@ void ath9k_cmn_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, debugfs_phy,1024 ,256 , &rfs_spec_scan_cb, NULL); +if (!spec_priv->rfs_chan_spec_scan) +return ; + debugfs_create_file("spectral_scan_ctl", S_IRUSR | S_IWUSR, debugfs_phy, spec_priv,
drivers/nvdimm/bus.c +6 -0
@@ -934,8 +934,14 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, rc = nd_desc->ndctl (nd_desc, nvdimm, cmd, buf, buf_len,NULL );if (rc <0 ) goto out_unlock; +nvdimm_bus_unlock (&nvdimm_bus->dev); +if (copy_to_user (p, buf, buf_len)) rc = -EFAULT ; + +vfree (buf); +return rc; + out_unlock:nvdimm_bus_unlock (&nvdimm_bus->dev); out:
drivers/nvdimm/dimm_devs.c +11 -66
110 lines not on this page · raw message
drivers/platform/x86/acer-wmi.c +18 -4
@@ -1846,11 +1846,24 @@ static int __init acer_wmi_enable_lm(void)return status; } +#define ACER_WMID_ACCEL_HID "BST0001" +static acpi_status __init acer_wmi_get_handle_cb (acpi_handle ah,u32 level,void *ctx,void **retval) { +struct acpi_device *dev; + +if (!strcmp (ctx,"SENR" )) { +if (acpi_bus_get_device (ah, &dev)) +return AE_OK ; +if (!strcmp (ACER_WMID_ACCEL_HID ,acpi_device_hid (dev))) +return AE_OK ; + }else +return AE_OK ; + *(acpi_handle *)retval = ah; -return AE_OK ; + +return AE_CTRL_TERMINATE ; } static int __init acer_wmi_get_handle(const char *name, const char *prop,
@@ -1877,7 +1890,7 @@ static int __init acer_wmi_accel_setup(void) {int err; - err =acer_wmi_get_handle ("SENR" ,"BST0001" , &gsensor_handle); + err =acer_wmi_get_handle ("SENR" ,ACER_WMID_ACCEL_HID , &gsensor_handle);if (err)return err;
@@ -2233,10 +2246,11 @@ static int __init acer_wmi_init(void) err =acer_wmi_input_setup ();if (err)return err; + err =acer_wmi_accel_setup (); +if (err) +return err; } -acer_wmi_accel_setup (); - err =platform_driver_register (&acer_platform_driver);if (err) {pr_err ("Unable to register platform driver\n" );
drivers/pwm/pwm-rockchip.c +33 -7
@@ -191,6 +191,28 @@ static int rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,return 0 ; } +static int rockchip_pwm_enable (struct pwm_chip *chip, +struct pwm_device *pwm, +bool enable, +enum pwm_polarity polarity) +{ +struct rockchip_pwm_chip *pc =to_rockchip_pwm_chip (chip); +int ret; + +if (enable) { + ret =clk_enable (pc->clk); +if (ret) +return ret; + } + + pc->data->set_enable (chip, pwm, enable, polarity); + +if (!enable) +clk_disable (pc->clk); + +return 0 ; +} +static int rockchip_pwm_apply (struct pwm_chip *chip,struct pwm_device *pwm,struct pwm_state *state) {
@@ -207,22 +229,26 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,return ret;if (state->polarity != curstate.polarity && enabled) { - pc->data->set_enable (chip, pwm, false, state->polarity); + ret =rockchip_pwm_enable (chip, pwm, false, state->polarity); +if (ret) + goto out; enabled = false; } ret =rockchip_pwm_config (chip, pwm, state->duty_cycle, state->period);if (ret) {if (enabled != curstate.enabled) - pc->data->set_enable (chip, pwm, !enabled, - state->polarity); - +rockchip_pwm_enable (chip, pwm, !enabled, + state->polarity); goto out; } -if (state->enabled != enabled) - pc->data->set_enable (chip, pwm, state->enabled, - state->polarity); +if (state->enabled != enabled) { + ret =rockchip_pwm_enable (chip, pwm, state->enabled, + state->polarity); +if (ret) + goto out; + }/* * Update the state with the real hardware, which can differ a bit
drivers/rtc/rtc-tegra.c +26 -2
@@ -18,6 +18,7 @@* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <linux/kernel.h> +#include <linux/clk.h> #include <linux/init.h> #include <linux/module.h> #include <linux/slab.h>
@@ -59,6 +60,7 @@ struct tegra_rtc_info {struct platform_device *pdev;struct rtc_device *rtc_dev;void __iomem *rtc_base;/* NULL if not initialized. */ +struct clk *clk;int tegra_rtc_irq;/* alarm and periodic irq */ spinlock_t tegra_rtc_lock; };
@@ -326,6 +328,14 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)if (info->tegra_rtc_irq <=0 )return -EBUSY ; + info->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (info->clk)) +return PTR_ERR (info->clk); + + ret =clk_prepare_enable (info->clk); +if (ret <0 ) +return ret; +/* set context info. */ info->pdev = pdev;spin_lock_init (&info->tegra_rtc_lock);
@@ -346,7 +356,7 @@ static int __init tegra_rtc_probe(struct platform_device *pdev) ret =PTR_ERR (info->rtc_dev);dev_err (&pdev->dev,"Unable to register device (err=%d).\n" , ret); -return ret; + goto disable_clk; } ret = devm_request_irq(&pdev->dev, info->tegra_rtc_irq,
@@ -356,12 +366,25 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Unable to request interrupt for device (err=%d).\n" , ret); -return ret; + goto disable_clk; }dev_notice (&pdev->dev,"Tegra internal Real Time Clock\n" );return 0 ; + +disable_clk: +clk_disable_unprepare (info->clk); +return ret; +} + +static int tegra_rtc_remove (struct platform_device *pdev) +{ +struct tegra_rtc_info *info =platform_get_drvdata (pdev); + +clk_disable_unprepare (info->clk); + +return 0 ; }#ifdef CONFIG_PM_SLEEP
@@ -413,6 +436,7 @@ static void tegra_rtc_shutdown(struct platform_device *pdev)MODULE_ALIAS ("platform:tegra_rtc" );static struct platform_driver tegra_rtc_driver = { + .remove = tegra_rtc_remove, .shutdown = tegra_rtc_shutdown, .driver = { .name ="tegra_rtc" ,
drivers/scsi/qla2xxx/qla_os.c +6 -1
@@ -968,8 +968,13 @@ static inlineuint32_t qla2x00_isp_reg_stat (struct qla_hw_data *ha) {struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; +struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82; -return ((RD_REG_DWORD (®->host_status)) ==ISP_REG_DISCONNECT ); +if (IS_P3P_TYPE (ha)) +return ((RD_REG_DWORD (®82->host_int)) ==ISP_REG_DISCONNECT ); +else +return ((RD_REG_DWORD (®->host_status)) == +ISP_REG_DISCONNECT ); }/**************************************************************************
drivers/scsi/sd.c +20 -3
@@ -2057,6 +2057,22 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp,#define READ_CAPACITY_RETRIES_ON_RESET 10 +/* +* Ensure that we don't overflow sector_t when CONFIG_LBDAF is not set +* and the reported logical block size is bigger than 512 bytes. Note +* that last_sector is a u64 and therefore logical_to_sectors() is not +* applicable. +*/ +static bool sd_addressable_capacity (u64 lba,unsigned int sector_size) +{ +u64 last_sector = (lba +1ULL ) << (ilog2 (sector_size) -9 ); + +if (sizeof (sector_t) ==4 && last_sector >U32_MAX ) +return false; + +return true; +} +static int read_capacity_16 (struct scsi_disk *sdkp,struct scsi_device *sdp,unsigned char *buffer) {
@@ -2122,7 +2138,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,return -ENODEV ; } -if ((sizeof (sdkp->capacity) ==4 ) && (lba >=0xffffffffULL )) { +if (!sd_addressable_capacity (lba, sector_size)) {sd_printk (KERN_ERR , sdkp,"Too big for this kernel. Use a " "kernel compiled with support for large block " "devices.\n" );
@@ -2208,7 +2224,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,return sector_size; } -if ((sizeof (sdkp->capacity) ==4 ) && (lba ==0xffffffff )) { +if (!sd_addressable_capacity (lba, sector_size)) {sd_printk (KERN_ERR , sdkp,"Too big for this kernel. Use a " "kernel compiled with support for large block " "devices.\n" );
@@ -2877,7 +2893,8 @@ static int sd_revalidate_disk(struct gendisk *disk) q->limits.io_opt =logical_to_bytes (sdp, sdkp->opt_xfer_blocks); rw_max =logical_to_sectors (sdp, sdkp->opt_xfer_blocks); }else - rw_max =BLK_DEF_MAX_SECTORS ; + rw_max =min_not_zero (logical_to_sectors (sdp, dev_max), + (sector_t )BLK_DEF_MAX_SECTORS );/* Combine with controller limits */ q->limits.max_sectors =min (rw_max,queue_max_hw_sectors (q));
drivers/scsi/sr.c +4 -2
@@ -833,6 +833,7 @@ static void get_capabilities(struct scsi_cd *cd)unsigned char *buffer;struct scsi_mode_data data;struct scsi_sense_hdr sshdr; +unsigned int ms_len =128 ;int rc, n; static const char *loadmech[] =
@@ -859,10 +860,11 @@ static void get_capabilities(struct scsi_cd *cd)scsi_test_unit_ready (cd->device,SR_TIMEOUT ,MAX_RETRIES , &sshdr);/* ask for mode page 0x2a */ - rc =scsi_mode_sense (cd->device,0 ,0x2a , buffer,128 , + rc =scsi_mode_sense (cd->device,0 ,0x2a , buffer, ms_len,SR_TIMEOUT ,3 , &data,NULL ); -if (!scsi_status_is_good (rc)) { +if (!scsi_status_is_good (rc) || data.length > ms_len || + data.header_length + data.block_descriptor_length > data.length) {/* failed, drive doesn't have capabilities mode page */ cd->cdi.speed =1 ; cd->cdi.mask |= (CDC_CD_R | CDC_CD_RW | CDC_DVD_R |
drivers/target/iscsi/iscsi_target_parameters.c +0 -16
@@ -782,22 +782,6 @@ static void iscsi_check_proposer_for_optional_reply(struct iscsi_param *param)if (!strcmp (param->name,MAXRECVDATASEGMENTLENGTH ))SET_PSTATE_REPLY_OPTIONAL (param);/* -* The GlobalSAN iSCSI Initiator for MacOSX does -* not respond to MaxBurstLength, FirstBurstLength, -* DefaultTime2Wait or DefaultTime2Retain parameter keys. -* So, we set them to 'reply optional' here, and assume the -* the defaults from iscsi_parameters.h if the initiator -* is not RFC compliant and the keys are not negotiated. -*/ -if (!strcmp (param->name,MAXBURSTLENGTH )) -SET_PSTATE_REPLY_OPTIONAL (param); -if (!strcmp (param->name,FIRSTBURSTLENGTH )) -SET_PSTATE_REPLY_OPTIONAL (param); -if (!strcmp (param->name,DEFAULTTIME2WAIT )) -SET_PSTATE_REPLY_OPTIONAL (param); -if (!strcmp (param->name,DEFAULTTIME2RETAIN )) -SET_PSTATE_REPLY_OPTIONAL (param); -/* * Required for gPXE iSCSI boot client */ if (!strcmp (param->name,MAXCONNECTIONS ))
drivers/target/iscsi/iscsi_target_util.c +7 -5
@@ -735,21 +735,23 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) {struct se_cmd *se_cmd =NULL ;int rc; +bool op_scsi = false;/* * Determine if a struct se_cmd is associated with * this struct iscsi_cmd. */ switch (cmd->iscsi_opcode) {case ISCSI_OP_SCSI_CMD : - se_cmd = &cmd->se_cmd; -__iscsit_free_cmd (cmd, true, shutdown); + op_scsi = true;/* * Fallthrough */ case ISCSI_OP_SCSI_TMFUNC : - rc =transport_generic_free_cmd (&cmd->se_cmd, shutdown); -if (!rc && shutdown && se_cmd && se_cmd->se_sess) { -__iscsit_free_cmd (cmd, true, shutdown); + se_cmd = &cmd->se_cmd; +__iscsit_free_cmd (cmd, op_scsi, shutdown); + rc =transport_generic_free_cmd (se_cmd, shutdown); +if (!rc && shutdown && se_cmd->se_sess) { +__iscsit_free_cmd (cmd, op_scsi, shutdown);target_put_sess_cmd (se_cmd); }break ;
drivers/target/target_core_fabric_configfs.c +5 -0
@@ -92,6 +92,11 @@ static int target_fabric_mappedlun_link(pr_err ("Source se_lun->lun_se_dev does not exist\n" );return -EINVAL ; } +if (lun->lun_shutdown) { +pr_err ("Unable to create mappedlun symlink because" +" lun->lun_shutdown=true\n" ); +return -EINVAL ; + } se_tpg = lun->lun_tpg; nacl_ci = &lun_acl_ci->ci_parent->ci_group->cg_item;
drivers/target/target_core_tpg.c +4 -0
@@ -640,6 +640,8 @@ void core_tpg_remove_lun(*/ struct se_device *dev =rcu_dereference_raw (lun->lun_se_dev); + lun->lun_shutdown = true; +core_clear_lun_from_tpg (lun, tpg);/* * Wait for any active I/O references to percpu se_lun->lun_ref to
@@ -661,6 +663,8 @@ void core_tpg_remove_lun( }if (!(dev->se_hba->hba_flags &HBA_FLAGS_INTERNAL_USE ))hlist_del_rcu (&lun->link); + + lun->lun_shutdown = false;mutex_unlock (&tpg->tpg_lun_mutex);percpu_ref_exit (&lun->lun_ref);
drivers/target/target_core_user.c +64 -28
150 lines not on this page · raw message
drivers/video/fbdev/efifb.c +65 -1
87 lines not on this page · raw message
drivers/video/fbdev/xen-fbfront.c +2 -2
@@ -644,7 +644,6 @@ static void xenfb_backend_changed(struct xenbus_device *dev,break ;case XenbusStateInitWait: -InitWait:xenbus_switch_state (dev, XenbusStateConnected);break ;
@@ -655,7 +654,8 @@ static void xenfb_backend_changed(struct xenbus_device *dev,* get Connected twice here. */ if (dev->state != XenbusStateConnected) - goto InitWait;/* no InitWait seen yet, fudge it */ +/* no InitWait seen yet, fudge it */ +xenbus_switch_state (dev, XenbusStateConnected);if (xenbus_scanf (XBT_NIL , info->xbdev->otherend,"request-update" ,"%d" , &val) <0 )
fs/cifs/file.c +3 -3
@@ -2597,7 +2597,7 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, wdata->credits = credits;if (!wdata->cfile->invalidHandle || - !cifs_reopen_file (wdata->cfile, false)) + !(rc =cifs_reopen_file (wdata->cfile, false))) rc = server->ops->async_writev (wdata, cifs_uncached_writedata_release);if (rc) {
@@ -3002,7 +3002,7 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file, rdata->credits = credits;if (!rdata->cfile->invalidHandle || - !cifs_reopen_file (rdata->cfile, true)) + !(rc =cifs_reopen_file (rdata->cfile, true))) rc = server->ops->async_readv (rdata); error:if (rc) {
@@ -3577,7 +3577,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, }if (!rdata->cfile->invalidHandle || - !cifs_reopen_file (rdata->cfile, true)) + !(rc =cifs_reopen_file (rdata->cfile, true))) rc = server->ops->async_readv (rdata);if (rc) {add_credits_and_wake_if (server, rdata->credits,0 );
fs/cifs/smb2pdu.c +9 -1
@@ -1987,6 +1987,9 @@ void smb2_reconnect_server(struct work_struct *work)struct cifs_tcon *tcon, *tcon2;struct list_head tmp_list;int tcon_exist = false; +int rc; +int resched = false; +/* Prevent simultaneous reconnects that can corrupt tcon->rlist list */ mutex_lock (&server->reconnect_mutex);
@@ -2014,13 +2017,18 @@ void smb2_reconnect_server(struct work_struct *work)spin_unlock (&cifs_tcp_ses_lock);list_for_each_entry_safe (tcon, tcon2, &tmp_list, rlist) { -if (!smb2_reconnect (SMB2_INTERNAL_CMD , tcon)) + rc =smb2_reconnect (SMB2_INTERNAL_CMD , tcon); +if (!rc)cifs_reopen_persistent_handles (tcon); +else + resched = true;list_del_init (&tcon->rlist);cifs_put_tcon (tcon); }cifs_dbg (FYI ,"Reconnecting tcons finished\n" ); +if (resched) +queue_delayed_work (cifsiod_wq, &server->reconnect,2 *HZ );mutex_unlock (&server->reconnect_mutex);/* now we can safely release srv struct */
fs/ext4/inode.c +2 -3
@@ -71,10 +71,9 @@ static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw, csum =ext4_chksum (sbi, csum, (__u8 *)&dummy_csum, csum_size); offset += csum_size; - csum =ext4_chksum (sbi, csum, (__u8 *)raw + offset, -EXT4_INODE_SIZE (inode->i_sb) - - offset); } + csum =ext4_chksum (sbi, csum, (__u8 *)raw + offset, +EXT4_INODE_SIZE (inode->i_sb) - offset); }return csum;
fs/orangefs/devorangefs-req.c +7 -2
@@ -208,14 +208,19 @@ static ssize_t orangefs_devreq_read(struct file *file,continue ;/* * Skip ops whose filesystem we don't know about unless -* it is being mounted. +* it is being mounted or unmounted. It is possible for +* a filesystem we don't know about to be unmounted if +* it fails to mount in the kernel after userspace has +* been sent the mount request. */ /* XXX: is there a better way to detect this? */ }else if (ret ==-1 && !(op->upcall.type ==ORANGEFS_VFS_OP_FS_MOUNT || op->upcall.type == -ORANGEFS_VFS_OP_GETATTR )) { +ORANGEFS_VFS_OP_GETATTR || + op->upcall.type == +ORANGEFS_VFS_OP_FS_UMOUNT )) {gossip_debug (GOSSIP_DEV_DEBUG ,"orangefs: skipping op tag %llu %s\n" ,llu (op->tag),get_opname_string (op));
fs/orangefs/orangefs-kernel.h +1 -0
@@ -249,6 +249,7 @@ struct orangefs_sb_info_s {char devname[ORANGEFS_MAX_SERVER_ADDR_LEN ];struct super_block *sb;int mount_pending; +int no_list;struct list_head list; };
fs/orangefs/super.c +16 -7
@@ -493,7 +493,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst,if (ret) { d =ERR_PTR (ret); - goto free_op; + goto free_sb_and_op; }/*
@@ -519,6 +519,9 @@ struct dentry *orangefs_mount(struct file_system_type *fst,spin_unlock (&orangefs_superblocks_lock);op_release (new_op); +/* Must be removed from the list now. */ +ORANGEFS_SB (sb)->no_list =0 ; +if (orangefs_userspace_version >=20906 ) { new_op =op_alloc (ORANGEFS_VFS_OP_FEATURES );if (!new_op)
@@ -533,6 +536,10 @@ struct dentry *orangefs_mount(struct file_system_type *fst,return dget (sb->s_root); +free_sb_and_op: +/* Will call orangefs_kill_sb with sb not in list. */ +ORANGEFS_SB (sb)->no_list =1 ; +deactivate_locked_super (sb); free_op:gossip_err ("orangefs_mount: mount request failed with %d\n" , ret);if (ret == -EINVAL ) {
@@ -558,12 +565,14 @@ void orangefs_kill_sb(struct super_block *sb)*/ orangefs_unmount_sb (sb); -/* remove the sb from our list of orangefs specific sb's */ - -spin_lock (&orangefs_superblocks_lock); -__list_del_entry (&ORANGEFS_SB (sb)->list);/* not list_del_init */ -ORANGEFS_SB (sb)->list.prev =NULL ; -spin_unlock (&orangefs_superblocks_lock); +if (!ORANGEFS_SB (sb)->no_list) { +/* remove the sb from our list of orangefs specific sb's */ +spin_lock (&orangefs_superblocks_lock); +/* not list_del_init */ +__list_del_entry (&ORANGEFS_SB (sb)->list); +ORANGEFS_SB (sb)->list.prev =NULL ; +spin_unlock (&orangefs_superblocks_lock); + }/* * make sure that ORANGEFS_DEV_REMOUNT_ALL loop that might've seen us
fs/proc/task_mmu.c +8 -1
@@ -899,7 +899,14 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma,static inline void clear_soft_dirty_pmd (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -pmd_t pmd =pmdp_huge_get_and_clear (vma->vm_mm, addr, pmdp); +pmd_t pmd = *pmdp; + +/* See comment in change_huge_pmd() */ +pmdp_invalidate (vma, addr, pmdp); +if (pmd_dirty (*pmdp)) + pmd =pmd_mkdirty (pmd); +if (pmd_young (*pmdp)) + pmd =pmd_mkyoung (pmd); pmd =pmd_wrprotect (pmd); pmd =pmd_clear_soft_dirty (pmd);
include/crypto/internal/hash.h +10 -0
@@ -166,6 +166,16 @@ static inline struct ahash_instance *ahash_alloc_instance(return crypto_alloc_instance2 (name, alg,ahash_instance_headroom ()); } +static inline void ahash_request_complete (struct ahash_request *req,int err) +{ + req->base.complete (&req->base, err); +} + +static inline u32 ahash_request_flags (struct ahash_request *req) +{ +return req->base.flags; +} +static inline struct crypto_ahash *crypto_spawn_ahash (struct crypto_ahash_spawn *spawn) {
include/linux/cgroup.h +21 -0
@@ -570,6 +570,25 @@ static inline void pr_cont_cgroup_path(struct cgroup *cgrp) pr_cont_kernfs_path(cgrp->kn); } +static inline void cgroup_init_kthreadd (void ) +{ +/* +* kthreadd is inherited by all kthreads, keep it in the root so +* that the new kthreads are guaranteed to stay in the root until +* initialization is finished. +*/ + current->no_cgroup_migration =1 ; +} + +static inline void cgroup_kthread_ready (void ) +{ +/* +* This kthread finished initialization. The creator should have +* set PF_NO_SETAFFINITY if this kthread should stay in the root. +*/ + current->no_cgroup_migration =0 ; +} +#else /* !CONFIG_CGROUPS */ struct cgroup_subsys_state ;
@@ -590,6 +609,8 @@ static inline void cgroup_free(struct task_struct *p) {}static inline int cgroup_init_early (void ) {return 0 ; }static inline int cgroup_init (void ) {return 0 ; } +static inline void cgroup_init_kthreadd (void ) {} +static inline void cgroup_kthread_ready (void ) {}static inline bool task_under_cgroup_hierarchy (struct task_struct *task,struct cgroup *ancestor)
include/linux/sched.h +4 -0
@@ -1584,6 +1584,10 @@ struct task_struct {#ifdef CONFIG_COMPAT_BRK unsigned brk_randomized:1;#endif +#ifdef CONFIG_CGROUPS +/* disallow userland-initiated cgroup migration */ + unsigned no_cgroup_migration:1; +#endif unsigned long atomic_flags;/* Flags needing atomic access. */
include/linux/uio.h +5 -1
@@ -39,7 +39,10 @@ struct iov_iter { };union {unsigned long nr_segs; -int idx; +struct { +int idx; +int start_idx; + }; }; };
@@ -81,6 +84,7 @@ unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);size_t iov_iter_copy_from_user_atomic (struct page *page,struct iov_iter *i,unsigned long offset,size_t bytes);void iov_iter_advance (struct iov_iter *i,size_t bytes); +void iov_iter_revert (struct iov_iter *i,size_t bytes);int iov_iter_fault_in_readable (struct iov_iter *i,size_t bytes);size_t iov_iter_single_seg_count (const struct iov_iter *i); size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
include/target/target_core_base.h +1 -0
@@ -705,6 +705,7 @@ struct se_lun {u64 unpacked_lun;#define SE_LUN_LINK_MAGIC 0xffff7771u32 lun_link_magic; +bool lun_shutdown;bool lun_access_ro;u32 lun_index;
kernel/cgroup.c +5 -4
@@ -2920,11 +2920,12 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf, tsk = tsk->group_leader;/* -* Workqueue threads may acquire PF_NO_SETAFFINITY and become -* trapped in a cpuset, or RT worker may be born in a cgroup -* with no rt_runtime allocated. Just say no. +* kthreads may acquire PF_NO_SETAFFINITY during initialization. +* If userland migrates such a kthread to a non-root cgroup, it can +* become trapped in a cpuset, or RT kthread may be born in a +* cgroup with no rt_runtime allocated. Just say no. */ -if (tsk == kthreadd_task || (tsk->flags &PF_NO_SETAFFINITY )) { +if (tsk->no_cgroup_migration || (tsk->flags &PF_NO_SETAFFINITY )) { ret = -EINVAL ; goto out_unlock_rcu; }
kernel/kthread.c +3 -0
@@ -18,6 +18,7 @@#include <linux/freezer.h> #include <linux/ptrace.h> #include <linux/uaccess.h> +#include <linux/cgroup.h> #include <trace/events/sched.h> static DEFINE_SPINLOCK (kthread_create_lock);
@@ -205,6 +206,7 @@ static int kthread(void *_create) ret = -EINTR ;if (!test_bit (KTHREAD_SHOULD_STOP , &self.flags)) { +cgroup_kthread_ready ();__kthread_parkme (&self); ret =threadfn (data); }
@@ -530,6 +532,7 @@ int kthreadd(void *unused)set_mems_allowed (node_states[N_MEMORY ]); current->flags |=PF_NOFREEZE ; +cgroup_init_kthreadd ();for (;;) {set_current_state (TASK_INTERRUPTIBLE );
kernel/trace/ftrace.c +25 -4
@@ -3736,23 +3736,24 @@ static void __enable_ftrace_function_probe(struct ftrace_ops_hash *old_hash) ftrace_probe_registered =1 ; } -static void __disable_ftrace_function_probe (void ) +static bool __disable_ftrace_function_probe (void ) {int i;if (!ftrace_probe_registered) -return ; +return false;for (i =0 ; i <FTRACE_FUNC_HASHSIZE ; i++) {struct hlist_head *hhd = &ftrace_func_hash[i];if (hhd->first) -return ; +return false; }/* no more funcs left */ ftrace_shutdown (&trace_probe_ops,0 ); ftrace_probe_registered =0 ; +return true; }
@@ -3882,6 +3883,7 @@ static void __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, void *data, int flags) { +struct ftrace_ops_hash old_hash_ops;struct ftrace_func_entry *rec_entry;struct ftrace_func_probe *entry;struct ftrace_func_probe *p;
@@ -3893,6 +3895,7 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,struct hlist_node *tmp;char str[KSYM_SYMBOL_LEN ];int i, ret; +bool disabled;if (glob && (strcmp (glob,"*" ) ==0 || !strlen (glob))) func_g.search =NULL ;
@@ -3911,6 +3914,10 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,mutex_lock (&trace_probe_ops.func_hash->regex_lock); + old_hash_ops.filter_hash = old_hash; +/* Probes only have filters */ + old_hash_ops.notrace_hash =NULL ; + hash =alloc_and_copy_ftrace_hash (FTRACE_HASH_DEFAULT_BITS , *orig_hash);if (!hash)/* Hmm, should report this somehow */
@@ -3948,12 +3955,17 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, } }mutex_lock (&ftrace_lock); -__disable_ftrace_function_probe (); + disabled =__disable_ftrace_function_probe ();/* * Remove after the disable is called. Otherwise, if the last * probe is removed, a null hash means *all enabled*. */ ret =ftrace_hash_move (&trace_probe_ops,1 , orig_hash, hash); + +/* still need to update the function call sites */ +if (ftrace_enabled && !disabled) +ftrace_run_modify_code (&trace_probe_ops,FTRACE_UPDATE_CALLS , + &old_hash_ops);synchronize_sched ();if (!ret)free_ftrace_hash_rcu (old_hash);
@@ -5389,6 +5401,15 @@ static void clear_ftrace_pids(struct trace_array *tr)trace_free_pid_list (pid_list); } +void ftrace_clear_pids (struct trace_array *tr) +{ +mutex_lock (&ftrace_lock); + +clear_ftrace_pids (tr); + +mutex_unlock (&ftrace_lock); +} +static void ftrace_pid_reset (struct trace_array *tr) {mutex_lock (&ftrace_lock);
kernel/trace/trace.c +1 -0
@@ -7150,6 +7150,7 @@ static int instance_rmdir(const char *name)tracing_set_nop (tr);event_trace_del_tracer (tr); +ftrace_clear_pids (tr);ftrace_destroy_function_files (tr);tracefs_remove_recursive (tr->dir);free_trace_buffers (tr);
kernel/trace/trace.h +2 -0
@@ -870,6 +870,7 @@ int using_ftrace_ops_list_func(void);void ftrace_init_tracefs (struct trace_array *tr,struct dentry *d_tracer);void ftrace_init_tracefs_toplevel (struct trace_array *tr,struct dentry *d_tracer); +void ftrace_clear_pids (struct trace_array *tr);#else static inline int ftrace_trace_task (struct trace_array *tr) {
@@ -888,6 +889,7 @@ ftrace_init_global_array_ops(struct trace_array *tr) { }static inline void ftrace_reset_array_ops (struct trace_array *tr) { }static inline void ftrace_init_tracefs (struct trace_array *tr,struct dentry *d) { }static inline void ftrace_init_tracefs_toplevel (struct trace_array *tr,struct dentry *d) { } +static inline void ftrace_clear_pids (struct trace_array *tr) { }/* ftace_func_t type is not defined, use macro instead of static inline */ #define ftrace_init_array_ops (tr, func) do { } while (0)#endif /* CONFIG_FUNCTION_TRACER */
lib/iov_iter.c +63 -0
75 lines not on this page · raw message
mm/huge_memory.c +1 -2
@@ -1380,8 +1380,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,deactivate_page (page);if (pmd_young (orig_pmd) ||pmd_dirty (orig_pmd)) { - orig_pmd =pmdp_huge_get_and_clear_full (tlb->mm, addr, pmd, - tlb->fullmm); +pmdp_invalidate (vma, addr, pmd); orig_pmd =pmd_mkold (orig_pmd); orig_pmd =pmd_mkclean (orig_pmd);
mm/memcontrol.c +14 -1
@@ -2152,6 +2152,8 @@ struct memcg_kmem_cache_create_work {struct work_struct work; }; +static struct workqueue_struct *memcg_kmem_cache_create_wq; +static void memcg_kmem_cache_create_func (struct work_struct *w) { struct memcg_kmem_cache_create_work *cw =
@@ -2183,7 +2185,7 @@ static void __memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, cw->cachep = cachep;INIT_WORK (&cw->work, memcg_kmem_cache_create_func); -schedule_work (&cw->work); +queue_work (memcg_kmem_cache_create_wq, &cw->work); } static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg,
@@ -5786,6 +5788,17 @@ static int __init mem_cgroup_init(void) {int cpu, node; +#ifndef CONFIG_SLOB +/* +* Kmem cache creation is mostly done with the slab_mutex held, +* so use a special workqueue to avoid stalling all worker +* threads in case lots of cgroups are created simultaneously. +*/ + memcg_kmem_cache_create_wq = +alloc_ordered_workqueue ("memcg_kmem_cache_create" ,0 ); +BUG_ON (!memcg_kmem_cache_create_wq); +#endif +hotcpu_notifier (memcg_cpu_hotplug_callback,0 );for_each_possible_cpu (cpu)
mm/zsmalloc.c +1 -1
@@ -280,7 +280,7 @@ struct zs_pool {struct zspage {struct {unsigned int fullness:FULLNESS_BITS ; -unsigned int class:CLASS_BITS ; +unsigned int class:CLASS_BITS +1 ;unsigned int isolated:ISOLATED_BITS ;unsigned int magic:MAGIC_VAL_BITS ; };
net/core/datagram.c +14 -9
@@ -378,7 +378,7 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset, struct iov_iter *to, int len) { int start = skb_headlen(skb); -int i, copy = start - offset; +int i, copy = start - offset, start_off = offset, n;struct sk_buff *frag_iter;trace_skb_copy_datagram_iovec (skb, len);
@@ -387,11 +387,12 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,if (copy >0 ) {if (copy > len) copy = len; -if (copy_to_iter (skb->data + offset, copy, to) != copy) + n =copy_to_iter (skb->data + offset, copy, to); + offset += n; +if (n != copy) goto short_copy;if ((len -= copy) ==0 )return 0 ; - offset += copy; }/* Copy paged appendix. Hmm... why does this look so complicated? */
@@ -405,13 +406,14 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,if ((copy = end - offset) >0 ) {if (copy > len) copy = len; -if (copy_page_to_iter (skb_frag_page (frag), + n =copy_page_to_iter (skb_frag_page (frag), frag->page_offset + offset - - start, copy, to) != copy) + start, copy, to); + offset += n; +if (n != copy) goto short_copy;if (!(len -= copy))return 0 ; - offset += copy; } start = end; }
@@ -443,6 +445,7 @@ int skb_copy_datagram_iter(const struct sk_buff *skb, int offset,*/ fault: +iov_iter_revert (to, offset - start_off);return -EFAULT ; short_copy:
@@ -593,7 +596,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, __wsum *csump) {int start =skb_headlen (skb); -int i, copy = start - offset; +int i, copy = start - offset, start_off = offset;struct sk_buff *frag_iter;int pos =0 ;int n;
@@ -603,11 +606,11 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,if (copy > len) copy = len; n =csum_and_copy_to_iter (skb->data + offset, copy, csump, to); + offset += n;if (n != copy) goto fault;if ((len -= copy) ==0 )return 0 ; - offset += copy; pos = copy; }
@@ -629,12 +632,12 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, offset - start, copy, &csum2, to);kunmap (page); + offset += n;if (n != copy) goto fault; *csump =csum_block_add (*csump, csum2, pos);if (!(len -= copy))return 0 ; - offset += copy; pos += copy; } start = end;
@@ -667,6 +670,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,return 0 ; fault: +iov_iter_revert (to, offset - start_off);return -EFAULT ; }
@@ -751,6 +755,7 @@ int skb_copy_and_csum_datagram_msg(struct sk_buff *skb, }return 0 ; csum_error: +iov_iter_revert (&msg->msg_iter, chunk);return -EINVAL ; fault:return -EFAULT ;
net/ipv6/route.c +2 -0
@@ -2166,6 +2166,8 @@ static int ip6_route_del(struct fib6_config *cfg)continue ;if (cfg->fc_metric && cfg->fc_metric != rt->rt6i_metric)continue ; +if (cfg->fc_protocol && cfg->fc_protocol != rt->rt6i_protocol) +continue ;dst_hold (&rt->dst);read_unlock_bh (&table->tb6_lock);
net/sctp/socket.c +6 -2
@@ -4735,6 +4735,12 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)if (!asoc)return -EINVAL ; +/* If there is a thread waiting on more sndbuf space for +* sending on this asoc, it cannot be peeled. +*/ +if (waitqueue_active (&asoc->wait)) +return -EBUSY ; +/* An association cannot be branched off from an already peeled-off * socket, nor is this supported for tcp style sockets. */
@@ -7427,8 +7433,6 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,*/ release_sock (sk); current_timeo =schedule_timeout (current_timeo); -if (sk != asoc->base.sk) - goto do_error;lock_sock (sk); *timeo_p = current_timeo;
sound/soc/intel/Kconfig +13 -18
@@ -33,11 +33,9 @@ config SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_MATCH if ACPI depends on (X86 || COMPILE_TEST) -# firmware stuff depends DW_DMAC_CORE; since there is no depends-on from -# the reverse selection, each machine driver needs to select -# SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE config SND_SOC_INTEL_SST_FIRMWARE tristate + select DW_DMAC_CORE config SND_SOC_INTEL_SST_ACPI tristate
@@ -47,16 +45,18 @@ config SND_SOC_INTEL_SST_MATCH config SND_SOC_INTEL_HASWELL tristate + select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL tristate + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_HASWELL_MACH tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DW_DMAC_CORE - select SND_SOC_INTEL_SST + depends on DMADEVICES select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help
@@ -99,9 +99,8 @@ config SND_SOC_INTEL_BXT_RT298_MACH config SND_SOC_INTEL_BYT_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" depends on X86_INTEL_LPSS && I2C - depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n) - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n select SND_SOC_INTEL_BAYTRAIL select SND_SOC_RT5640 help
@@ -112,9 +111,8 @@ config SND_SOC_INTEL_BYT_RT5640_MACH config SND_SOC_INTEL_BYT_MAX98090_MACH tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" depends on X86_INTEL_LPSS && I2C - depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n) - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE + depends on DMADEVICES + depends on SND_SST_IPC_ACPI = n select SND_SOC_INTEL_BAYTRAIL select SND_SOC_MAX98090 help
@@ -123,9 +121,8 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH config SND_SOC_INTEL_BDW_RT5677_MACH tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" - depends on X86_INTEL_LPSS && GPIOLIB && I2C && DW_DMAC - depends on DW_DMAC_CORE=y - select SND_SOC_INTEL_SST + depends on X86_INTEL_LPSS && GPIOLIB && I2C + depends on DMADEVICES select SND_SOC_INTEL_HASWELL select SND_SOC_RT5677 help
@@ -134,10 +131,8 @@ config SND_SOC_INTEL_BDW_RT5677_MACH config SND_SOC_INTEL_BROADWELL_MACH tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" - depends on X86_INTEL_LPSS && I2C && DW_DMAC && \ - I2C_DESIGNWARE_PLATFORM - depends on DW_DMAC_CORE - select SND_SOC_INTEL_SST + depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM + depends on DMADEVICES select SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help
Greg KH
maintainerI'm announcing the release of the 4.9.24 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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 | 2 arch/mips/lantiq/irq.c | 38 +++++---- arch/parisc/include/asm/uaccess.h | 86 +++++++++++++------- arch/parisc/lib/lusercopy.S | 27 +++--- arch/x86/entry/vdso/vdso32-setup.c | 11 ++ arch/x86/events/intel/lbr.c | 3 arch/x86/include/asm/elf.h | 2 arch/x86/include/asm/pmem.h | 42 +++++++--- arch/x86/kernel/signal_compat.c | 4 arch/x86/kvm/vmx.c | 10 +- arch/x86/mm/init.c | 41 +++++++-- arch/x86/platform/efi/quirks.c | 4 arch/x86/xen/apic.c | 2 crypto/ahash.c | 79 +++++++++++------- crypto/algif_aead.c | 12 +- drivers/acpi/ec.c | 62 +++++++------- drivers/acpi/internal.h | 4 drivers/acpi/nfit/core.c | 6 + drivers/acpi/scan.c | 19 ++-- drivers/block/nbd.c | 10 +- drivers/block/zram/zram_drv.c | 6 - drivers/char/Kconfig | 5 - drivers/char/mem.c | 82 ++++++++++++------- drivers/char/virtio_console.c | 12 ++ drivers/cpufreq/cpufreq.c | 18 +++- drivers/firmware/efi/libstub/gop.c | 6 - drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 2 drivers/input/joystick/xpad.c | 2 drivers/irqchip/irq-imx-gpcv2.c | 2 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 9 +- drivers/media/usb/dvb-usb/cxusb.c | 15 +-- drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 33 +++++-- drivers/net/can/ifi_canfd/ifi_canfd.c | 2 drivers/net/wireless/ath/ath9k/common-spectral.c | 8 + drivers/nvdimm/bus.c | 6 + drivers/nvdimm/dimm_devs.c | 77 ++---------------- drivers/platform/x86/acer-wmi.c | 22 ++++- drivers/pwm/pwm-rockchip.c | 40 +++++++-- drivers/rtc/rtc-tegra.c | 28 ++++++ drivers/scsi/qla2xxx/qla_os.c | 7 + drivers/scsi/sd.c | 23 ++++- drivers/scsi/sr.c | 6 - drivers/target/iscsi/iscsi_target_parameters.c | 16 --- drivers/target/iscsi/iscsi_target_util.c | 12 +- drivers/target/target_core_fabric_configfs.c | 5 + drivers/target/target_core_tpg.c | 4 drivers/target/target_core_user.c | 92 +++++++++++++++------- drivers/video/fbdev/efifb.c | 66 +++++++++++++++ drivers/video/fbdev/xen-fbfront.c | 4 fs/cifs/file.c | 6 - fs/cifs/smb2pdu.c | 10 ++ fs/ext4/inode.c | 5 - fs/orangefs/devorangefs-req.c | 9 +- fs/orangefs/orangefs-kernel.h | 1 fs/orangefs/super.c | 23 +++-- fs/proc/task_mmu.c | 9 +- include/crypto/internal/hash.h | 10 ++ include/linux/cgroup.h | 21 +++++ include/linux/sched.h | 4 include/linux/uio.h | 6 + include/target/target_core_base.h | 1 kernel/cgroup.c | 9 +- kernel/kthread.c | 3 kernel/trace/ftrace.c | 29 +++++- kernel/trace/trace.c | 1 kernel/trace/trace.h | 2 lib/iov_iter.c | 63 +++++++++++++++ mm/huge_memory.c | 3 mm/memcontrol.c | 15 +++ mm/zsmalloc.c | 2 net/core/datagram.c | 23 +++-- net/ipv6/route.c | 2 net/sctp/socket.c | 8 + sound/soc/intel/Kconfig | 31 +++---- 78 files changed, 938 insertions(+), 441 deletions(-)
Al Viro (2):
new privimitive: iov_iter_revert()
make skb_copy_datagram_msg() et.al. preserve ->msg_iter on error
Andy Shevchenko (1):
ASoC: Intel: select DW_DMAC_CORE since it's mandatory
Ard Biesheuvel (1):
efi/fb: Avoid reconfiguration of BAR that covers the framebuffer
Arnd Bergmann (1):
dvb-usb-v2: avoid use-after-free
Ben Skeggs (1):
drm/nouveau/disp/mcp7x: disable dptmds workaround
Cameron Gutman (1):
Input: xpad - add support for Razer Wildcat gamepad
Chen Yu (1):
cpufreq: Bring CPUs up even if cpufreq_online() failed
Cohen, Eugene (1):
efi/libstub: Skip GOP with PIXEL_BLT_ONLY format
Daeho Jeong (1):
ext4: fix inode checksum calculation problem if i_extra_size is small
Dan Williams (4):
x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions acpi, nfit, libnvdimm: fix interleave set cookie calculation (64-bit comparison)
libnvdimm: fix blk free space accounting
libnvdimm: fix reconfig_mutex, mmap_sem, and jbd2_handle lockdep splat
David Wu (1):
pwm: rockchip: State of PWM clock should synchronize with PWM enabled state
Fam Zheng (1):
scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable
Germano Percossi (2):
CIFS: reconnect thread reschedule itself
CIFS: store results of cifs_reopen_file to avoid infinite wait
Greg Kroah-Hartman (2):
Revert "MIPS: Lantiq: Fix cascaded IRQ setup" Linux 4.9.24
Helge Deller (1):
parisc: Fix get_user() for 64-bit value on 32-bit kernel
Herbert Xu (2):
crypto: algif_aead - Fix bogus request dereference in completion function
crypto: ahash - Fix EINPROGRESS notification callback
Ilia Mirkin (2):
drm/nouveau/mpeg: mthd returns true on success now drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
Jens Axboe (1):
nbd: fix 64-bit division
Joerg Roedel (1):
x86/signals: Fix lower/upper bound reporting in compat siginfo
Josef Bacik (1):
nbd: use loff_t for blocksize and nbd_set_size args
Juergen Gross (1):
xen, fbfront: fix connecting to backend
Kees Cook (1):
mm: Tighten x86 /dev/mem with zeroing reads
Kirill A. Shutemov (2):
thp: fix MADV_DONTNEED vs. MADV_FREE race
thp: fix MADV_DONTNEED vs clear soft dirty race
Lee, Chun-Yi (1):
platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event
Lv Zheng (1):
ACPI / EC: Use busy polling mode when GPE is not enabled
Mantas M (1):
net: ipv6: check route protocol when deleting routes
Marcelo Ricardo Leitner (1):
sctp: deny peeloff operation on asocs with threads sleeping on it
Markus Marb (1):
can: ifi: use correct register to read rx status
Martin Brandenburg (1):
orangefs: free superblock when mount fails
Martin K. Petersen (2):
scsi: sr: Sanity check returned mode data
scsi: sd: Fix capacity calculation with 32-bit sector_t
Mathias Krause (1):
x86/vdso: Ensure vdso32_enabled gets set to valid values only
Mauro Carvalho Chehab (1):
dvb-usb: don't use stack for firmware load
Max Bires (1):
char: lack of bool string made CONFIG_DEVPORT always on
Miaoqing Pan (1):
ath9k: fix NULL pointer dereference
Mikulas Patocka (1):
parisc: fix bugs in pa_memcpy
Minchan Kim (2):
zsmalloc: expand class bit
zram: do not use copy_page with non-page aligned address
Mohit Gambhir (1):
x86/xen: Fix APIC id mismatch warning on Intel
Namhyung Kim (1):
ftrace: Fix function pid filter on instances
Nicholas Bellinger (3):
iscsi-target: Fix TMR reference leak during session shutdown
iscsi-target: Drop work-around for legacy GlobalSAN initiator
target: Avoid mappedlun symlink creation during lun shutdown
Omar Sandoval (2):
x86/efi: Don't try to reserve runtime regions
virtio-console: avoid DMA from stack
Paolo Bonzini (1):
kvm: fix page struct leak in handle_vmon
Peter Zijlstra (1):
perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()
Rafael J. Wysocki (1):
ACPI / scan: Set the visited flag for all enumerated devices
Sawan Chandak (1):
scsi: qla2xxx: Add fix to read correct register value for ISP82xx.
Stefan Brüns (2):
dvb-usb-firmware: don't do DMA on stack
cxusb: Use a dma capable buffer also for reading
Steven Rostedt (VMware) (1):
ftrace: Fix removing of second function probe
Tejun Heo (1):
cgroup, kthread: close race window where new kthreads can be migrated to non-root cgroups
Thierry Reding (1):
rtc: tegra: Implement clock handling
Thomas Gleixner (1):
x86/vdso: Plug race between mapping and ELF header setup
Tyler Baker (1):
irqchip/irq-imx-gpcv2: Fix spinlock initialization
Vladimir Davydov (1):
mm: memcontrol: use special workqueue for creating per-memcg caches
Wei Yongjun (1):
drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
Xiubo Li (3):
tcmu: Fix possible overwrite of t_data_sg's last iov[]
tcmu: Fix wrongly calculating of the base_command_size
tcmu: Skip Data-Out blocks before gathering Data-In buffer for BIDI case