Linux 3.6.4
Greg KH
maintainerI'm announcing the release of the 3.6.4 kernel.
All users of the 3.6 kernel series must upgrade.
The updated 3.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.6.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
------------
Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt | 2 Documentation/hwmon/coretemp | 1 Makefile | 2 arch/s390/boot/compressed/vmlinux.lds.S | 2 arch/s390/kernel/vmlinux.lds.S | 2 arch/sparc/kernel/perf_event.c | 15 - arch/sparc/kernel/syscalls.S | 32 -- arch/tile/Makefile | 4 arch/x86/kernel/cpu/mcheck/mce_amd.c | 10 arch/x86/kernel/entry_32.S | 8 arch/x86/kernel/entry_64.S | 2 arch/x86/kernel/setup.c | 17 + arch/x86/oprofile/nmi_int.c | 2 arch/xtensa/include/asm/unistd.h | 91 ++++-- drivers/edac/amd64_edac.c | 11 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 drivers/hwmon/coretemp.c | 7 drivers/infiniband/core/cma.c | 3 drivers/infiniband/core/netlink.c | 1 drivers/iommu/tegra-smmu.c | 2 drivers/media/video/au0828/au0828-video.c | 12 drivers/net/ethernet/calxeda/xgmac.c | 19 - drivers/net/ethernet/freescale/gianfar.c | 27 - drivers/net/ethernet/freescale/gianfar.h | 2 drivers/net/ethernet/freescale/ucc_geth.c | 29 - drivers/net/ethernet/freescale/ucc_geth.h | 2 drivers/net/ethernet/marvell/mv643xx_eth.c | 18 - drivers/net/ethernet/marvell/skge.c | 7 drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 - drivers/pcmcia/pxa2xx_sharpsl.c | 2 drivers/pinctrl/core.c | 4 drivers/pinctrl/pinconf.c | 4 drivers/pinctrl/pinctrl-tegra.c | 2 drivers/pinctrl/pinctrl-tegra30.c | 24 - drivers/usb/class/cdc-acm.c | 22 + drivers/usb/core/devio.c | 1 drivers/usb/core/driver.c | 4 drivers/usb/core/hub.c | 33 +- drivers/usb/dwc3/gadget.c | 1 drivers/usb/host/xhci.c | 3 drivers/usb/musb/am35x.c | 6 drivers/usb/serial/ark3116.c | 26 - drivers/usb/serial/belkin_sa.c | 31 +- drivers/usb/serial/cp210x.c | 41 +- drivers/usb/serial/cyberjack.c | 48 +-- drivers/usb/serial/cypress_m8.c | 82 ++--- drivers/usb/serial/f81232.c | 43 +- drivers/usb/serial/garmin_gps.c | 24 - drivers/usb/serial/io_edgeport.c | 54 +-- drivers/usb/serial/io_tables.h | 8 drivers/usb/serial/io_ti.c | 91 +++--- drivers/usb/serial/iuu_phoenix.c | 84 ++--- drivers/usb/serial/keyspan_pda.c | 30 +- drivers/usb/serial/kl5kusb105.c | 66 +--- drivers/usb/serial/kobil_sct.c | 23 - drivers/usb/serial/option.c | 84 ++++- drivers/usb/serial/oti6858.c | 68 +--- drivers/usb/serial/pl2303.c | 90 +++--- drivers/usb/serial/spcp8x5.c | 46 +-- drivers/usb/serial/ssu100.c | 34 +- drivers/usb/serial/ti_usb_3410_5052.c | 88 ++---- fs/ext4/balloc.c | 8 fs/ext4/bitmap.c | 6 fs/ext4/ext4.h | 4 fs/ext4/extents.c | 57 +++ fs/ext4/ialloc.c | 4 fs/ext4/mballoc.c | 14 fs/ext4/resize.c | 3 fs/lockd/clntxdr.c | 2 fs/lockd/svcproc.c | 3 fs/proc/stat.c | 14 include/linux/if_vlan.h | 8 include/linux/netlink.h | 21 + include/linux/skbuff.h | 24 - include/net/flow.h | 1 include/net/route.h | 3 include/rdma/rdma_netlink.h | 1 kernel/cgroup.c | 41 -- kernel/sys.c | 12 kernel/trace/ring_buffer.c | 4 net/8021q/vlan_core.c | 10 net/core/dev.c | 7 net/core/neighbour.c | 6 net/core/skbuff.c | 47 --- net/ipv4/fib_frontend.c | 3 net/ipv4/fib_semantics.c | 2 net/ipv4/inet_connection_sock.c | 4 net/ipv4/ip_forward.c | 2 net/ipv4/ip_output.c | 4 net/ipv4/route.c | 146 +++++----- net/ipv4/tcp_ipv4.c | 7 net/ipv4/xfrm4_policy.c | 1 net/ipv6/addrconf.c | 15 - net/ipv6/af_inet6.c | 11 net/ipv6/tcp_ipv6.c | 3 net/mac80211/mesh_sync.c | 3 net/netfilter/ipvs/ip_vs_xmit.c | 8 net/netlink/af_netlink.c | 29 + net/rds/send.c | 2 net/sunrpc/cache.c | 4 net/sunrpc/xprtsock.c | 1 103 files changed, 1060 insertions(+), 1006 deletions(-)
Al Viro (1):
sparc64: fix ptrace interaction with force_successful_syscall_return()
Alan Stern (1):
USB: fix port probing and removal in garmin_gps
Alexey Kuznetsov (1):
tcp: resets are misrouted
Alexis R. Cortes (1):
usb: host: xhci: New system added for Compliance Mode Patch on SN65LVPE502CP
Andrew Morton (1):
amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
Arnd Bergmann (1):
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
Bjørn Mork (2):
USB: option: blacklist net interface on ZTE devices
USB: option: add more ZTE devices
Bryan Schumaker (1):
SUNRPC: Set alloc_slot for backchannel tcp ops
Chris Metcalf (1):
arch/tile: avoid generating .eh_frame information in modules
Chris Wilson (1):
drm/i915: Use cpu relocations if the object is in the GTT but not mappable
Chris Zankel (1):
xtensa: add missing system calls to the syscall table
Daisuke Nishimura (1):
cgroup: notify_on_release may not be triggered in some cases
Dan Carpenter (1):
oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
Daniel J Blueman (1):
x86, amd, mce: Avoid NULL pointer reference on CPU northbridge lookup
David S. Miller (2):
sparc64: Like x86 we should check current->mm during perf backtrace generation.
sparc64: Fix bit twiddling in sparc_pmu_enable_event().
David Vrabel (1):
xen/x86: don't corrupt %eip when returning from a signal handler
Devin Heitmueller (1):
media: au0828: fix case where STREAMOFF being called on stopped stream causes BUG()
Dmitry Monakhov (1):
ext4: race-condition protection for ext4_convert_unwritten_extents_endio
Eric Dumazet (3):
net: remove skb recycling
ipv6: GRO should be ECN friendly
ipv6: addrconf: fix /proc/net/if_inet6
Felipe Balbi (1):
usb: dwc3: gadget: fix 'endpoint always busy' bug
Florian Zumbiehl (1):
vlan: don't deliver frames for unknown vlans to protocols
Gao feng (2):
netlink: add reference of module in netlink_dump_start
infiniband: pass rdma_cm module to netlink_dump_start
Graham Gower (1):
skge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard
Greg Kroah-Hartman (1):
Linux 3.6.4
Guenter Roeck (1):
hwmon: (coretemp) Add support for Atom CE4110/4150/4170
Haojian Zhuang (1):
pinctrl: remove mutex lock in groups show
Heiko Carstens (1):
s390: fix linker script for 31 bit builds
Henrik Rydberg (1):
usbdevfs: Fix broken scatter-gather transfer
Hiro Sugawara (1):
iommu/tegra: smmu: Fix deadly typo
Jacob Shin (1):
x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
Johan Hovold (19):
USB: io_ti: fix port-data memory leak
USB: io_ti: fix sysfs-attribute creation
USB: cyberjack: fix port-data memory leak
USB: iuu_phoenix: fix port-data memory leak
USB: iuu_phoenix: fix sysfs-attribute creation
USB: ark3116: fix NULL-pointer dereference
USB: f81232: fix port-data memory leak
USB: oti6858: fix port-data memory leak
USB: belkin_sa: fix port-data memory leak
USB: pl2303: fix port-data memory leak
USB: ssu100: fix port-data memory leak
USB: kobil_sct: fix port-data memory leak
USB: cypress_m8: fix port-data memory leak
USB: cp210x: fix port-data memory leak
USB: spcp8x5: fix port-data memory leak
USB: ti_usb_3410_5052: fix port-data memory leak
USB: kl5kusb105: fix port-data memory leak
USB: io_edgeport: fix port-data memory leak
USB: keyspan_pda: fix port-data memory leak
Julian Anastasov (6):
ipv4: fix sending of redirects
ipv4: fix forwarding for strict source routes
ipv4: make sure nh_pcpu_rth_output is always allocated
ipv4: introduce rt_uses_gateway
ipv4: Add FLOWI_FLAG_KNOWN_NH
ipvs: fix ARP resolving for direct routing mode
Kees Cook (2):
kernel/sys.c: fix stack memory content leak via UNAME26 use clamp_t in UNAME26 fix
Lukas Czerner (1):
ext4: Avoid underflow in ext4_trim_fs()
Michal Hocko (1):
nohz: Fix idle ticks in cpu summary line of /proc/stat
Ming Lei (1):
USB: cdc-acm: fix pipe type of write endpoint
Nicolas Boullis (1):
usb: acm: fix the computation of the number of data bits
Pritesh Raithatha (3):
pinctrl: tegra: correct bank for pingroup and drv pingroup
dt: Document: correct tegra20/30 pinctrl slew-rate name
pinctrl: tegra: set low power mode bank width to 2
Sarah Sharp (3):
usb: Don't enable LPM if the exit latency is zero.
USB: Enable LPM after a failed probe.
usb: Send Set SEL before enabling parent U1/U2 timeout.
Sasha Levin (1):
SUNRPC: Prevent kernel stack corruption on long values of flush
Stefano Babic (1):
usb: musb: am35xx: drop spurious unplugging a device
Steffen Klassert (3):
ipv4: Always invalidate or update the route on pmtu events
ipv4: Don't create nh exeption when the device mtu is smaller than the reported pmtu
ipv4: Don't report stale pmtu values to userspace
Tao Ma (1):
ext4: Checksum the block bitmap properly with bigalloc enabled
Tejun Heo (2):
Revert "cgroup: Remove task_lock() from cgroup_post_fork()" Revert "cgroup: Drop task_lock(parent) on cgroup_fork()"
Thomas Pedersen (1):
mac80211: call drv_get_tsf() in sleepable context
Trond Myklebust (1):
NLM: nlm_lookup_file() may return NLMv4-specific error codes
Vaibhav Nagarnaik (1):
ring-buffer: Check for uninitialized cpu buffer before resizing
Wei Yongjun (1):
pinctrl: fix missing unlock on error in pinctrl_groups_show()
jeff.liu (1):
RDS: fix rds-ping spinlock recursion
[email protected] (1):
net: Fix skb_under_panic oops in neigh_resolve_output
Greg KH
maintainerDocumentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt +1 -1
@@ -93,7 +93,7 @@ Valid values for pin and group names are: With some exceptions, these support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength, - nvidia,pull-up-strength, nvidia,slew_rate-rising, nvidia,slew_rate-falling. + nvidia,pull-up-strength, nvidia,slew-rate-rising, nvidia,slew-rate-falling. drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2, drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg,
Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt +1 -1
@@ -83,7 +83,7 @@ Valid values for pin and group names are: drive groups: These all support nvidia,pull-down-strength, nvidia,pull-up-strength, - nvidia,slew_rate-rising, nvidia,slew_rate-falling. Most but not all + nvidia,slew-rate-rising, nvidia,slew-rate-falling. Most but not all support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode. ao1, ao2, at1, at2, at3, at4, at5, cdev1, cdev2, cec, crt, csus, dap1,
Documentation/hwmon/coretemp +1 -0
@@ -105,6 +105,7 @@ Process Processor TjMax(C) 330/230 125 E680/660/640/620 90 E680T/660T/640T/620T 110 + CE4170/4150/4110 110 45nm Core2 Processors Solo ULV SU3500/3300 100
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 6 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Terrified Chipmunk
arch/s390/boot/compressed/vmlinux.lds.S +1 -1
@@ -5,7 +5,7 @@ OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") OUTPUT_ARCH(s390:64-bit) #else OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") -OUTPUT_ARCH(s390) +OUTPUT_ARCH(s390:31-bit) #endif ENTRY(startup)
arch/s390/kernel/vmlinux.lds.S +1 -1
@@ -8,7 +8,7 @@ #ifndef CONFIG_64BIT OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") -OUTPUT_ARCH(s390) +OUTPUT_ARCH(s390:31-bit) ENTRY(startup) jiffies = jiffies_64 + 4; #else
arch/sparc/kernel/perf_event.c +9 -6
@@ -557,11 +557,13 @@ static u64 nop_for_index(int idx)static inline void sparc_pmu_enable_event (struct cpu_hw_events *cpuc,struct hw_perf_event *hwc,int idx) { -u64 val, mask =mask_for_index (idx); +u64 enc, val, mask =mask_for_index (idx); + + enc =perf_event_get_enc (cpuc->events[idx]); val = cpuc->pcr; val &= ~mask; - val |= hwc->config; + val |=event_encoding (enc, idx); cpuc->pcr = val; pcr_ops->write (cpuc->pcr);
@@ -1426,8 +1428,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry, {unsigned long ufp; -perf_callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ] +STACK_BIAS ; do { struct sparc_stackf *usf, sf;
@@ -1448,8 +1448,6 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, {unsigned long ufp; -perf_callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ] &0xffffffffUL ; do { struct sparc_stackf32 *usf, sf;
@@ -1468,6 +1466,11 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,void perf_callchain_user (struct perf_callchain_entry *entry,struct pt_regs *regs) { +perf_callchain_store (entry, regs->tpc); + +if (!current->mm) +return ; +flushw_user ();if (test_thread_flag (TIF_32BIT ))perf_callchain_user_32 (entry, regs);
arch/sparc/kernel/syscalls.S +14 -18
@@ -212,24 +212,20 @@ linux_sparc_syscall: 3: stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] ret_sys_call: ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3 - ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc sra %o0, 0, %o0 mov %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2 sllx %g2, 32, %g2 - /* Check if force_successful_syscall_return() - * was invoked. - */ - ldub [%g6 + TI_SYS_NOERROR], %l2 - brnz,a,pn %l2, 80f - stb %g0, [%g6 + TI_SYS_NOERROR] - cmp %o0, -ERESTART_RESTARTBLOCK bgeu,pn %xcc, 1f - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6 -80: + andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0 + ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc + +2: + stb %g0, [%g6 + TI_SYS_NOERROR] /* System call success, clear Carry condition code. */ andn %g3, %g2, %g3 +3: stx %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE] bne,pn %icc, linux_syscall_trace2 add %l1, 0x4, %l2 ! npc = npc+4
@@ -238,20 +234,20 @@ ret_sys_call: stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] 1: + /* Check if force_successful_syscall_return() + * was invoked. + */ + ldub [%g6 + TI_SYS_NOERROR], %l2 + brnz,pn %l2, 2b + ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc /* System call failure, set Carry condition code. * Also, get abs(errno) to return to the process. */ - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6 sub %g0, %o0, %o0 - or %g3, %g2, %g3 stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] - stx %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE] - bne,pn %icc, linux_syscall_trace2 - add %l1, 0x4, %l2 ! npc = npc+4 - stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC] + ba,pt %xcc, 3b + or %g3, %g2, %g3 - b,pt %xcc, rtrap - stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] linux_syscall_trace2: call syscall_trace_leave add %sp, PTREGS_OFF, %o0
arch/tile/Makefile +4 -0
@@ -26,6 +26,10 @@ $(error Set TILERA_ROOT or CROSS_COMPILE when building $(ARCH) on $(HOST_ARCH)) endif endif +# The tile compiler may emit .eh_frame information for backtracing. +# In kernel modules, this causes load failures due to unsupported relocations. +KBUILD_CFLAGS += -fno-asynchronous-unwind-tables + ifneq ($(CONFIG_DEBUG_EXTRA_FLAGS),"") KBUILD_CFLAGS += $(CONFIG_DEBUG_EXTRA_FLAGS) endif
arch/x86/kernel/cpu/mcheck/mce_amd.c +5 -5
@@ -576,12 +576,10 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)int err =0 ;if (shared_bank[bank]) { - nb =node_to_amd_nb (amd_get_nb_id (cpu)); -WARN_ON (!nb);/* threshold descriptor already initialized on this node? */ -if (nb->bank4) { +if (nb && nb->bank4) {/* yes, use it */ b = nb->bank4; err =kobject_add (b->kobj, &dev->kobj, name);
@@ -615,8 +613,10 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)atomic_set (&b->cpus,1 );/* nb is already initialized, see above */ -WARN_ON (nb->bank4); - nb->bank4 = b; +if (nb) { +WARN_ON (nb->bank4); + nb->bank4 = b; + } } err = allocate_threshold_blocks(cpu, bank, 0,
arch/x86/kernel/entry_32.S +5 -3
@@ -1016,7 +1016,7 @@ ENTRY(xen_sysenter_target) ENTRY(xen_hypervisor_callback) CFI_STARTPROC - pushl_cfi $0 + pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL TRACE_IRQS_OFF
@@ -1058,14 +1058,16 @@ ENTRY(xen_failsafe_callback) 2: mov 8(%esp),%es 3: mov 12(%esp),%fs 4: mov 16(%esp),%gs + /* EAX == 0 => Category 1 (Bad segment) + EAX != 0 => Category 2 (Bad IRET) */ testl %eax,%eax popl_cfi %eax lea 16(%esp),%esp CFI_ADJUST_CFA_OFFSET -16 jz 5f addl $16,%esp - jmp iret_exc # EAX != 0 => Category 2 (Bad IRET) -5: pushl_cfi $0 # EAX == 0 => Category 1 (Bad segment) + jmp iret_exc +5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL jmp ret_from_exception CFI_ENDPROC
arch/x86/kernel/entry_64.S +1 -1
@@ -1363,7 +1363,7 @@ ENTRY(xen_failsafe_callback) CFI_RESTORE r11 addq $0x30,%rsp CFI_ADJUST_CFA_OFFSET -0x30 - pushq_cfi $0 + pushq_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL jmp error_exit CFI_ENDPROC
arch/x86/kernel/setup.c +15 -2
@@ -919,8 +919,21 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_64 if (max_pfn > max_low_pfn) { - max_pfn_mapped =init_memory_mapping (1UL <<32 , - max_pfn<<PAGE_SHIFT ); +int i; +for (i =0 ; i < e820.nr_map; i++) { +struct e820entry *ei = &e820.map[i]; + +if (ei->addr + ei->size <=1UL <<32 ) +continue ; + +if (ei->type ==E820_RESERVED ) +continue ; + + max_pfn_mapped =init_memory_mapping ( + ei->addr <1UL <<32 ?1UL <<32 : ei->addr, + ei->addr + ei->size); + } +/* can we preseve max_low_pfn ?*/ max_low_pfn = max_pfn; }
arch/x86/oprofile/nmi_int.c +1 -1
@@ -55,7 +55,7 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, val |= counter_config->extra; event &= model->event_mask ? model->event_mask :0xFF ; val |= event &0xFF ; - val |= (event &0x0F00 ) <<24 ; + val |= (u64)(event &0x0F00 ) <<24 ;return val; }
arch/xtensa/include/asm/unistd.h +72 -19
157 lines not on this page · raw message
drivers/edac/amd64_edac.c +4 -7
@@ -170,8 +170,11 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)* memory controller and apply to register. Search for the first * bandwidth entry that is greater or equal than the setting requested * and program that. If at last entry, turn off DRAM scrubbing. +* +* If no suitable bandwidth is found, turn off DRAM scrubbing entirely +* by falling back to the last element in scrubrates[]. */ -for (i =0 ; i <ARRAY_SIZE (scrubrates); i++) { +for (i =0 ; i <ARRAY_SIZE (scrubrates) -1 ; i++) {/* * skip scrub rates which aren't recommended * (see F10 BKDG, F3x58)
@@ -181,12 +184,6 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)if (scrubrates[i].bandwidth <= new_bw)break ; - -/* -* if no suitable bandwidth found, turn off DRAM scrubbing -* entirely by falling back to the last element in the -* scrubrates array. -*/ } scrubval = scrubrates[i].scrubval;
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -0
@@ -269,6 +269,7 @@ eb_destroy(struct eb_objects *eb)static inline int use_cpu_reloc (struct drm_i915_gem_object *obj) {return (obj->base.write_domain ==I915_GEM_DOMAIN_CPU || + !obj->map_and_fenceable || obj->cache_level !=I915_CACHE_NONE ); }
drivers/hwmon/coretemp.c +5 -2
@@ -205,8 +205,11 @@ static const struct tjmax __cpuinitconst tjmax_table[] = { { "CPU N455", 100000 }, { "CPU N470", 100000 }, { "CPU N475", 100000 }, - { "CPU 230", 100000 }, - { "CPU 330", 125000 }, + { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */ + { "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */ + { "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 */ + { "CPU CE4150", 110000 }, /* Model 0x1c, stepping 10 */ + { "CPU CE4170", 110000 }, /* Model 0x1c, stepping 10 */ }; static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
drivers/infiniband/core/cma.c +2 -1
@@ -3495,7 +3495,8 @@ out: }static const struct ibnl_client_cbs cma_cb_table[] = { - [RDMA_NL_RDMA_CM_ID_STATS ] = { .dump = cma_get_id_stats }, + [RDMA_NL_RDMA_CM_ID_STATS ] = { .dump = cma_get_id_stats, + .module =THIS_MODULE }, };static int __init cma_init (void )
drivers/infiniband/core/netlink.c +1 -0
@@ -154,6 +154,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) {struct netlink_dump_control c = { .dump = client->cb_table[op].dump, + .module = client->cb_table[op].module, };return netlink_dump_start (nls, skb, nlh, &c); }
drivers/iommu/tegra-smmu.c +1 -1
@@ -146,7 +146,7 @@#define SMMU_ADDR_TO_PFN (addr) ((addr) >> 12)#define SMMU_ADDR_TO_PDN (addr) ((addr) >> 22) -#define SMMU_PDN_TO_ADDR (addr) ((pdn) << 22) +#define SMMU_PDN_TO_ADDR (pdn) ((pdn) << 22)#define _READABLE (1 << SMMU_PTB_DATA_ASID_READABLE_SHIFT)#define _WRITABLE (1 << SMMU_PTB_DATA_ASID_WRITABLE_SHIFT)
drivers/media/video/au0828/au0828-video.c +8 -4
@@ -1692,14 +1692,18 @@ static int vidioc_streamoff(struct file *file, void *priv, (AUVI_INPUT (i).audio_setup)(dev,0 ); } -videobuf_streamoff (&fh->vb_vidq); -res_free (fh,AU0828_RESOURCE_VIDEO ); +if (res_check (fh,AU0828_RESOURCE_VIDEO )) { +videobuf_streamoff (&fh->vb_vidq); +res_free (fh,AU0828_RESOURCE_VIDEO ); + } }else if (fh->type ==V4L2_BUF_TYPE_VBI_CAPTURE ) { dev->vbi_timeout_running =0 ;del_timer_sync (&dev->vbi_timeout); -videobuf_streamoff (&fh->vb_vbiq); -res_free (fh,AU0828_RESOURCE_VBI ); +if (res_check (fh,AU0828_RESOURCE_VBI )) { +videobuf_streamoff (&fh->vb_vbiq); +res_free (fh,AU0828_RESOURCE_VBI ); + } }return 0 ;
drivers/net/ethernet/calxeda/xgmac.c +2 -17
@@ -375,7 +375,6 @@ struct xgmac_priv {unsigned int tx_tail;void __iomem *base; -struct sk_buff_head rx_recycle;unsigned int dma_buf_sz;dma_addr_t dma_rx_phy;dma_addr_t dma_tx_phy;
@@ -672,9 +671,7 @@ static void xgmac_rx_refill(struct xgmac_priv *priv) p = priv->dma_rx + entry;if (priv->rx_skbuff[entry] ==NULL ) { - skb =__skb_dequeue (&priv->rx_recycle); -if (skb ==NULL ) - skb =netdev_alloc_skb (priv->dev, priv->dma_buf_sz); + skb =netdev_alloc_skb (priv->dev, priv->dma_buf_sz);if (unlikely (skb ==NULL ))break ;
@@ -887,17 +884,7 @@ static void xgmac_tx_complete(struct xgmac_priv *priv) desc_get_buf_len(p), DMA_TO_DEVICE); } -/* -* If there's room in the queue (limit it to size) -* we add this skb back into the pool, -* if it's the right size. -*/ -if ((skb_queue_len (&priv->rx_recycle) < -DMA_RX_RING_SZ ) && -skb_recycle_check (skb, priv->dma_buf_sz)) -__skb_queue_head (&priv->rx_recycle, skb); -else -dev_kfree_skb (skb); +dev_kfree_skb (skb); } if (dma_ring_space(priv->tx_head, priv->tx_tail, DMA_TX_RING_SZ) >
@@ -1016,7 +1003,6 @@ static int xgmac_open(struct net_device *dev) dev->dev_addr); } -skb_queue_head_init (&priv->rx_recycle);memset (&priv->xstats,0 ,sizeof (struct xgmac_extra_stats ));/* Initialize the XGMAC and descriptors */
@@ -1053,7 +1039,6 @@ static int xgmac_stop(struct net_device *dev)napi_disable (&priv->napi);writel (0 , priv->base +XGMAC_DMA_INTR_ENA ); -skb_queue_purge (&priv->rx_recycle);/* Disable the MAC core */ xgmac_mac_disable (priv->base);
drivers/net/ethernet/freescale/gianfar.c +4 -23
@@ -1757,7 +1757,6 @@ static void free_skb_resources(struct gfar_private *priv)sizeof (struct rxbd8 ) * priv->total_rx_ring_size, priv->tx_queue[0 ]->tx_bd_base, priv->tx_queue[0]->tx_bd_dma_base); -skb_queue_purge (&priv->rx_recycle); }void gfar_start (struct net_device *dev)
@@ -1935,8 +1934,6 @@ static int gfar_enet_open(struct net_device *dev)enable_napi (priv); -skb_queue_head_init (&priv->rx_recycle); -/* Initialize a bunch of registers */ init_registers (dev);
@@ -2525,16 +2522,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) bytes_sent += skb->len; -/* If there's room in the queue (limit it to rx_buffer_size) -* we add this skb back into the pool, if it's the right size -*/ -if (skb_queue_len (&priv->rx_recycle) < rx_queue->rx_ring_size && -skb_recycle_check (skb, priv->rx_buffer_size + -RXBUF_ALIGNMENT )) { -gfar_align_skb (skb); -skb_queue_head (&priv->rx_recycle, skb); - }else -dev_kfree_skb_any (skb); +dev_kfree_skb_any (skb); tx_queue->tx_skbuff[skb_dirtytx] =NULL ;
@@ -2600,7 +2588,7 @@ static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,static struct sk_buff *gfar_alloc_skb (struct net_device *dev) {struct gfar_private *priv =netdev_priv (dev); -struct sk_buff *skb =NULL ; +struct sk_buff *skb; skb =netdev_alloc_skb (dev, priv->rx_buffer_size +RXBUF_ALIGNMENT );if (!skb)
@@ -2613,14 +2601,7 @@ static struct sk_buff *gfar_alloc_skb(struct net_device *dev)struct sk_buff *gfar_new_skb (struct net_device *dev) { -struct gfar_private *priv =netdev_priv (dev); -struct sk_buff *skb =NULL ; - - skb =skb_dequeue (&priv->rx_recycle); -if (!skb) - skb =gfar_alloc_skb (dev); - -return skb; +return gfar_alloc_skb (dev); }static inline void count_errors (unsigned short status,struct net_device *dev)
@@ -2779,7 +2760,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)if (unlikely (!newskb)) newskb = skb;else if (skb) -skb_queue_head (&priv->rx_recycle, skb); +dev_kfree_skb (skb); }else {/* Increment the number of packets */ rx_queue->stats.rx_packets++;
drivers/net/ethernet/freescale/gianfar.h +0 -2
@@ -1072,8 +1072,6 @@ struct gfar_private {u32 cur_filer_idx; -struct sk_buff_head rx_recycle; -/* RX queue filer rule set*/ struct ethtool_rx_list rx_list;struct mutex rx_queue_access;
drivers/net/ethernet/freescale/ucc_geth.c +6 -23
@@ -210,14 +210,12 @@ static struct list_head *dequeue(struct list_head *lh)static struct sk_buff *get_new_skb (struct ucc_geth_private *ugeth,u8 __iomem *bd) { -struct sk_buff *skb =NULL ; +struct sk_buff *skb; - skb =__skb_dequeue (&ugeth->rx_recycle); + skb =netdev_alloc_skb (ugeth->ndev, + ugeth->ug_info->uf_info.max_rx_buf_length + +UCC_GETH_RX_DATA_BUF_ALIGNMENT );if (!skb) - skb =netdev_alloc_skb (ugeth->ndev, - ugeth->ug_info->uf_info.max_rx_buf_length + -UCC_GETH_RX_DATA_BUF_ALIGNMENT ); -if (skb ==NULL )return NULL ;/* We need the data buffer to be aligned properly. We will reserve
@@ -2021,8 +2019,6 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)iounmap (ugeth->ug_regs); ugeth->ug_regs =NULL ; } - -skb_queue_purge (&ugeth->rx_recycle); }static void ucc_geth_set_multi (struct net_device *dev)
@@ -2231,8 +2227,6 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)return -ENOMEM ; } -skb_queue_head_init (&ugeth->rx_recycle); -return 0 ; }
@@ -3275,12 +3269,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limitif (netif_msg_rx_err (ugeth))ugeth_err ("%s, %d: ERROR!!! skb - 0x%08x" , __func__, __LINE__, (u32 ) skb); -if (skb) { - skb->data = skb->head +NET_SKB_PAD ; - skb->len =0 ; -skb_reset_tail_pointer (skb); -__skb_queue_head (&ugeth->rx_recycle, skb); - } +dev_kfree_skb (skb); ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]] =NULL ; dev->stats.rx_dropped++;
@@ -3350,13 +3339,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ) dev->stats.tx_packets++; -if (skb_queue_len (&ugeth->rx_recycle) <RX_BD_RING_LEN && -skb_recycle_check (skb, - ugeth->ug_info->uf_info.max_rx_buf_length + -UCC_GETH_RX_DATA_BUF_ALIGNMENT )) -__skb_queue_head (&ugeth->rx_recycle, skb); -else -dev_kfree_skb (skb); +dev_kfree_skb (skb); ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]] =NULL ; ugeth->skb_dirtytx[txQ] =
drivers/net/ethernet/freescale/ucc_geth.h +0 -2
@@ -1214,8 +1214,6 @@ struct ucc_geth_private {/* index of the first skb which hasn't been transmitted yet. */ u16 skb_dirtytx[NUM_TX_QUEUES ]; -struct sk_buff_head rx_recycle; -struct ugeth_mii_info *mii_info;struct phy_device *phydev;phy_interface_t phy_interface;
drivers/net/ethernet/marvell/mv643xx_eth.c +2 -16
@@ -412,7 +412,6 @@ struct mv643xx_eth_private {u8 work_rx_refill;int skb_size; -struct sk_buff_head rx_recycle;/* * RX state.
@@ -673,9 +672,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget)struct rx_desc *rx_desc;int size; - skb =__skb_dequeue (&mp->rx_recycle); -if (skb ==NULL ) - skb =netdev_alloc_skb (mp->dev, mp->skb_size); + skb =netdev_alloc_skb (mp->dev, mp->skb_size);if (skb ==NULL ) { mp->oom =1 ;
@@ -989,14 +986,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force) desc->byte_cnt, DMA_TO_DEVICE); } -if (skb !=NULL ) { -if (skb_queue_len (&mp->rx_recycle) < - mp->rx_ring_size && -skb_recycle_check (skb, mp->skb_size)) -__skb_queue_head (&mp->rx_recycle, skb); -else -dev_kfree_skb (skb); - } +dev_kfree_skb (skb); }__netif_tx_unlock (nq);
@@ -2349,8 +2339,6 @@ static int mv643xx_eth_open(struct net_device *dev)napi_enable (&mp->napi); -skb_queue_head_init (&mp->rx_recycle); - mp->int_mask =INT_EXT ;for (i =0 ; i < mp->rxq_count; i++) {
@@ -2445,8 +2433,6 @@ static int mv643xx_eth_stop(struct net_device *dev)mib_counters_update (mp);del_timer_sync (&mp->mib_counters_timer); -skb_queue_purge (&mp->rx_recycle); -for (i =0 ; i < mp->rxq_count; i++)rxq_deinit (mp->rxq + i);for (i =0 ; i < mp->txq_count; i++)
drivers/net/ethernet/marvell/skge.c +7 -0
@@ -4153,6 +4153,13 @@ static struct dmi_system_id skge_32bit_dma_boards[] = { DMI_MATCH(DMI_BOARD_NAME, "nForce"), }, }, + { + .ident = "ASUS P5NSLI", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P5NSLI") + }, + }, {} };
drivers/net/ethernet/stmicro/stmmac/stmmac.h +0 -1
@@ -50,7 +50,6 @@ struct stmmac_priv {unsigned int dirty_rx;struct sk_buff **rx_skbuff;dma_addr_t *rx_skbuff_dma; -struct sk_buff_head rx_recycle;struct net_device *dev;dma_addr_t dma_rx_phy;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -18
@@ -747,18 +747,7 @@ static void stmmac_tx(struct stmmac_priv *priv) priv->hw->ring->clean_desc3 (p);if (likely (skb !=NULL )) { -/* -* If there's room in the queue (limit it to size) -* we add this skb back into the pool, -* if it's the right size. -*/ -if ((skb_queue_len (&priv->rx_recycle) < - priv->dma_rx_size) && -skb_recycle_check (skb, priv->dma_buf_sz)) -__skb_queue_head (&priv->rx_recycle, skb); -else -dev_kfree_skb (skb); - +dev_kfree_skb (skb); priv->tx_skbuff[entry] =NULL ; }
@@ -1169,7 +1158,6 @@ static int stmmac_open(struct net_device *dev) priv->eee_enabled =stmmac_eee_init (priv);napi_enable (&priv->napi); -skb_queue_head_init (&priv->rx_recycle);netif_start_queue (dev);return 0 ;
@@ -1222,7 +1210,6 @@ static int stmmac_release(struct net_device *dev)kfree (priv->tm);#endif napi_disable (&priv->napi); -skb_queue_purge (&priv->rx_recycle);/* Free the IRQ lines */ free_irq (dev->irq, dev);
@@ -1388,10 +1375,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)if (likely (priv->rx_skbuff[entry] ==NULL )) {struct sk_buff *skb; - skb =__skb_dequeue (&priv->rx_recycle); -if (skb ==NULL ) - skb =netdev_alloc_skb_ip_align (priv->dev, - bfsize); + skb =netdev_alloc_skb_ip_align (priv->dev, bfsize);if (unlikely (skb ==NULL ))break ;
drivers/pcmcia/pxa2xx_sharpsl.c +1 -1
@@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)sharpsl_pcmcia_init_reset (skt); } -static struct pcmcia_low_level sharpsl_pcmcia_ops__initdata = { +static struct pcmcia_low_level sharpsl_pcmcia_ops = { .owner =THIS_MODULE , .hw_init = sharpsl_pcmcia_hw_init, .socket_state = sharpsl_pcmcia_socket_state,
drivers/pinctrl/core.c +3 -1
@@ -1059,8 +1059,10 @@ static int pinctrl_groups_show(struct seq_file *s, void *what)seq_printf (s,"group: %s\n" , gname);for (i =0 ; i < num_pins; i++) { pname =pin_get_name (pctldev, pins[i]); -if (WARN_ON (!pname)) +if (WARN_ON (!pname)) { +mutex_unlock (&pinctrl_mutex);return -EINVAL ; + }seq_printf (s,"pin %d (%s)\n" , pins[i], pname); }seq_puts (s,"\n" );
drivers/pinctrl/pinconf.c +0 -4
@@ -537,8 +537,6 @@ static int pinconf_groups_show(struct seq_file *s, void *what)seq_puts (s,"Pin config settings per pin group\n" );seq_puts (s,"Format: group (name): configs\n" ); -mutex_lock (&pinctrl_mutex); -while (selector < ngroups) {const char *gname = pctlops->get_group_name (pctldev, selector);
@@ -549,8 +547,6 @@ static int pinconf_groups_show(struct seq_file *s, void *what) selector++; } -mutex_unlock (&pinctrl_mutex); -return 0 ; }
drivers/pinctrl/pinctrl-tegra.c +1 -1
@@ -466,7 +466,7 @@ static int tegra_pinconf_reg(struct tegra_pmx *pmx, *bank = g->drv_bank; *reg = g->drv_reg; *bit = g->lpmd_bit; - *width =1 ; + *width =2 ;break ;case TEGRA_PINCONF_PARAM_DRIVE_DOWN_STRENGTH : *bank = g->drv_bank;
drivers/pinctrl/pinctrl-tegra30.c +12 -12
@@ -3345,10 +3345,10 @@ static const struct tegra_function tegra30_functions[] = { FUNCTION(vi_alt3), }; -#define MUXCTL_REG_A 0x3000 -#define PINGROUP_REG_A 0x868 +#define DRV_PINGROUP_REG_A 0x868/* bank 0 */ +#define PINGROUP_REG_A 0x3000/* bank 1 */ -#define PINGROUP_REG_Y (r) ((r) - MUXCTL_REG_A) +#define PINGROUP_REG_Y (r) ((r) - PINGROUP_REG_A)#define PINGROUP_REG_N (r) -1#define PINGROUP (pg_name, f0, f1, f2, f3, f_safe, r, od, ior) \
@@ -3364,25 +3364,25 @@ static const struct tegra_function tegra30_functions[] = { }, \ .func_safe = TEGRA_MUX_ ## f_safe, \ .mux_reg = PINGROUP_REG_Y(r), \ - .mux_bank = 0, \ + .mux_bank = 1, \ .mux_bit = 0, \ .pupd_reg = PINGROUP_REG_Y(r), \ - .pupd_bank = 0, \ + .pupd_bank = 1, \ .pupd_bit = 2, \ .tri_reg = PINGROUP_REG_Y(r), \ - .tri_bank = 0, \ + .tri_bank = 1, \ .tri_bit = 4, \ .einput_reg = PINGROUP_REG_Y(r), \ - .einput_bank = 0, \ + .einput_bank = 1, \ .einput_bit = 5, \ .odrain_reg = PINGROUP_REG_##od(r), \ - .odrain_bank = 0, \ + .odrain_bank = 1, \ .odrain_bit = 6, \ .lock_reg = PINGROUP_REG_Y(r), \ - .lock_bank = 0, \ + .lock_bank = 1, \ .lock_bit = 7, \ .ioreset_reg = PINGROUP_REG_##ior(r), \ - .ioreset_bank = 0, \ + .ioreset_bank = 1, \ .ioreset_bit = 8, \ .drv_reg = -1, \ }
@@ -3401,8 +3401,8 @@ static const struct tegra_function tegra30_functions[] = { .odrain_reg = -1, \ .lock_reg = -1, \ .ioreset_reg = -1, \ - .drv_reg = ((r) - PINGROUP_REG_A), \ - .drv_bank = 1, \ + .drv_reg = ((r) - DRV_PINGROUP_REG_A), \ + .drv_bank = 0, \ .hsm_bit = hsm_b, \ .schmitt_bit = schmitt_b, \ .lpmd_bit = lpmd_b, \
drivers/usb/class/cdc-acm.c +16 -6
@@ -818,10 +818,6 @@ static const __u32 acm_tty_speed[] = { 2500000, 3000000, 3500000, 4000000 }; -static const __u8 acm_tty_size[] = { -5 ,6 ,7 ,8 -}; -static void acm_tty_set_termios (struct tty_struct *tty,struct ktermios *termios_old) {
@@ -835,7 +831,21 @@ static void acm_tty_set_termios(struct tty_struct *tty, newline.bParityType = termios->c_cflag &PARENB ? (termios->c_cflag &PARODD ?1 :2 ) + (termios->c_cflag &CMSPAR ?2 :0 ) :0 ; - newline.bDataBits = acm_tty_size[(termios->c_cflag &CSIZE ) >>4 ]; +switch (termios->c_cflag &CSIZE ) { +case CS5 : + newline.bDataBits =5 ; +break ; +case CS6 : + newline.bDataBits =6 ; +break ; +case CS7 : + newline.bDataBits =7 ; +break ; +case CS8 : +default : + newline.bDataBits =8 ; +break ; + }/* FIXME: Needs to clear unsupported bits in the termios */ acm->clocal = ((termios->c_cflag &CLOCAL ) !=0 );
@@ -1234,7 +1244,7 @@ made_compressed_probe:if (usb_endpoint_xfer_int (epwrite))usb_fill_int_urb (snd->urb, usb_dev, -usb_sndbulkpipe (usb_dev, epwrite->bEndpointAddress), +usb_sndintpipe (usb_dev, epwrite->bEndpointAddress),NULL , acm->writesize, acm_write_bulk, snd, epwrite->bInterval);else usb_fill_bulk_urb(snd->urb, usb_dev,
drivers/usb/core/devio.c +1 -0
@@ -1348,6 +1348,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, ret = -EFAULT ; goto error; } + uurb->buffer += u; } totlen -= u; }
drivers/usb/core/driver.c +4 -0
@@ -372,6 +372,10 @@ static int usb_probe_interface(struct device *dev) intf->condition =USB_INTERFACE_UNBOUND ;usb_cancel_queued_reset (intf); +/* If the LPM disable succeeded, balance the ref counts. */ +if (!lpm_disable_error) +usb_unlocked_enable_lpm (udev); +/* Unbound interfaces are always runtime-PM-disabled and -suspended */ if (driver->supports_autosuspend)pm_runtime_disable (dev);
drivers/usb/core/hub.c +22 -11
@@ -3258,16 +3258,6 @@ static int usb_set_device_initiated_lpm(struct usb_device *udev,if (enable) {/* -* First, let the device know about the exit latencies -* associated with the link state we're about to enable. -*/ - ret =usb_req_set_sel (udev, state); -if (ret <0 ) { -dev_warn (&udev->dev,"Set SEL for device-initiated " -"%s failed.\n" , usb3_lpm_names[state]); -return -EBUSY ; - } -/* * Now send the control transfer to enable device-initiated LPM * for either U1 or U2. */
@@ -3352,7 +3342,28 @@ static int usb_set_lpm_timeout(struct usb_device *udev,static void usb_enable_link_state (struct usb_hcd *hcd,struct usb_device *udev,enum usb3_link_state state) { -int timeout; +int timeout, ret; +__u8 u1_mel = udev->bos->ss_cap->bU1devExitLat; +__le16 u2_mel = udev->bos->ss_cap->bU2DevExitLat; + +/* If the device says it doesn't have *any* exit latency to come out of +* U1 or U2, it's probably lying. Assume it doesn't implement that link +* state. +*/ +if ((state ==USB3_LPM_U1 && u1_mel ==0 ) || + (state ==USB3_LPM_U2 && u2_mel ==0 )) +return ; + +/* +* First, let the device know about the exit latencies +* associated with the link state we're about to enable. +*/ + ret =usb_req_set_sel (udev, state); +if (ret <0 ) { +dev_warn (&udev->dev,"Set SEL for device-initiated %s failed.\n" , + usb3_lpm_names[state]); +return ; + }/* We allow the host controller to set the U1/U2 timeout internally * first, so that it can change its schedule to account for the
drivers/usb/dwc3/gadget.c +1 -0
@@ -1899,6 +1899,7 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum) ret =dwc3_send_gadget_ep_cmd (dwc, dep->number, cmd, ¶ms);WARN_ON_ONCE (ret); dep->resource_index =0 ; + dep->flags &= ~DWC3_EP_BUSY ; }static void dwc3_stop_active_transfers (struct dwc3 *dwc)
drivers/usb/host/xhci.c +2 -1
@@ -479,7 +479,8 @@ static bool compliance_mode_recovery_timer_quirk_check(void)if (strstr (dmi_product_name,"Z420" ) ||strstr (dmi_product_name,"Z620" ) || -strstr (dmi_product_name,"Z820" )) +strstr (dmi_product_name,"Z820" ) || +strstr (dmi_product_name,"Z1" ))return true;return false;
drivers/usb/musb/am35x.c +6 -0
@@ -312,6 +312,12 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci) ret =IRQ_HANDLED ; } +/* Drop spurious RX and TX if device is disconnected */ +if (musb->int_usb &MUSB_INTR_DISCONNECT ) { + musb->int_tx =0 ; + musb->int_rx =0 ; + } +if (musb->int_tx || musb->int_rx || musb->int_usb) ret |=musb_interrupt (musb);
drivers/usb/serial/ark3116.c +14 -12
@@ -126,9 +126,6 @@ static inline int calc_divisor(int bps)static int ark3116_attach (struct usb_serial *serial) { -struct usb_serial_port *port = serial->port[0 ]; -struct ark3116_private *priv; -/* make sure we have our end-points */ if ((serial->num_bulk_in == 0) || (serial->num_bulk_out == 0) ||
@@ -143,8 +140,15 @@ static int ark3116_attach(struct usb_serial *serial)return -EINVAL ; } - priv =kzalloc (sizeof (struct ark3116_private ), -GFP_KERNEL ); +return 0 ; +} + +static int ark3116_port_probe (struct usb_serial_port *port) +{ +struct usb_serial *serial = port->serial; +struct ark3116_private *priv; + + priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ;
@@ -199,18 +203,15 @@ static int ark3116_attach(struct usb_serial *serial)return 0 ; } -static void ark3116_release (struct usb_serial *serial) +static int ark3116_port_remove (struct usb_serial_port *port) { -struct usb_serial_port *port = serial->port[0 ];struct ark3116_private *priv =usb_get_serial_port_data (port);/* device is closed, so URBs and DMA should be down */ - -usb_set_serial_port_data (port,NULL ); -mutex_destroy (&priv->hw_lock); -kfree (priv); + +return 0 ; }static void ark3116_init_termios (struct tty_struct *tty)
@@ -725,7 +726,8 @@ static struct usb_serial_driver ark3116_device = { .id_table = id_table, .num_ports = 1, .attach = ark3116_attach, - .release = ark3116_release, + .port_probe = ark3116_port_probe, + .port_remove = ark3116_port_remove, .set_termios = ark3116_set_termios, .init_termios = ark3116_init_termios, .ioctl = ark3116_ioctl,
drivers/usb/serial/belkin_sa.c +15 -16
@@ -47,8 +47,8 @@ static bool debug;#define DRIVER_DESC "USB Belkin Serial converter driver"/* function prototypes for a Belkin USB Serial Adapter F5U103 */ -static int belkin_sa_startup (struct usb_serial *serial); -static void belkin_sa_release (struct usb_serial *serial); +static int belkin_sa_port_probe (struct usb_serial_port *port); +static int belkin_sa_port_remove (struct usb_serial_port *port);static int belkin_sa_open (struct tty_struct *tty,struct usb_serial_port *port);static void belkin_sa_close (struct usb_serial_port *port);
@@ -90,8 +90,8 @@ static struct usb_serial_driver belkin_device = { .break_ctl = belkin_sa_break_ctl, .tiocmget = belkin_sa_tiocmget, .tiocmset = belkin_sa_tiocmset, - .attach = belkin_sa_startup, - .release = belkin_sa_release, + .port_probe = belkin_sa_port_probe, + .port_remove = belkin_sa_port_remove, };static struct usb_serial_driver *const serial_drivers[] = {
@@ -120,17 +120,15 @@ struct belkin_sa_private { (c), BELKIN_SA_SET_REQUEST_TYPE, \ (v), 0, NULL, 0, WDR_TIMEOUT) -/* do some startup allocations not currently performed by usb_serial_probe() */ -static int belkin_sa_startup (struct usb_serial *serial) +static int belkin_sa_port_probe (struct usb_serial_port *port) { -struct usb_device *dev = serial->dev; +struct usb_device *dev = port->serial->dev;struct belkin_sa_private *priv; -/* allocate the private data structure */ priv =kmalloc (sizeof (struct belkin_sa_private ),GFP_KERNEL );if (!priv) -return -1 ;/* error */ -/* set initial values for control structures */ +return -ENOMEM ; +spin_lock_init (&priv->lock); priv->control_state =0 ; priv->last_lsr =0 ;
@@ -142,18 +140,19 @@ static int belkin_sa_startup(struct usb_serial *serial)le16_to_cpu (dev->descriptor.bcdDevice), priv->bad_flow_control); -init_waitqueue_head (&serial->port[0 ]->write_wait); -usb_set_serial_port_data (serial->port[0 ], priv); +usb_set_serial_port_data (port, priv);return 0 ; } -static void belkin_sa_release (struct usb_serial *serial) +static int belkin_sa_port_remove (struct usb_serial_port *port) { -int i; +struct belkin_sa_private *priv; -for (i =0 ; i < serial->num_ports; ++i) -kfree (usb_get_serial_port_data (serial->port[i])); + priv =usb_get_serial_port_data (port); +kfree (priv); + +return 0 ; } static int belkin_sa_open(struct tty_struct *tty,
drivers/usb/serial/cp210x.c +17 -24
95 lines not on this page · raw message
drivers/usb/serial/cyberjack.c +19 -29
92 lines not on this page · raw message
drivers/usb/serial/cypress_m8.c +41 -41
154 lines not on this page · raw message
drivers/usb/serial/f81232.c +17 -26
64 lines not on this page · raw message
drivers/usb/serial/garmin_gps.c +7 -17
@@ -1414,11 +1414,10 @@ static void timeout_handler(unsigned long data) -static int garmin_attach (struct usb_serial *serial) +static int garmin_port_probe (struct usb_serial_port *port) { -int status =0 ; -struct usb_serial_port *port = serial->port[0 ]; -struct garmin_data *garmin_data_p =NULL ; +int status; +struct garmin_data *garmin_data_p; garmin_data_p =kzalloc (sizeof (struct garmin_data ),GFP_KERNEL );if (garmin_data_p ==NULL ) {
@@ -1443,22 +1442,14 @@ static int garmin_attach(struct usb_serial *serial) } -static void garmin_disconnect (struct usb_serial *serial) +static int garmin_port_remove (struct usb_serial_port *port) { -struct usb_serial_port *port = serial->port[0 ];struct garmin_data *garmin_data_p =usb_get_serial_port_data (port);usb_kill_urb (port->interrupt_in_urb);del_timer_sync (&garmin_data_p->timer); -} - - -static void garmin_release (struct usb_serial *serial) -{ -struct usb_serial_port *port = serial->port[0 ]; -struct garmin_data *garmin_data_p =usb_get_serial_port_data (port); -kfree (garmin_data_p); +return 0 ; }
@@ -1475,9 +1466,8 @@ static struct usb_serial_driver garmin_device = { .close = garmin_close, .throttle = garmin_throttle, .unthrottle = garmin_unthrottle, - .attach = garmin_attach, - .disconnect = garmin_disconnect, - .release = garmin_release, + .port_probe = garmin_port_probe, + .port_remove = garmin_port_remove, .write = garmin_write, .write_room = garmin_write_room, .write_bulk_callback = garmin_write_bulk_callback,
drivers/usb/serial/io_edgeport.c +29 -25
82 lines not on this page · raw message
drivers/usb/serial/io_tables.h +8 -0
@@ -110,6 +110,8 @@ static struct usb_serial_driver edgeport_2port_device = { .attach = edge_startup, .disconnect = edge_disconnect, .release = edge_release, + .port_probe = edge_port_probe, + .port_remove = edge_port_remove, .ioctl = edge_ioctl, .set_termios = edge_set_termios, .tiocmget = edge_tiocmget,
@@ -139,6 +141,8 @@ static struct usb_serial_driver edgeport_4port_device = { .attach = edge_startup, .disconnect = edge_disconnect, .release = edge_release, + .port_probe = edge_port_probe, + .port_remove = edge_port_remove, .ioctl = edge_ioctl, .set_termios = edge_set_termios, .tiocmget = edge_tiocmget,
@@ -168,6 +172,8 @@ static struct usb_serial_driver edgeport_8port_device = { .attach = edge_startup, .disconnect = edge_disconnect, .release = edge_release, + .port_probe = edge_port_probe, + .port_remove = edge_port_remove, .ioctl = edge_ioctl, .set_termios = edge_set_termios, .tiocmget = edge_tiocmget,
@@ -197,6 +203,8 @@ static struct usb_serial_driver epic_device = { .attach = edge_startup, .disconnect = edge_disconnect, .release = edge_release, + .port_probe = edge_port_probe, + .port_remove = edge_port_remove, .ioctl = edge_ioctl, .set_termios = edge_set_termios, .tiocmget = edge_tiocmget,
drivers/usb/serial/io_ti.c +44 -47
131 lines not on this page · raw message
drivers/usb/serial/iuu_phoenix.c +42 -42
128 lines not on this page · raw message
drivers/usb/serial/keyspan_pda.c +17 -13
@@ -735,29 +735,33 @@ MODULE_FIRMWARE("keyspan_pda/keyspan_pda.fw");MODULE_FIRMWARE ("keyspan_pda/xircom_pgs.fw" );#endif -static int keyspan_pda_startup (struct usb_serial *serial) +static int keyspan_pda_port_probe (struct usb_serial_port *port) {struct keyspan_pda_private *priv; -/* allocate the private data structures for all ports. Well, for all -one ports. */ - priv =kmalloc (sizeof (struct keyspan_pda_private ),GFP_KERNEL );if (!priv) -return 1 ;/* error */ -usb_set_serial_port_data (serial->port[0 ], priv); -init_waitqueue_head (&serial->port[0 ]->write_wait); +return -ENOMEM ; +INIT_WORK (&priv->wakeup_work, keyspan_pda_wakeup_write);INIT_WORK (&priv->unthrottle_work, keyspan_pda_request_unthrottle); - priv->serial = serial; - priv->port = serial->port[0 ]; + priv->serial = port->serial; + priv->port = port; + +usb_set_serial_port_data (port, priv); +return 0 ; } -static void keyspan_pda_release (struct usb_serial *serial) +static int keyspan_pda_port_remove (struct usb_serial_port *port) { -kfree (usb_get_serial_port_data (serial->port[0 ])); +struct keyspan_pda_private *priv; + + priv =usb_get_serial_port_data (port); +kfree (priv); + +return 0 ; }#ifdef KEYSPAN
@@ -808,8 +812,8 @@ static struct usb_serial_driver keyspan_pda_device = { .break_ctl = keyspan_pda_break_ctl, .tiocmget = keyspan_pda_tiocmget, .tiocmset = keyspan_pda_tiocmset, - .attach = keyspan_pda_startup, - .release = keyspan_pda_release, + .port_probe = keyspan_pda_port_probe, + .port_remove = keyspan_pda_port_remove, };static struct usb_serial_driver *const serial_drivers[] = {
drivers/usb/serial/kl5kusb105.c +24 -42
98 lines not on this page · raw message
drivers/usb/serial/kobil_sct.c +13 -10
@@ -56,8 +56,8 @@ static bool debug;/* Function prototypes */ -static int kobil_startup (struct usb_serial *serial); -static void kobil_release (struct usb_serial *serial); +static int kobil_port_probe (struct usb_serial_port *probe); +static int kobil_port_remove (struct usb_serial_port *probe);static int kobil_open (struct tty_struct *tty,struct usb_serial_port *port);static void kobil_close (struct usb_serial_port *port); static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
@@ -91,8 +91,8 @@ static struct usb_serial_driver kobil_device = { .description = "KOBIL USB smart card terminal", .id_table = id_table, .num_ports = 1, - .attach = kobil_startup, - .release = kobil_release, + .port_probe = kobil_port_probe, + .port_remove = kobil_port_remove, .ioctl = kobil_ioctl, .set_termios = kobil_set_termios, .init_termios = kobil_init_termios,
@@ -119,9 +119,10 @@ struct kobil_private { }; -static int kobil_startup (struct usb_serial *serial) +static int kobil_port_probe (struct usb_serial_port *port) {int i; +struct usb_serial *serial = port->serial;struct kobil_private *priv;struct usb_device *pdev;struct usb_host_config *actconfig;
@@ -152,7 +153,7 @@ static int kobil_startup(struct usb_serial *serial)printk (KERN_DEBUG "KOBIL KAAN SIM detected\n" );break ; } -usb_set_serial_port_data (serial->port[0 ], priv); +usb_set_serial_port_data (port, priv);/* search for the necessary endpoints */ pdev = serial->dev;
@@ -180,12 +181,14 @@ static int kobil_startup(struct usb_serial *serial) } -static void kobil_release (struct usb_serial *serial) +static int kobil_port_remove (struct usb_serial_port *port) { -int i; +struct kobil_private *priv; -for (i =0 ; i < serial->num_ports; ++i) -kfree (usb_get_serial_port_data (serial->port[i])); + priv =usb_get_serial_port_data (port); +kfree (priv); + +return 0 ; }static void kobil_init_termios (struct tty_struct *tty)
drivers/usb/serial/option.c +64 -20
149 lines not on this page · raw message
drivers/usb/serial/oti6858.c +28 -40
95 lines not on this page · raw message
drivers/usb/serial/pl2303.c +54 -36
163 lines not on this page · raw message
drivers/usb/serial/spcp8x5.c +18 -28
73 lines not on this page · raw message
drivers/usb/serial/ssu100.c +20 -14
@@ -69,13 +69,6 @@ struct ssu100_port_private {struct async_icount icount; }; -static void ssu100_release (struct usb_serial *serial) -{ -struct ssu100_port_private *priv =usb_get_serial_port_data (*serial->port); - -kfree (priv); -} -static inline int ssu100_control_msg (struct usb_device *dev,u8 request,u16 data,u16 index) {
@@ -444,21 +437,33 @@ static int ssu100_ioctl(struct tty_struct *tty,static int ssu100_attach (struct usb_serial *serial) { +return ssu100_initdevice (serial->dev); +} + +static int ssu100_port_probe (struct usb_serial_port *port) +{struct ssu100_port_private *priv; -struct usb_serial_port *port = *serial->port; priv =kzalloc (sizeof (*priv),GFP_KERNEL ); -if (!priv) { -dev_err (&port->dev,"%s- kmalloc(%Zd) failed.\n" , __func__, -sizeof (*priv)); +if (!priv)return -ENOMEM ; - }spin_lock_init (&priv->status_lock);init_waitqueue_head (&priv->delta_msr_wait); +usb_set_serial_port_data (port, priv); -return ssu100_initdevice (serial->dev); +return 0 ; +} + +static int ssu100_port_remove (struct usb_serial_port *port) +{ +struct ssu100_port_private *priv; + + priv =usb_get_serial_port_data (port); +kfree (priv); + +return 0 ; }static int ssu100_tiocmget (struct tty_struct *tty)
@@ -649,7 +654,8 @@ static struct usb_serial_driver ssu100_device = { .open = ssu100_open, .close = ssu100_close, .attach = ssu100_attach, - .release = ssu100_release, + .port_probe = ssu100_port_probe, + .port_remove = ssu100_port_remove, .dtr_rts = ssu100_dtr_rts, .process_read_urb = ssu100_process_read_urb, .tiocmget = ssu100_tiocmget,
drivers/usb/serial/ti_usb_3410_5052.c +43 -45
135 lines not on this page · raw message
fs/ext4/balloc.c +3 -5
@@ -174,8 +174,7 @@ void ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,ext4_free_inodes_set (sb, gdp,0 );ext4_itable_unused_set (sb, gdp,0 );memset (bh->b_data,0xff , sb->s_blocksize); -ext4_block_bitmap_csum_set (sb, block_group, gdp, bh, -EXT4_BLOCKS_PER_GROUP (sb) /8 ); +ext4_block_bitmap_csum_set (sb, block_group, gdp, bh);return ; }memset (bh->b_data,0 , sb->s_blocksize);
@@ -212,8 +211,7 @@ void ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,*/ ext4_mark_bitmap_end (num_clusters_in_group (sb, block_group), sb->s_blocksize *8 , bh->b_data); -ext4_block_bitmap_csum_set (sb, block_group, gdp, bh, -EXT4_BLOCKS_PER_GROUP (sb) /8 ); +ext4_block_bitmap_csum_set (sb, block_group, gdp, bh);ext4_group_desc_csum_set (sb, block_group, gdp); }
@@ -350,7 +348,7 @@ void ext4_validate_block_bitmap(struct super_block *sb,return ; }if (unlikely (!ext4_block_bitmap_csum_verify (sb, block_group, - desc, bh,EXT4_BLOCKS_PER_GROUP (sb) /8 ))) { + desc, bh))) {ext4_unlock_group (sb, block_group);ext4_error (sb,"bg %u: bad block bitmap checksum" , block_group);return ;
fs/ext4/bitmap.c +4 -2
@@ -58,11 +58,12 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group,int ext4_block_bitmap_csum_verify (struct super_block *sb,ext4_group_t group,struct ext4_group_desc *gdp, -struct buffer_head *bh,int sz) +struct buffer_head *bh) {__u32 hi;__u32 provided, calculated;struct ext4_sb_info *sbi =EXT4_SB (sb); +int sz =EXT4_CLUSTERS_PER_GROUP (sb) /8 ;if (!EXT4_HAS_RO_COMPAT_FEATURE (sb,EXT4_FEATURE_RO_COMPAT_METADATA_CSUM ))
@@ -84,8 +85,9 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group,void ext4_block_bitmap_csum_set (struct super_block *sb,ext4_group_t group,struct ext4_group_desc *gdp, -struct buffer_head *bh,int sz) +struct buffer_head *bh) { +int sz =EXT4_CLUSTERS_PER_GROUP (sb) /8 ;__u32 csum;struct ext4_sb_info *sbi =EXT4_SB (sb);
fs/ext4/ext4.h +2 -2
@@ -1867,10 +1867,10 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, struct buffer_head *bh, int sz);void ext4_block_bitmap_csum_set (struct super_block *sb,ext4_group_t group,struct ext4_group_desc *gdp, -struct buffer_head *bh,int sz); +struct buffer_head *bh);int ext4_block_bitmap_csum_verify (struct super_block *sb,ext4_group_t group,struct ext4_group_desc *gdp, -struct buffer_head *bh,int sz); +struct buffer_head *bh);/* balloc.c */ extern void ext4_validate_block_bitmap(struct super_block *sb,
fs/ext4/extents.c +46 -11
83 lines not on this page · raw message
kernel/cgroup.c +10 -31
41 lines not on this page · raw message
net/core/skbuff.c +0 -47
47 lines not on this page · raw message
net/ipv4/route.c +84 -62
146 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.