Linux 3.12.13
Greg KH
maintainerI'm announcing the release of the 3.12.13 kernel.
All users of the 3.12 kernel series must upgrade.
The updated 3.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.12.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/s390/kernel/head64.S | 7 +- arch/s390/mm/page-states.c | 10 ++ arch/x86/include/asm/pgtable.h | 14 +++- arch/x86/kernel/cpu/common.c | 7 +- arch/x86/kernel/ftrace.c | 83 +++++++++++++---------- arch/x86/mm/fault.c | 14 ++-- arch/x86/xen/mmu.c | 4 - block/blk-lib.c | 8 ++ block/blk.h | 2 drivers/block/xen-blkfront.c | 5 + drivers/char/raw.c | 2 drivers/edac/edac_mc.c | 13 ++- drivers/edac/edac_mc_sysfs.c | 10 +- drivers/edac/edac_module.h | 2 drivers/gpu/drm/i915/i915_gpu_error.c | 5 + drivers/gpu/drm/radeon/r600.c | 4 + drivers/gpu/drm/radeon/si.c | 4 + drivers/hv/connection.c | 11 --- drivers/hwmon/ntc_thermistor.c | 6 - drivers/i2c/busses/i2c-mv64xxx.c | 33 ++++----- drivers/iio/adc/max1363.c | 2 drivers/iio/imu/adis16400.h | 1 drivers/iio/imu/adis16400_core.c | 10 +- drivers/iio/magnetometer/ak8975.c | 16 ++-- drivers/infiniband/hw/qib/qib_iba7322.c | 5 + drivers/md/raid1.c | 13 ++- drivers/md/raid5.c | 90 ++++++++++++-------------- drivers/misc/mei/client.c | 11 ++- drivers/net/wireless/ath/ar5523/ar5523.c | 2 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 8 ++ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 25 +++---- drivers/net/wireless/ath/ath9k/init.c | 8 ++ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 5 + drivers/net/wireless/iwlwifi/mvm/scan.c | 3 drivers/net/wireless/iwlwifi/mvm/utils.c | 2 drivers/of/address.c | 5 - drivers/pci/hotplug/acpiphp_glue.c | 15 +++- drivers/power/max17040_battery.c | 5 - drivers/spi/spi-nuc900.c | 2 drivers/spi/spi.c | 4 - drivers/staging/comedi/drivers/adv_pci1710.c | 17 +++- drivers/staging/iio/adc/ad799x_core.c | 3 drivers/staging/lustre/lustre/llite/dir.c | 2 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 drivers/target/target_core_pr.c | 11 ++- drivers/tty/n_gsm.c | 11 +++ drivers/tty/serial/sirfsoc_uart.c | 4 - drivers/tty/vt/vt.c | 2 drivers/usb/core/hcd.c | 1 drivers/usb/core/hub.c | 7 -- drivers/usb/core/usb.h | 1 drivers/usb/host/xhci-ring.c | 54 --------------- drivers/usb/host/xhci.c | 18 +++-- drivers/usb/host/xhci.h | 2 drivers/usb/serial/ftdi_sio.c | 3 drivers/usb/serial/ftdi_sio_ids.h | 7 ++ drivers/usb/serial/option.c | 3 drivers/usb/serial/qcserial.c | 3 drivers/usb/serial/usb-serial-simple.c | 3 drivers/usb/storage/Kconfig | 4 - drivers/usb/storage/scsiglue.c | 6 + drivers/usb/storage/unusual_cypress.h | 2 drivers/usb/storage/unusual_devs.h | 7 ++ drivers/vme/bridges/vme_ca91cx42.c | 4 - drivers/vme/bridges/vme_tsi148.c | 4 - fs/bio-integrity.c | 10 ++ fs/cifs/cifsacl.c | 28 ++++++-- fs/cifs/cifsglob.h | 10 ++ fs/cifs/inode.c | 13 ++- fs/cifs/smb1ops.c | 8 ++ fs/cifs/xattr.c | 64 +++++++++++------- fs/file.c | 2 fs/lockd/svclock.c | 8 ++ fs/nfs/dir.c | 5 + include/linux/compiler-gcc4.h | 6 - include/linux/usb.h | 2 kernel/irq/irqdesc.c | 1 kernel/time/jiffies.c | 6 + kernel/time/tick-broadcast.c | 1 kernel/trace/ring_buffer.c | 7 ++ mm/memory-failure.c | 6 + net/mac80211/cfg.c | 41 ++++++----- net/mac80211/tx.c | 2 net/wireless/nl80211.c | 3 scripts/mod/file2alias.c | 4 - sound/pci/hda/patch_realtek.c | 1 virt/kvm/coalesced_mmio.c | 8 -- 88 files changed, 553 insertions(+), 342 deletions(-)
Alan Stern (3):
usb-storage: add unusual-devs entry for BlackBerry 9000
usb-storage: restrict bcdDevice range for Super Top in Cypress ATACB
usb-storage: enable multi-LUN scanning when needed
Alex Deucher (1):
drm/radeon: fix UVD IRQ support on 7xx
Alexander Usyskin (2):
mei: clear write cb from waiting list on reset
mei: don't unset read cb ptr on reset
Axel Lin (1):
spi: nuc900: Set SPI_LSB_FIRST for master->mode_bits if hw->pdata->lsb is true
Beomho Seo (1):
iio: ak8975: Fix calculation formula for convert micro tesla to gauss unit
Bjørn Mork (2):
usb: qcserial: add Netgear Aircard 340U
usb: ftdi_sio: add Mindstorms EV3 console adapter
Borislav Petkov (2):
EDAC: Poll timeout cannot be zero, p2
EDAC: Correct workqueue setup path
Christian König (1):
drm/radeon: fix UVD IRQ support on SI
Cédric Dufour (1):
staging: lustre: fix quotactl permission denied (LU-4530)
Dan Carpenter (1):
KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
David Vrabel (1):
xen-blkfront: handle backend CLOSED without CLOSING
Doug Anderson (1):
hwmon: (ntc_thermistor) Avoid math overflow
Eliad Peller (1):
mac80211: move roc cookie assignment earlier
Emmanuel Grumbach (4):
mac80211: release the channel in error path in start_ap
iwlwifi: mvm: don't allow A band if SKU forbids it
iwlwifi: mvm: print the version of the firmware when it asserts
iwlwifi: mvm: BT Coex - disable BT when TXing probe request in scan
Eric W. Biederman (1):
fs/file.c:fdtable: avoid triggering OOMs from alloc_fdmem
Geert Uytterhoeven (1):
spi: Fix crash with double message finalisation on error handling
Greg Kroah-Hartman (1):
Linux 3.12.13
Guenter Roeck (1):
iio: max1363: Use devm_regulator_get_optional for optional regulator
H Hartley Sweeten (1):
staging: comedi: adv_pci1710: fix analog output readback value
H. Peter Anvin (2):
x86, smap: Don't enable SMAP if CONFIG_X86_SMAP is disabled x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off
Hartmut Knaack (1):
staging:iio:ad799x fix error_free_irq which was freeing an irq that may not have been requested
Jan Moskyto Matejka (1):
Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
Jens Axboe (1):
block: add cond_resched() to potentially long running ioctl discard loop
Johannes Berg (1):
mac80211: fix fragmentation code, particularly for encryption
K. Y. Srinivasan (1):
Drivers: hv: vmbus: Don't timeout during the initial connection with host
Kleber Sacilotto de Souza (1):
of: fix PCI bus match for PCIe slots
Kristóf Ralovich (1):
USB: simple: add Dynastream ANT USB-m Stick device support
Krzysztof Kozlowski (1):
power: max17040: Fix NULL pointer dereference when there is no platform_data
Larry Finger (1):
staging: r8188eu: Fix typo in USB_DEVICE list
Lars Poeschel (1):
tty: n_gsm: Fix for modems with brk in modem status control
Marcus Folkesson (1):
iio: adis16400: Set timestamp as the last element in chan_spec
Martin K. Petersen (1):
block: Fix nr_vecs for inline integrity vectors
Martin Schwidefsky (1):
s390: fix kernel crash due to linkage stack instructions
Martyn Welch (1):
VME: Correct read/write alignment algorithm
Mel Gorman (1):
xen: properly account for _PAGE_NUMA during xen pte translations
Michael Holzheu (1):
s390/dump: Fix dump memory detection
Mika Kuoppala (1):
drm/i915: Pair va_copy with va_end in i915_error_vprintf
Mika Westerberg (1):
ACPI / hotplug / PCI: Relax the checking of _STA return values
Mike Marciniszyn (1):
IB/qib: Add missing serdes init sequence
Mikulas Patocka (1):
time: Fix overflow when HZ is smaller than 60
Naoya Horiguchi (1):
mm/memory-failure.c: move refcount only in !MF_COUNT_INCREASED
NeilBrown (2):
lockd: send correct lock when granting a delayed lock. md/raid1: restore ability for check and repair to fix read errors.
Nicholas Bellinger (1):
target: Fix free-after-use regression in PR unregister
Oleg Nesterov (1):
md/raid5: Fix CPU hotplug callback registration
Oleksij Rempel (2):
ath9k_htc: Do not support PowerSave by default
ar5523: fix usb id for Gigaset.
Paul Bolle (1):
raw: test against runtime value of max_raw_minors
Paul Gortmaker (1):
genirq: Add missing irq_to_desc export for CONFIG_SPARSE_IRQ=n
Petr Písař (1):
vt: Fix secure clear screen
Pontus Fuchs (1):
nl80211: Reset split_start when netlink skb is exhausted
Prarit Bhargava (1):
drivers/edac/edac_mc_sysfs.c: poll timeout cannot be zero
Qipan Li (1):
serial: sirf: fix kernel panic caused by unpaired spinlock
Rafael Aquini (1):
mm: fix page leak at nfs_symlink()
Raymond Wanyoike (1):
usb: option: blacklist ZTE MF667 net interface
Sarah Sharp (5):
xhci 1.0: Limit arbitrarily-aligned scatter gather.
Revert "xhci: Set scatter-gather limit to avoid failed block writes." Revert "xhci: Avoid infinite loop when sg urb requires too many trbs" Revert "usb: xhci: Link TRB must not occur within a USB payload burst" Revert "usbcore: set lpm_capable field for LPM capable root hubs"
Stanislaw Gruszka (1):
ath9k_htc: make ->sta_rc_update atomic for most calls
Steve French (3):
CIFS: Fix SMB2 mounts so they don't try to set or get xattrs via cifs Add protocol specific operation for CIFS xattrs retrieving CIFS ACLs when mounted with SMB2 fails dropping session
Steven Noonan (1):
compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
Steven Rostedt (Red Hat) (2):
ftrace/x86: Use breakpoints for converting function graph caller
ring-buffer: Fix first commit on sub-buffer having non-zero delta
Sujith Manoharan (1):
ath9k: Do not support PowerSave by default
Takashi Iwai (1):
ALSA: hda - Fix mic capture on Sony VAIO Pro 11
Tejun Heo (1):
block: __elv_next_request() shouldn't call into the elevator if bypassing
Thomas Gleixner (1):
tick: Clear broadcast pending bit when switching to oneshot
Ulrich Hahn (1):
USB: ftdi_sio: add Tagsys RFID Reader IDs
Wolfram Sang (1):
i2c: mv64xxx: refactor message start to ensure proper initialization
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 12 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = One Giant Leap for Frogkind
arch/s390/kernel/head64.S +5 -2
@@ -59,7 +59,7 @@ ENTRY(startup_continue) .quad 0 # cr12: tracing off .quad 0 # cr13: home space segment table .quad 0xc0000000 # cr14: machine check handling off - .quad 0 # cr15: linkage stack operations + .quad .Llinkage_stack # cr15: linkage stack operations .Lpcmsk:.quad 0x0000000180000000 .L4malign:.quad 0xffffffffffc00000 .Lscan2g:.quad 0x80000000 + 0x20000 - 8 # 2GB + 128K - 8
@@ -67,12 +67,15 @@ ENTRY(startup_continue) .Lparmaddr: .quad PARMAREA .align 64 -.Lduct: .long 0,0,0,0,.Lduald,0,0,0 +.Lduct: .long 0,.Laste,.Laste,0,.Lduald,0,0,0 .long 0,0,0,0,0,0,0,0 +.Laste: .quad 0,0xffffffffffffffff,0,0,0,0,0,0 .align 128 .Lduald:.rept 8 .long 0x80000000,0,0,0 # invalid access-list entries .endr +.Llinkage_stack: + .long 0,0,0x89000000,0,0,0,0x8a000000,0 ENTRY(_ehead)
arch/s390/mm/page-states.c +10 -0
@@ -12,6 +12,8 @@#include <linux/mm.h> #include <linux/gfp.h> #include <linux/init.h> +#include <asm/setup.h> +#include <asm/ipl.h> #define ESSA_SET_STABLE 1#define ESSA_SET_UNUSED 2
@@ -41,6 +43,14 @@ void __init cmma_init(void)if (!cmma_flag)return ; +/* +* Disable CMM for dump, otherwise the tprot based memory +* detection can fail because of unstable pages. +*/ +if (OLDMEM_BASE || ipl_info.type ==IPL_TYPE_FCP_DUMP ) { + cmma_flag =0 ; +return ; + } asmvolatile (" .insn rrf,0xb9ab0000,%1,%1,0,0\n" "0: la %0,0\n"
arch/x86/include/asm/pgtable.h +12 -2
@@ -445,10 +445,20 @@ static inline int pte_same(pte_t a, pte_t b)return a.pte == b.pte; } +static inline int pteval_present (pteval_t pteval) +{ +/* +* Yes Linus, _PAGE_PROTNONE == _PAGE_NUMA. Expressing it this +* way clearly states that the intent is that protnone and numa +* hinting ptes are considered present for the purposes of +* pagetable operations like zapping, protection changes, gup etc. +*/ +return pteval & (_PAGE_PRESENT | _PAGE_PROTNONE | _PAGE_NUMA); +} +static inline int pte_present (pte_t a) { -return pte_flags (a) & (_PAGE_PRESENT | _PAGE_PROTNONE | - _PAGE_NUMA); +return pteval_present (pte_flags (a)); }#define pte_accessible pte_accessible
arch/x86/kernel/cpu/common.c +6 -1
@@ -284,8 +284,13 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)raw_local_save_flags (eflags);BUG_ON (eflags &X86_EFLAGS_AC ); -if (cpu_has (c,X86_FEATURE_SMAP )) +if (cpu_has (c,X86_FEATURE_SMAP )) { +#ifdef CONFIG_X86_SMAP set_in_cr4 (X86_CR4_SMAP ); +#else +clear_in_cr4 (X86_CR4_SMAP ); +#endif + } }/*
arch/x86/kernel/ftrace.c +47 -36
152 lines not on this page · raw message
arch/x86/mm/fault.c +9 -5
@@ -980,6 +980,12 @@ static int fault_in_kernel_space(unsigned long address)static inline bool smap_violation (int error_code,struct pt_regs *regs) { +if (!IS_ENABLED (CONFIG_X86_SMAP )) +return false; + +if (!static_cpu_has (X86_FEATURE_SMAP )) +return false; +if (error_code &PF_USER )return false;
@@ -1081,11 +1087,9 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)if (unlikely (error_code &PF_RSVD ))pgtable_bad (regs, error_code, address); -if (static_cpu_has (X86_FEATURE_SMAP )) { -if (unlikely (smap_violation (error_code, regs))) { -bad_area_nosemaphore (regs, error_code, address); -return ; - } +if (unlikely (smap_violation (error_code, regs))) { +bad_area_nosemaphore (regs, error_code, address); +return ; }perf_sw_event (PERF_COUNT_SW_PAGE_FAULTS ,1 , regs, address);
arch/x86/xen/mmu.c +2 -2
@@ -365,7 +365,7 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,/* Assume pteval_t is equivalent to all the other *val_t types. */ static pteval_t pte_mfn_to_pfn (pteval_t val) { -if (val & _PAGE_PRESENT) { +if (pteval_present (val)) {unsigned long mfn = (val &PTE_PFN_MASK ) >>PAGE_SHIFT ;unsigned long pfn =mfn_to_pfn (mfn);
@@ -381,7 +381,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)static pteval_t pte_pfn_to_mfn (pteval_t val) { -if (val & _PAGE_PRESENT) { +if (pteval_present (val)) {unsigned long pfn = (val &PTE_PFN_MASK ) >>PAGE_SHIFT ;pteval_t flags = val &PTE_FLAGS_MASK ;unsigned long mfn;
block/blk-lib.c +8 -0
@@ -121,6 +121,14 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,atomic_inc (&bb.done);submit_bio (type, bio); + +/* +* We can loop for a long time in here, if someone does +* full device discards (like mkfs). Be nice and allow +* us to schedule out to avoid softlocking if preempt +* is disabled. +*/ +cond_resched (); }blk_finish_plug (&plug);
block/blk.h +1 -1
@@ -96,7 +96,7 @@ static inline struct request *__elv_next_request(struct request_queue *q) q->flush_queue_delayed =1 ;return NULL ; } -if (unlikely (blk_queue_dying (q)) || +if (unlikely (blk_queue_bypass (q)) || !q->elevator->type->ops.elevator_dispatch_fn (q,0 ))return NULL ; }
drivers/block/xen-blkfront.c +4 -1
@@ -1852,13 +1852,16 @@ static void blkback_changed(struct xenbus_device *dev,case XenbusStateReconfiguring:case XenbusStateReconfigured:case XenbusStateUnknown: -case XenbusStateClosed:break ;case XenbusStateConnected:blkfront_connect (info);break ; +case XenbusStateClosed: +if (dev->state == XenbusStateClosed) +break ; +/* Missed the backend's Closing state -- fallthrough */ case XenbusStateClosing:blkfront_closing (info);break ;
drivers/char/raw.c +1 -1
@@ -190,7 +190,7 @@ static int bind_get(int number, dev_t *dev)struct raw_device_data *rawdev;struct block_device *bdev; -if (number <=0 || number >=MAX_RAW_MINORS ) +if (number <=0 || number >= max_raw_minors)return -EINVAL ; rawdev = &raw_devices[number];
drivers/edac/edac_mc.c +8 -5
@@ -559,7 +559,8 @@ static void edac_mc_workq_function(struct work_struct *work_req)* * called with the mem_ctls_mutex held */ -static void edac_mc_workq_setup (struct mem_ctl_info *mci,unsigned msec) +static void edac_mc_workq_setup (struct mem_ctl_info *mci,unsigned msec, +bool init) {edac_dbg (0 ,"\n" );
@@ -567,7 +568,9 @@ static void edac_mc_workq_setup(struct mem_ctl_info *mci, unsigned msec)if (mci->op_state !=OP_RUNNING_POLL )return ; -INIT_DELAYED_WORK (&mci->work, edac_mc_workq_function); +if (init) +INIT_DELAYED_WORK (&mci->work, edac_mc_workq_function); +mod_delayed_work (edac_workqueue, &mci->work,msecs_to_jiffies (msec)); }
@@ -601,7 +604,7 @@ static void edac_mc_workq_teardown(struct mem_ctl_info *mci)* user space has updated our poll period value, need to * reset our workq delays */ -void edac_mc_reset_delay_period (int value) +void edac_mc_reset_delay_period (unsigned long value) {struct mem_ctl_info *mci;struct list_head *item;
@@ -611,7 +614,7 @@ void edac_mc_reset_delay_period(int value)list_for_each (item, &mc_devices) { mci = list_entry(item, struct mem_ctl_info, link); -edac_mc_workq_setup (mci, (unsigned long ) value); +edac_mc_workq_setup (mci, value, false); }mutex_unlock (&mem_ctls_mutex);
@@ -782,7 +785,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)/* This instance is NOW RUNNING */ mci->op_state =OP_RUNNING_POLL ; -edac_mc_workq_setup (mci,edac_mc_get_poll_msec ()); +edac_mc_workq_setup (mci,edac_mc_get_poll_msec (), true); }else { mci->op_state =OP_RUNNING_INTERRUPT ; }
drivers/edac/edac_mc_sysfs.c +6 -4
@@ -52,18 +52,20 @@ int edac_mc_get_poll_msec(void)static int edac_set_poll_msec (const char *val,struct kernel_param *kp) { -long l; +unsigned long l;int ret;if (!val)return -EINVAL ; - ret =kstrtol (val,0 , &l); + ret =kstrtoul (val,0 , &l);if (ret)return ret; -if ((int )l != l) + +if (l <1000 )return -EINVAL ; - *((int *)kp->arg) = l; + + *((unsigned long *)kp->arg) = l;/* notify edac_mc engine to reset the poll period */ edac_mc_reset_delay_period (l);
drivers/edac/edac_module.h +1 -1
@@ -52,7 +52,7 @@ extern void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,extern void edac_device_workq_teardown (struct edac_device_ctl_info *edac_dev);extern void edac_device_reset_delay_period (struct edac_device_ctl_info *edac_dev,unsigned long value); -extern void edac_mc_reset_delay_period (int value); +extern void edac_mc_reset_delay_period (unsigned long value);extern void *edac_align_ptr (void **p,unsigned size,int n_elems);
drivers/gpu/drm/i915/i915_gpu_error.c +4 -1
@@ -146,7 +146,10 @@ static void i915_error_vprintf(struct drm_i915_error_state_buf *e,va_list tmp;va_copy (tmp, args); -if (!__i915_error_seek (e,vsnprintf (NULL ,0 , f, tmp))) + len =vsnprintf (NULL ,0 , f, tmp); +va_end (tmp); + +if (!__i915_error_seek (e, len))return ; }
drivers/gpu/drm/radeon/r600.c +4 -0
@@ -3854,6 +3854,10 @@ restart_ih:break ; }break ; +case 124 :/* UVD */ +DRM_DEBUG ("IH: UVD int: 0x%08x\n" , src_data); +radeon_fence_process (rdev,R600_RING_TYPE_UVD_INDEX ); +break ;case 176 :/* CP_INT in ring buffer */ case 177 :/* CP_INT in IB1 */ case 178 :/* CP_INT in IB2 */
drivers/gpu/drm/radeon/si.c +4 -0
@@ -6281,6 +6281,10 @@ restart_ih:break ; }break ; +case 124 :/* UVD */ +DRM_DEBUG ("IH: UVD int: 0x%08x\n" , src_data); +radeon_fence_process (rdev,R600_RING_TYPE_UVD_INDEX ); +break ;case 146 :case 147 : addr =RREG32 (VM_CONTEXT1_PROTECTION_FAULT_ADDR );
drivers/hv/connection.c +1 -10
@@ -67,7 +67,6 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,int ret =0 ;struct vmbus_channel_initiate_contact *msg;unsigned long flags; -int t;init_completion (&msginfo->waitevent);
@@ -102,15 +101,7 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, }/* Wait for the connection response */ - t =wait_for_completion_timeout (&msginfo->waitevent,5 *HZ ); -if (t ==0 ) { -spin_lock_irqsave (&vmbus_connection.channelmsg_lock, - flags); -list_del (&msginfo->msglistentry); -spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, - flags); -return -ETIMEDOUT ; - } +wait_for_completion (&msginfo->waitevent);spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags);list_del (&msginfo->msglistentry);
drivers/hwmon/ntc_thermistor.c +3 -3
@@ -145,7 +145,7 @@ struct ntc_data {static int ntc_adc_iio_read (struct ntc_thermistor_platform_data *pdata) {struct iio_channel *channel = pdata->chan; -unsigned int result; +s64 result;int val, ret; ret =iio_read_channel_raw (channel, &val);
@@ -155,10 +155,10 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) }/* unit: mV */ - result = pdata->pullup_uv * val; + result = pdata->pullup_uv * (s64 ) val; result >>=12 ; -return result; +return (int )result; }static const struct of_device_id ntc_match[] = {
drivers/i2c/busses/i2c-mv64xxx.c +14 -19
@@ -97,7 +97,6 @@ enum {enum {MV64XXX_I2C_ACTION_INVALID ,MV64XXX_I2C_ACTION_CONTINUE , -MV64XXX_I2C_ACTION_OFFLOAD_SEND_START ,MV64XXX_I2C_ACTION_SEND_START ,MV64XXX_I2C_ACTION_SEND_RESTART ,MV64XXX_I2C_ACTION_OFFLOAD_RESTART ,
@@ -204,6 +203,9 @@ static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data)unsigned long ctrl_reg;struct i2c_msg *msg = drv_data->msgs; +if (!drv_data->offload_enabled) +return -EOPNOTSUPP ; + drv_data->msg = msg; drv_data->byte_posn =0 ; drv_data->bytes_left = msg->len;
@@ -433,8 +435,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) drv_data->msgs++; drv_data->num_msgs--; -if (!(drv_data->offload_enabled && -mv64xxx_i2c_offload_msg (drv_data))) { +if (mv64xxx_i2c_offload_msg (drv_data) <0 ) { drv_data->cntl_bits |=MV64XXX_I2C_REG_CONTROL_START ;writel (drv_data->cntl_bits, drv_data->reg_base + drv_data->reg_offsets.control);
@@ -458,15 +459,14 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) drv_data->reg_base + drv_data->reg_offsets.control);break ; -case MV64XXX_I2C_ACTION_OFFLOAD_SEND_START : -if (!mv64xxx_i2c_offload_msg (drv_data)) -break ; -else - drv_data->action =MV64XXX_I2C_ACTION_SEND_START ; -/* FALLTHRU */ case MV64XXX_I2C_ACTION_SEND_START : -writel (drv_data->cntl_bits |MV64XXX_I2C_REG_CONTROL_START , - drv_data->reg_base + drv_data->reg_offsets.control); +/* Can we offload this msg ? */ +if (mv64xxx_i2c_offload_msg (drv_data) <0 ) { +/* No, switch to standard path */ +mv64xxx_i2c_prepare_for_io (drv_data, drv_data->msgs); +writel (drv_data->cntl_bits |MV64XXX_I2C_REG_CONTROL_START , + drv_data->reg_base + drv_data->reg_offsets.control); + }break ;case MV64XXX_I2C_ACTION_SEND_ADDR_1 :
@@ -625,15 +625,10 @@ mv64xxx_i2c_execute_msg(struct mv64xxx_i2c_data *drv_data, struct i2c_msg *msg,unsigned long flags;spin_lock_irqsave (&drv_data->lock, flags); -if (drv_data->offload_enabled) { - drv_data->action =MV64XXX_I2C_ACTION_OFFLOAD_SEND_START ; - drv_data->state =MV64XXX_I2C_STATE_WAITING_FOR_START_COND ; - }else { -mv64xxx_i2c_prepare_for_io (drv_data, msg); - drv_data->action =MV64XXX_I2C_ACTION_SEND_START ; - drv_data->state =MV64XXX_I2C_STATE_WAITING_FOR_START_COND ; - } + drv_data->action =MV64XXX_I2C_ACTION_SEND_START ; + drv_data->state =MV64XXX_I2C_STATE_WAITING_FOR_START_COND ; + drv_data->send_stop = is_last; drv_data->block =1 ;mv64xxx_i2c_do_action (drv_data);
drivers/iio/adc/max1363.c +1 -1
@@ -1527,7 +1527,7 @@ static int max1363_probe(struct i2c_client *client, st->client = client; st->vref_uv = st->chip_info->int_vref_mv *1000 ; - vref =devm_regulator_get (&client->dev,"vref" ); + vref =devm_regulator_get_optional (&client->dev,"vref" );if (!IS_ERR (vref)) {int vref_uv;
drivers/iio/imu/adis16400.h +1 -0
@@ -189,6 +189,7 @@ enum {ADIS16300_SCAN_INCLI_X ,ADIS16300_SCAN_INCLI_Y ,ADIS16400_SCAN_ADC , + ADIS16400_SCAN_TIMESTAMP, };#ifdef CONFIG_IIO_BUFFER
drivers/iio/imu/adis16400_core.c +5 -5
@@ -632,7 +632,7 @@ static const struct iio_chan_spec adis16400_channels[] = {ADIS16400_MAGN_CHAN (Z ,ADIS16400_ZMAGN_OUT ,14 ),ADIS16400_TEMP_CHAN (ADIS16400_TEMP_OUT ,12 ),ADIS16400_AUX_ADC_CHAN (ADIS16400_AUX_ADC ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (12 ) + IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP), }; static const struct iio_chan_spec adis16448_channels[] = {
@@ -659,7 +659,7 @@ static const struct iio_chan_spec adis16448_channels[] = { }, }, ADIS16400_TEMP_CHAN(ADIS16448_TEMP_OUT, 12), -IIO_CHAN_SOFT_TIMESTAMP (11 ) + IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP), };static const struct iio_chan_spec adis16350_channels[] = {
@@ -677,7 +677,7 @@ static const struct iio_chan_spec adis16350_channels[] = {ADIS16400_MOD_TEMP_CHAN (X ,ADIS16350_XTEMP_OUT ,12 ),ADIS16400_MOD_TEMP_CHAN (Y ,ADIS16350_YTEMP_OUT ,12 ),ADIS16400_MOD_TEMP_CHAN (Z ,ADIS16350_ZTEMP_OUT ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (11 ) + IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP), }; static const struct iio_chan_spec adis16300_channels[] = {
@@ -690,7 +690,7 @@ static const struct iio_chan_spec adis16300_channels[] = {ADIS16400_AUX_ADC_CHAN (ADIS16300_AUX_ADC ,12 ),ADIS16400_INCLI_CHAN (X ,ADIS16300_PITCH_OUT ,13 ),ADIS16400_INCLI_CHAN (Y ,ADIS16300_ROLL_OUT ,13 ), -IIO_CHAN_SOFT_TIMESTAMP (14 ) + IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP), }; static const struct iio_chan_spec adis16334_channels[] = {
@@ -701,7 +701,7 @@ static const struct iio_chan_spec adis16334_channels[] = {ADIS16400_ACCEL_CHAN (Y ,ADIS16400_YACCL_OUT ,14 ),ADIS16400_ACCEL_CHAN (Z ,ADIS16400_ZACCL_OUT ,14 ),ADIS16400_TEMP_CHAN (ADIS16350_XTEMP_OUT ,12 ), -IIO_CHAN_SOFT_TIMESTAMP (8 ) + IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP), }; static struct attribute *adis16400_attributes[] = {
drivers/iio/magnetometer/ak8975.c +9 -7
@@ -85,6 +85,7 @@#define AK8975_MAX_CONVERSION_TIMEOUT 500#define AK8975_CONVERSION_DONE_POLL_TIME 10#define AK8975_DATA_READY_TIMEOUT ((100*HZ)/1000) +#define RAW_TO_GAUSS (asa) ((((asa) + 128) * 3000) / 256)/* * Per-instance context data for the device.
@@ -265,15 +266,15 @@ static int ak8975_setup(struct i2c_client *client)* * Since 1uT = 100 gauss, our final scale factor becomes: * -* Hadj = H * ((ASA + 128) / 256) * 3/10 * 100 -* Hadj = H * ((ASA + 128) * 30 / 256 +* Hadj = H * ((ASA + 128) / 256) * 3/10 * 1/100 +* Hadj = H * ((ASA + 128) * 0.003) / 256 * * Since ASA doesn't change, we cache the resultant scale factor into the * device context in ak8975_setup(). */ - data->raw_to_gauss[0 ] = ((data->asa[0 ] +128 ) *30 ) >>8 ; - data->raw_to_gauss[1 ] = ((data->asa[1 ] +128 ) *30 ) >>8 ; - data->raw_to_gauss[2 ] = ((data->asa[2 ] +128 ) *30 ) >>8 ; + data->raw_to_gauss[0 ] =RAW_TO_GAUSS (data->asa[0 ]); + data->raw_to_gauss[1 ] =RAW_TO_GAUSS (data->asa[1 ]); + data->raw_to_gauss[2 ] =RAW_TO_GAUSS (data->asa[2 ]);return 0 ; }
@@ -428,8 +429,9 @@ static int ak8975_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_RAW :return ak8975_read_axis (indio_dev, chan->address, val);case IIO_CHAN_INFO_SCALE : - *val = data->raw_to_gauss[chan->address]; -return IIO_VAL_INT ; + *val =0 ; + *val2 = data->raw_to_gauss[chan->address]; +return IIO_VAL_INT_PLUS_MICRO ; }return -EINVAL ; }
drivers/infiniband/hw/qib/qib_iba7322.c +5 -0
@@ -2395,6 +2395,11 @@ static int qib_7322_bringup_serdes(struct qib_pportdata *ppd)qib_write_kreg_port (ppd, krp_ibcctrl_a, ppd->cpspec->ibcctrl_a);qib_write_kreg (dd, kr_scratch,0ULL ); +/* ensure previous Tx parameters are not still forced */ +qib_write_kreg_port (ppd, krp_tx_deemph_override, +SYM_MASK (IBSD_TX_DEEMPHASIS_OVERRIDE_0 , + reset_tx_deemphasis_override)); +if (qib_compat_ddr_negotiate) { ppd->cpspec->ibdeltainprog =1 ; ppd->cpspec->ibsymsnap = read_7322_creg32_port(ppd,
drivers/md/raid1.c +10 -3
@@ -1855,11 +1855,15 @@ static int process_checks(struct r1bio *r1_bio)for (i =0 ; i < conf->raid_disks *2 ; i++) {int j;int size; +int uptodate;struct bio *b = r1_bio->bios[i];if (b->bi_end_io != end_sync_read)continue ; -/* fixup the bio for reuse */ +/* fixup the bio for reuse, but preserve BIO_UPTODATE */ + uptodate =test_bit (BIO_UPTODATE , &b->bi_flags);bio_reset (b); +if (!uptodate) +clear_bit (BIO_UPTODATE , &b->bi_flags); b->bi_vcnt = vcnt; b->bi_size = r1_bio->sectors <<9 ; b->bi_sector = r1_bio->sector +
@@ -1892,11 +1896,14 @@ static int process_checks(struct r1bio *r1_bio)int j;struct bio *pbio = r1_bio->bios[primary];struct bio *sbio = r1_bio->bios[i]; +int uptodate =test_bit (BIO_UPTODATE , &sbio->bi_flags);if (sbio->bi_end_io != end_sync_read)continue ; +/* Now we can 'fixup' the BIO_UPTODATE flag */ +set_bit (BIO_UPTODATE , &sbio->bi_flags); -if (test_bit (BIO_UPTODATE , &sbio->bi_flags)) { +if (uptodate) {for (j = vcnt; j-- ; ) {struct page *p, *s; p = pbio->bi_io_vec[j].bv_page;
@@ -1911,7 +1918,7 @@ static int process_checks(struct r1bio *r1_bio)if (j >=0 )atomic64_add (r1_bio->sectors, &mddev->resync_mismatches);if (j <0 || (test_bit (MD_RECOVERY_CHECK , &mddev->recovery) - &&test_bit (BIO_UPTODATE , &sbio->bi_flags))) { + && uptodate)) {/* No need to write to this device. */ sbio->bi_end_io =NULL ;rdev_dec_pending (conf->mirrors[i].rdev, mddev);
drivers/md/raid5.c +44 -46
132 lines not on this page · raw message
drivers/misc/mei/client.c +9 -2
@@ -882,7 +882,6 @@ void mei_cl_all_disconnect(struct mei_device *dev)list_for_each_entry_safe (cl, next, &dev->file_list, link) { cl->state =MEI_FILE_DISCONNECTED ; cl->mei_flow_ctrl_creds =0 ; - cl->read_cb =NULL ; cl->timer_count =0 ; } }
@@ -916,8 +915,16 @@ void mei_cl_all_wakeup(struct mei_device *dev)void mei_cl_all_write_clear (struct mei_device *dev) {struct mei_cl_cb *cb, *next; +struct list_head *list; -list_for_each_entry_safe (cb, next, &dev->write_list.list, list) { + list = &dev->write_list.list; +list_for_each_entry_safe (cb, next, list, list) { +list_del (&cb->list); +mei_io_cb_free (cb); + } + + list = &dev->write_waiting_list.list; +list_for_each_entry_safe (cb, next, list, list) {list_del (&cb->list);mei_io_cb_free (cb); }
drivers/net/wireless/ath/ar5523/ar5523.c +1 -1
@@ -1764,7 +1764,7 @@ static struct usb_device_id ar5523_id_table[] = {AR5523_DEVICE_UX (0x2001 ,0x3a04 ),/* Dlink / DWLAG122 */ AR5523_DEVICE_UG (0x1690 ,0x0712 ),/* Gigaset / AR5523 */ AR5523_DEVICE_UG (0x1690 ,0x0710 ),/* Gigaset / SMCWUSBTG */ -AR5523_DEVICE_UG (0x129b ,0x160c ),/* Gigaset / USB stick 108 +AR5523_DEVICE_UG (0x129b ,0x160b ),/* Gigaset / USB stick 108 (CyberTAN Technology) */ AR5523_DEVICE_UG (0x16ab ,0x7801 ),/* Globalsun / AR5523_1 */ AR5523_DEVICE_UX(0x16ab, 0x7811), /* Globalsun / AR5523_2 */
drivers/net/wireless/ath/ath9k/htc_drv_init.c +7 -1
@@ -34,6 +34,10 @@ static int ath9k_htc_btcoex_enable;module_param_named (btcoex_enable, ath9k_htc_btcoex_enable, int,0444 );MODULE_PARM_DESC (btcoex_enable,"Enable wifi-BT coexistence" ); +static int ath9k_ps_enable; +module_param_named (ps_enable, ath9k_ps_enable, int,0444 ); +MODULE_PARM_DESC (ps_enable,"Enable WLAN PowerSave" ); +#define CHAN2G (_freq, _idx) { \ .center_freq = (_freq), \ .hw_value = (_idx), \
@@ -725,12 +729,14 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,IEEE80211_HW_SPECTRUM_MGMT |IEEE80211_HW_HAS_RATE_CONTROL |IEEE80211_HW_RX_INCLUDES_FCS | -IEEE80211_HW_SUPPORTS_PS |IEEE80211_HW_PS_NULLFUNC_STACK |IEEE80211_HW_REPORTS_TX_ACK_STATUS |IEEE80211_HW_MFP_CAPABLE |IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING ; +if (ath9k_ps_enable) + hw->flags |=IEEE80211_HW_SUPPORTS_PS ; + hw->wiphy->interface_modes =BIT (NL80211_IFTYPE_STATION ) | BIT(NL80211_IFTYPE_ADHOC) |
drivers/net/wireless/ath/ath9k/htc_drv_main.c +13 -12
@@ -1337,21 +1337,22 @@ static void ath9k_htc_sta_rc_update(struct ieee80211_hw *hw,struct ath_common *common =ath9k_hw_common (priv->ah);struct ath9k_htc_target_rate trate; +if (!(changed &IEEE80211_RC_SUPP_RATES_CHANGED )) +return ; +mutex_lock (&priv->mutex);ath9k_htc_ps_wakeup (priv); -if (changed &IEEE80211_RC_SUPP_RATES_CHANGED ) { -memset (&trate,0 ,sizeof (struct ath9k_htc_target_rate )); -ath9k_htc_setup_rate (priv, sta, &trate); -if (!ath9k_htc_send_rate_cmd (priv, &trate)) -ath_dbg (common,CONFIG , -"Supported rates for sta: %pM updated, rate caps: 0x%X\n" , - sta->addr,be32_to_cpu (trate.capflags)); -else -ath_dbg (common,CONFIG , -"Unable to update supported rates for sta: %pM\n" , - sta->addr); - } +memset (&trate,0 ,sizeof (struct ath9k_htc_target_rate )); +ath9k_htc_setup_rate (priv, sta, &trate); +if (!ath9k_htc_send_rate_cmd (priv, &trate)) +ath_dbg (common,CONFIG , +"Supported rates for sta: %pM updated, rate caps: 0x%X\n" , + sta->addr,be32_to_cpu (trate.capflags)); +else +ath_dbg (common,CONFIG , +"Unable to update supported rates for sta: %pM\n" , + sta->addr);ath9k_htc_ps_restore (priv);mutex_unlock (&priv->mutex);
drivers/net/wireless/ath/ath9k/init.c +7 -1
@@ -57,6 +57,10 @@ static int ath9k_bt_ant_diversity;module_param_named (bt_ant_diversity, ath9k_bt_ant_diversity, int,0444 );MODULE_PARM_DESC (bt_ant_diversity,"Enable WLAN/BT RX antenna diversity" ); +static int ath9k_ps_enable; +module_param_named (ps_enable, ath9k_ps_enable, int,0444 ); +MODULE_PARM_DESC (ps_enable,"Enable WLAN PowerSave" ); +bool is_ath9k_unloaded;/* We use the hw_value as an index into our private channel structure */
@@ -830,13 +834,15 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->flags =IEEE80211_HW_RX_INCLUDES_FCS |IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |IEEE80211_HW_SIGNAL_DBM | -IEEE80211_HW_SUPPORTS_PS |IEEE80211_HW_PS_NULLFUNC_STACK |IEEE80211_HW_SPECTRUM_MGMT |IEEE80211_HW_REPORTS_TX_ACK_STATUS |IEEE80211_HW_SUPPORTS_RC_TABLE |IEEE80211_HW_SUPPORTS_HT_CCK_RATES ; +if (ath9k_ps_enable) + hw->flags |=IEEE80211_HW_SUPPORTS_PS ; +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_HT ) { hw->flags |=IEEE80211_HW_AMPDU_AGGREGATION ;
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +5 -0
@@ -182,6 +182,11 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,for (ch_idx =0 ; ch_idx <IWL_NUM_CHANNELS ; ch_idx++) { ch_flags =__le16_to_cpup (nvm_ch_flags + ch_idx); + +if (ch_idx >=NUM_2GHZ_CHANNELS && + !data->sku_cap_band_52GHz_enable) + ch_flags &= ~NVM_CHANNEL_VALID ; +if (!(ch_flags &NVM_CHANNEL_VALID )) { IWL_DEBUG_EEPROM(dev, "Ch. %d Flags %x [%sGHz] - No traffic\n",
drivers/net/wireless/iwlwifi/mvm/scan.c +2 -1
@@ -311,7 +311,8 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,iwl_mvm_scan_fill_ssids (cmd, req); - cmd->tx_cmd.tx_flags =cpu_to_le32 (TX_CMD_FLG_SEQ_CTL ); + cmd->tx_cmd.tx_flags =cpu_to_le32 (TX_CMD_FLG_SEQ_CTL | +TX_CMD_FLG_BT_DIS ); cmd->tx_cmd.sta_id = mvm->aux_sta.sta_id; cmd->tx_cmd.life_time =cpu_to_le32 (TX_CMD_LIFE_TIME_INFINITE ); cmd->tx_cmd.rate_n_flags =
drivers/net/wireless/iwlwifi/mvm/utils.c +2 -0
@@ -411,6 +411,8 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm) mvm->status, table.valid); } +IWL_ERR (mvm,"Loaded firmware version: %s\n" , mvm->fw->fw_version); + trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, table.data1, table.data2, table.data3, table.blink1, table.blink2, table.ilink1,
drivers/of/address.c +3 -2
@@ -99,11 +99,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)static int of_bus_pci_match (struct device_node *np) {/* +* "pciex" is PCI Express * "vci" is for the /chaos bridge on 1st-gen PCI powermacs * "ht" is hypertransport */ -return !strcmp (np->type,"pci" ) || !strcmp (np->type,"vci" ) || - !strcmp (np->type,"ht" ); +return !strcmp (np->type,"pci" ) || !strcmp (np->type,"pciex" ) || + !strcmp (np->type,"vci" ) || !strcmp (np->type,"ht" ); } static void of_bus_pci_count_cells(struct device_node *np,
drivers/pci/hotplug/acpiphp_glue.c +13 -2
@@ -706,6 +706,17 @@ static unsigned int get_slot_status(struct acpiphp_slot *slot)return (unsigned int )sta; } +static inline bool device_status_valid (unsigned int sta) +{ +/* +* ACPI spec says that _STA may return bit 0 clear with bit 3 set +* if the device is valid but does not require a device driver to be +* loaded (Section 6.3.7 of ACPI 5.0A). +*/ +unsigned int mask =ACPI_STA_DEVICE_ENABLED |ACPI_STA_DEVICE_FUNCTIONING ; +return (sta & mask) == mask; +} +/** * trim_stale_devices - remove PCI devices that are not responding. * @dev: PCI device to start walking the hierarchy from.
@@ -721,7 +732,7 @@ static void trim_stale_devices(struct pci_dev *dev)unsigned long long sta; status =acpi_evaluate_integer (handle,"_STA" ,NULL , &sta); - alive = (ACPI_SUCCESS (status) && sta ==ACPI_STA_ALL ) + alive = (ACPI_SUCCESS (status) &&device_status_valid (sta)) ||acpiphp_no_hotplug (handle); }if (!alive) {
@@ -764,7 +775,7 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)mutex_lock (&slot->crit_sect);if (slot_no_hotplug (slot)) { ;/* do nothing */ - }else if (get_slot_status (slot) ==ACPI_STA_ALL ) { + }else if (device_status_valid (get_slot_status (slot))) {/* remove stale devices if any */ list_for_each_entry_safe (dev, tmp, &bus->devices, bus_list)
drivers/power/max17040_battery.c +3 -2
@@ -148,7 +148,7 @@ static void max17040_get_online(struct i2c_client *client) {struct max17040_chip *chip =i2c_get_clientdata (client); -if (chip->pdata->battery_online) +if (chip->pdata && chip->pdata->battery_online) chip->online = chip->pdata->battery_online ();else chip->online =1 ;
@@ -158,7 +158,8 @@ static void max17040_get_status(struct i2c_client *client) {struct max17040_chip *chip =i2c_get_clientdata (client); -if (!chip->pdata->charger_online || !chip->pdata->charger_enable) { +if (!chip->pdata || !chip->pdata->charger_online + || !chip->pdata->charger_enable) { chip->status =POWER_SUPPLY_STATUS_UNKNOWN ;return ; }
drivers/spi/spi-nuc900.c +2 -0
@@ -363,6 +363,8 @@ static int nuc900_spi_probe(struct platform_device *pdev)init_completion (&hw->done); master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; +if (hw->pdata->lsb) + master->mode_bits |=SPI_LSB_FIRST ; master->num_chipselect = hw->pdata->num_cs; master->bus_num = hw->pdata->bus_num; hw->bitbang.master = hw->master;
drivers/spi/spi.c +1 -3
@@ -600,9 +600,7 @@ static void spi_pump_messages(struct kthread_work *work) ret = master->transfer_one_message (master, master->cur_msg);if (ret) {dev_err (&master->dev, -"failed to transfer one message from queue: %d\n" , ret); - master->cur_msg->status = ret; -spi_finalize_current_message (master); +"failed to transfer one message from queue\n" );return ; } }
drivers/staging/comedi/drivers/adv_pci1710.c +12 -5
@@ -490,6 +490,7 @@ static int pci171x_insn_write_ao(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { struct pci1710_private *devpriv = dev->private; +unsigned int val;int n, chan, range, ofs; chan =CR_CHAN (insn->chanspec);
@@ -505,11 +506,14 @@ static int pci171x_insn_write_ao(struct comedi_device *dev,outw (devpriv->da_ranges, dev->iobase + PCI171x_DAREF); ofs = PCI171x_DA1; } + val = devpriv->ao_data[chan]; -for (n =0 ; n < insn->n; n++) -outw (data[n], dev->iobase + ofs); +for (n =0 ; n < insn->n; n++) { + val = data[n]; +outw (val, dev->iobase + ofs); + } - devpriv->ao_data[chan] = data[n]; + devpriv->ao_data[chan] = val;return n;
@@ -679,6 +683,7 @@ static int pci1720_insn_write_ao(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { struct pci1710_private *devpriv = dev->private; +unsigned int val;int n, rangereg, chan; chan =CR_CHAN (insn->chanspec);
@@ -688,13 +693,15 @@ static int pci1720_insn_write_ao(struct comedi_device *dev,outb (rangereg, dev->iobase +PCI1720_RANGE ); devpriv->da_ranges = rangereg; } + val = devpriv->ao_data[chan];for (n =0 ; n < insn->n; n++) { -outw (data[n], dev->iobase +PCI1720_DA0 + (chan <<1 )); + val = data[n]; +outw (val, dev->iobase +PCI1720_DA0 + (chan <<1 ));outb (0 , dev->iobase +PCI1720_SYNCOUT );/* update outputs */ } - devpriv->ao_data[chan] = data[n]; + devpriv->ao_data[chan] = val;return n; }
drivers/staging/iio/adc/ad799x_core.c +2 -1
@@ -644,7 +644,8 @@ static int ad799x_probe(struct i2c_client *client,return 0 ; error_free_irq: -free_irq (client->irq, indio_dev); +if (client->irq >0 ) +free_irq (client->irq, indio_dev); error_cleanup_ring:ad799x_ring_cleanup (indio_dev); error_disable_reg:
drivers/staging/lustre/lustre/llite/dir.c +1 -1
@@ -1086,7 +1086,7 @@ static int quotactl_ioctl(struct ll_sb_info *sbi, struct if_quotactl *qctl)break ;case Q_GETQUOTA : if (((type == USRQUOTA && - uid_eq(current_euid(), make_kuid(&init_user_ns, id))) || + !uid_eq(current_euid(), make_kuid(&init_user_ns, id))) || (type == GRPQUOTA && !in_egroup_p(make_kgid(&init_user_ns, id)))) && (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
@@ -53,7 +53,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = { {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV *//*=== Customer ID ===*/ /****** 8188EUS ********/ - {USB_DEVICE(0x8179, 0x07B8)}, /* Abocom - Abocom */ + {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */ {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {} /* Terminating entry */ };
drivers/target/target_core_pr.c +7 -4
@@ -2009,7 +2009,7 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key,struct t10_reservation *pr_tmpl = &dev->t10_pr;unsigned char isid_buf[PR_REG_ISID_LEN ], *isid_ptr =NULL ;sense_reason_t ret =TCM_NO_SENSE ; -int pr_holder =0 ; +int pr_holder =0 , type;if (!se_sess || !se_lun) {pr_err ("SPC-3 PR: se_sess || struct se_lun is NULL!\n" );
@@ -2131,6 +2131,7 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key, ret =TCM_RESERVATION_CONFLICT ; goto out; } + type = pr_reg->pr_res_type;spin_lock (&pr_tmpl->registration_lock);/*
@@ -2161,6 +2162,7 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key,* Release the calling I_T Nexus registration now.. */ __core_scsi3_free_registration (cmd->se_dev, pr_reg,NULL ,1 ); + pr_reg =NULL ;/* * From spc4r17, section 5.7.11.3 Unregistering
@@ -2174,8 +2176,8 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key,* RESERVATIONS RELEASED. */ if (pr_holder && - (pr_reg->pr_res_type ==PR_TYPE_WRITE_EXCLUSIVE_REGONLY || - pr_reg->pr_res_type ==PR_TYPE_EXCLUSIVE_ACCESS_REGONLY )) { + (type ==PR_TYPE_WRITE_EXCLUSIVE_REGONLY || + type ==PR_TYPE_EXCLUSIVE_ACCESS_REGONLY )) {list_for_each_entry (pr_reg_p, &pr_tmpl->registration_list, pr_reg_list) {
@@ -2194,7 +2196,8 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key, ret =core_scsi3_update_and_write_aptpl (dev, aptpl); out: -core_scsi3_put_pr_reg (pr_reg); +if (pr_reg) +core_scsi3_put_pr_reg (pr_reg);return ret; }
drivers/tty/n_gsm.c +11 -0
@@ -1089,6 +1089,7 @@ static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen) {unsigned int addr =0 ;unsigned int modem =0 ; +unsigned int brk =0 ;struct gsm_dlci *dlci;int len = clen;u8 *dp = data;
@@ -1115,6 +1116,16 @@ static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen)if (len ==0 )return ; } + len--; +if (len >0 ) { +while (gsm_read_ea (&brk, *dp++) ==0 ) { + len--; +if (len ==0 ) +return ; + } + modem <<=7 ; + modem |= (brk &0x7f ); + } tty =tty_port_tty_get (&dlci->port);gsm_process_modem (tty, dlci, modem, clen);if (tty) {
drivers/tty/serial/sirfsoc_uart.c +3 -1
@@ -540,8 +540,10 @@ static void sirfsoc_rx_tmo_process_tl(unsigned long param)wr_regl (port, ureg->sirfsoc_rx_dma_io_ctrl,rd_regl (port, ureg->sirfsoc_rx_dma_io_ctrl) |SIRFUART_IO_MODE ); -sirfsoc_uart_pio_rx_chars (port,4 - sirfport->rx_io_count);spin_unlock_irqrestore (&sirfport->rx_lock, flags); +spin_lock (&port->lock); +sirfsoc_uart_pio_rx_chars (port,4 - sirfport->rx_io_count); +spin_unlock (&port->lock);if (sirfport->rx_io_count ==4 ) {spin_lock_irqsave (&sirfport->rx_lock, flags); sirfport->rx_io_count =0 ;
drivers/tty/vt/vt.c +2 -0
@@ -1164,6 +1164,8 @@ static void csi_J(struct vc_data *vc, int vpar)scr_memsetw (vc->vc_screenbuf, vc->vc_video_erase_char, vc->vc_screenbuf_size >>1 );set_origin (vc); +if (CON_IS_VISIBLE (vc)) +update_screen (vc);/* fall through */ case 2 :/* erase whole display */ count = vc->vc_cols * vc->vc_rows;
drivers/usb/core/hcd.c +0 -1
@@ -1033,7 +1033,6 @@ static int register_root_hub(struct usb_hcd *hcd) dev_name(&usb_dev->dev), retval);return retval; } - usb_dev->lpm_capable =usb_device_supports_lpm (usb_dev); } retval =usb_new_device (usb_dev);
drivers/usb/core/hub.c +1 -6
@@ -135,7 +135,7 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev)return usb_get_intfdata (hdev->actconfig->interface[0 ]); } -int usb_device_supports_lpm (struct usb_device *udev) +static int usb_device_supports_lpm (struct usb_device *udev) {/* USB 2.1 (and greater) devices indicate LPM support through * their USB 2.0 Extended Capabilities BOS descriptor.
@@ -156,11 +156,6 @@ int usb_device_supports_lpm(struct usb_device *udev) "Power management will be impacted.\n");return 0 ; } - -/* udev is root hub */ -if (!udev->parent) -return 1 ; -if (udev->parent->lpm_capable)return 1 ;
drivers/usb/core/usb.h +0 -1
@@ -35,7 +35,6 @@ extern int usb_get_device_descriptor(struct usb_device *dev, unsigned int size);extern int usb_get_bos_descriptor (struct usb_device *dev);extern void usb_release_bos_descriptor (struct usb_device *dev); -extern int usb_device_supports_lpm (struct usb_device *udev);extern char *usb_cache_string (struct usb_device *udev,int index);extern int usb_set_configuration (struct usb_device *dev,int configuration);extern int usb_choose_configuration (struct usb_device *udev);
drivers/usb/host/xhci-ring.c +2 -52
60 lines not on this page · raw message
drivers/usb/host/xhci.c +13 -5
@@ -4727,11 +4727,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)struct device *dev = hcd->self.controller;int retval; -/* Limit the block layer scatter-gather lists to half a segment. */ - hcd->self.sg_tablesize =TRBS_PER_SEGMENT /2 ; - -/* support to build packet from discontinuous buffers */ - hcd->self.no_sg_constraint =1 ; +/* Accept arbitrarily long scatter-gather lists */ + hcd->self.sg_tablesize = ~0 ;/* XHCI controllers don't stop the ep queue on short packets :| */ hcd->self.no_stop_on_short =1 ;
@@ -4757,6 +4754,14 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)/* xHCI private pointer was set in xhci_pci_probe for the second * registered roothub. */ + xhci =hcd_to_xhci (hcd); +/* +* Support arbitrarily aligned sg-list entries on hosts without +* TD fragment rules (which are currently unsupported). +*/ +if (xhci->hci_version <0x100 ) + hcd->self.no_sg_constraint =1 ; +return 0 ; }
@@ -4783,6 +4788,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)if (xhci->hci_version >0x96 ) xhci->quirks |=XHCI_SPURIOUS_SUCCESS ; +if (xhci->hci_version <0x100 ) + hcd->self.no_sg_constraint =1 ; +/* Make sure the HC is halted. */ retval =xhci_halt (xhci);if (retval)
drivers/usb/host/xhci.h +1 -1
@@ -1262,7 +1262,7 @@ union xhci_trb {* since the command ring is 64-byte aligned. * It must also be greater than 16. */ -#define TRBS_PER_SEGMENT 256 +#define TRBS_PER_SEGMENT 64/* Allow two commands + a link TRB, along with any reserved command TRBs */ #define MAX_RSVD_CMD_TRBS (TRBS_PER_SEGMENT - 3)#define TRB_SEGMENT_SIZE (TRBS_PER_SEGMENT*16)
drivers/usb/serial/ftdi_sio.c +3 -0
@@ -153,6 +153,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, { USB_DEVICE(FTDI_VID, FTDI_NXTCAM_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_EV3CON_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_1_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_2_PID) },
@@ -192,6 +193,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) }, + { USB_DEVICE(FTDI_VID, FTDI_TAGSYS_LP101_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_TAGSYS_P200X_PID) }, { USB_DEVICE(FTDI_VID, FTDI_LENZ_LIUSB_PID) }, { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) }, { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) },
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -50,6 +50,7 @@#define TI_XDS100V2_PID 0xa6d0#define FTDI_NXTCAM_PID 0xABB8/* NXTCam for Mindstorms NXT */ +#define FTDI_EV3CON_PID 0xABB9/* Mindstorms EV3 Console Adapter */ /* US Interface Navigator (http://www.usinterface.com/) */ #define FTDI_USINT_CAT_PID 0xb810/* Navigator CAT and 2nd PTT lines */
@@ -363,6 +364,12 @@/* Sprog II (Andrew Crosland's SprogII DCC interface) */ #define FTDI_SPROG_II 0xF0C8 +/* +* Two of the Tagsys RFID Readers +*/ +#define FTDI_TAGSYS_LP101_PID 0xF0E9/* Tagsys L-P101 RFID*/ +#define FTDI_TAGSYS_P200X_PID 0xF0EE/* Tagsys Medio P200x RFID*/ +/* an infrared receiver for user access control with IR tags */ #define FTDI_PIEGROUP_PID 0xF208/* Product Id */
drivers/usb/serial/option.c +2 -1
@@ -1362,7 +1362,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1267, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1268, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1269, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1270, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1270, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1271, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
drivers/usb/serial/qcserial.c +3 -0
@@ -139,6 +139,9 @@ static const struct usb_device_id id_table[] = { {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 0)}, /* Sierra Wireless EM7700 Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 2)}, /* Sierra Wireless EM7700 NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 3)}, /* Sierra Wireless EM7700 Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 0)}, /* Netgear AirCard 340U Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 2)}, /* Netgear AirCard 340U NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 3)}, /* Netgear AirCard 340U Modem */ { } /* Terminating entry */ };
drivers/usb/serial/usb-serial-simple.c +2 -1
@@ -72,7 +72,8 @@ DEVICE(hp4x, HP4X_IDS);/* Suunto ANT+ USB Driver */ #define SUUNTO_IDS () \ - { USB_DEVICE(0x0fcf, 0x1008) } + { USB_DEVICE(0x0fcf, 0x1008) }, \ + { USB_DEVICE(0x0fcf, 0x1009) }/* Dynastream ANT USB-m Stick */ DEVICE (suunto,SUUNTO_IDS );/* Siemens USB/MPI adapter */
drivers/usb/storage/Kconfig +3 -1
@@ -18,7 +18,9 @@ config USB_STORAGE This option depends on 'SCSI' support being enabled, but you probably also need 'SCSI device support: SCSI disk support' - (BLK_DEV_SD) for most USB storage devices. + (BLK_DEV_SD) for most USB storage devices. Some devices also + will require 'Probe all LUNs on each SCSI device' + (SCSI_MULTI_LUN). To compile this driver as a module, choose M here: the module will be called usb-storage.
drivers/usb/storage/scsiglue.c +6 -0
@@ -78,6 +78,8 @@ static const char* host_info(struct Scsi_Host *host)static int slave_alloc (struct scsi_device *sdev) { +struct us_data *us =host_to_us (sdev->host); +/* * Set the INQUIRY transfer length to 36. We don't use any of * the extra data and many devices choke if asked for more or
@@ -102,6 +104,10 @@ static int slave_alloc (struct scsi_device *sdev)*/ blk_queue_update_dma_alignment (sdev->request_queue, (512 -1 )); +/* Tell the SCSI layer if we know there is more than one LUN */ +if (us->protocol ==USB_PR_BULK && us->max_lun >0 ) + sdev->sdev_bflags |=BLIST_FORCELUN ; +return 0 ; }
drivers/usb/storage/unusual_cypress.h +1 -1
@@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999, "Cypress ISD-300LP", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), -UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x0219 , +UNUSUAL_DEV (0x14cd ,0x6116 ,0x0160 ,0x0160 ,"Super Top" ,"USB 2.0 SATA BRIDGE" , USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
drivers/usb/storage/unusual_devs.h +7 -0
@@ -1455,6 +1455,13 @@ UNUSUAL_DEV( 0x0f88, 0x042e, 0x0100, 0x0100, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_CAPACITY ), +/* Reported by Moritz Moeller-Herrmann <[email protected]> */ +UNUSUAL_DEV (0x0fca ,0x8004 ,0x0201 ,0x0201 , +"Research In Motion" , +"BlackBerry Bold 9000" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_MAX_SECTORS_64 ), +/* Reported by Michael Stattmann <[email protected]> */ UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, "Sony Ericsson",
drivers/vme/bridges/vme_ca91cx42.c +2 -2
@@ -884,7 +884,7 @@ static ssize_t ca91cx42_master_read(struct vme_master_resource *image,if (done == count) goto out; } -if ((uintptr_t )addr &0x2 ) { +if ((uintptr_t )(addr + done) &0x2 ) {if ((count - done) <2 ) { *(u8 *)(buf + done) =ioread8 (addr + done); done +=1 ;
@@ -938,7 +938,7 @@ static ssize_t ca91cx42_master_write(struct vme_master_resource *image,if (done == count) goto out; } -if ((uintptr_t )addr &0x2 ) { +if ((uintptr_t )(addr + done) &0x2 ) {if ((count - done) <2 ) {iowrite8 (*(u8 *)(buf + done), addr + done); done +=1 ;
drivers/vme/bridges/vme_tsi148.c +2 -2
@@ -1289,7 +1289,7 @@ static ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,if (done == count) goto out; } -if ((uintptr_t )addr &0x2 ) { +if ((uintptr_t )(addr + done) &0x2 ) {if ((count - done) <2 ) { *(u8 *)(buf + done) =ioread8 (addr + done); done +=1 ;
@@ -1371,7 +1371,7 @@ static ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,if (done == count) goto out; } -if ((uintptr_t )addr &0x2 ) { +if ((uintptr_t )(addr + done) &0x2 ) {if ((count - done) <2 ) {iowrite8 (*(u8 *)(buf + done), addr + done); done +=1 ;
fs/bio-integrity.c +9 -1
@@ -114,6 +114,14 @@ void bio_integrity_free(struct bio *bio) }EXPORT_SYMBOL (bio_integrity_free); +static inline unsigned int bip_integrity_vecs (struct bio_integrity_payload *bip) +{ +if (bip->bip_slab ==BIO_POOL_NONE ) +return BIP_INLINE_VECS ; + +return bvec_nr_vecs (bip->bip_slab); +} +/** * bio_integrity_add_page - Attach integrity metadata * @bio: bio to update
@@ -129,7 +137,7 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,struct bio_integrity_payload *bip = bio->bi_integrity;struct bio_vec *iv; -if (bip->bip_vcnt >=bvec_nr_vecs (bip->bip_slab)) { +if (bip->bip_vcnt >=bip_integrity_vecs (bip)) {printk (KERN_ERR "%s: bip_vec full\n" , __func__);return 0 ; }
fs/cifs/cifsacl.c +24 -4
@@ -1027,15 +1027,30 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode,__u32 secdesclen =0 ;struct cifs_ntsd *pntsd =NULL ;/* acl obtained from server */ struct cifs_ntsd *pnntsd =NULL ;/* modified acl to be sent to server */ +struct cifs_sb_info *cifs_sb =CIFS_SB (inode->i_sb); +struct tcon_link *tlink =cifs_sb_tlink (cifs_sb); +struct cifs_tcon *tcon; + +if (IS_ERR (tlink)) +return PTR_ERR (tlink); + tcon =tlink_tcon (tlink);cifs_dbg (NOISY ,"set ACL from mode for %s\n" , path);/* Get the security descriptor */ - pntsd =get_cifs_acl (CIFS_SB (inode->i_sb), inode, path, &secdesclen); + +if (tcon->ses->server->ops->get_acl ==NULL ) { +cifs_put_tlink (tlink); +return -EOPNOTSUPP ; + } + + pntsd = tcon->ses->server->ops->get_acl (cifs_sb, inode, path, + &secdesclen);if (IS_ERR (pntsd)) { rc =PTR_ERR (pntsd);cifs_dbg (VFS ,"%s: error %d getting sec desc\n" , __func__, rc); - goto out; +cifs_put_tlink (tlink); +return rc; }/*
@@ -1048,6 +1063,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode, pnntsd =kmalloc (secdesclen,GFP_KERNEL );if (!pnntsd) {kfree (pntsd); +cifs_put_tlink (tlink);return -ENOMEM ; }
@@ -1056,14 +1072,18 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode,cifs_dbg (NOISY ,"build_sec_desc rc: %d\n" , rc); +if (tcon->ses->server->ops->set_acl ==NULL ) + rc = -EOPNOTSUPP ; +if (!rc) {/* Set the security descriptor */ - rc =set_cifs_acl (pnntsd, secdesclen, inode, path, aclflag); + rc = tcon->ses->server->ops->set_acl (pnntsd, secdesclen, inode, + path, aclflag);cifs_dbg (NOISY ,"set_cifs_acl rc: %d\n" , rc); } +cifs_put_tlink (tlink);kfree (pnntsd);kfree (pntsd); -out:return rc; }
fs/cifs/cifsglob.h +10 -0
@@ -379,6 +379,16 @@ struct smb_version_operations {char * (*create_lease_buf)(u8 *,u8 );/* parse lease context buffer and return oplock/epoch info */ __u8 (*parse_lease_buf)(void *,unsigned int *); +ssize_t (*query_all_EAs)(const unsigned int ,struct cifs_tcon *, +const unsigned char *,const unsigned char *,char *, +size_t ,const struct nls_table *,int ); +int (*set_EA)(const unsigned int ,struct cifs_tcon *,const char *, +const char *,const void *,const __u16 , +const struct nls_table *,int ); +struct cifs_ntsd * (*get_acl)(struct cifs_sb_info *,struct inode *, +const char *,u32 *); +int (*set_acl)(struct cifs_ntsd *,__u32 ,struct inode *,const char *, +int ); };struct smb_version_values {
fs/cifs/inode.c +9 -4
@@ -518,10 +518,15 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path,return PTR_ERR (tlink); tcon =tlink_tcon (tlink); - rc =CIFSSMBQAllEAs (xid, tcon, path,"SETFILEBITS" , - ea_value,4 /* size of buf */ , cifs_sb->local_nls, - cifs_sb->mnt_cifs_flags & -CIFS_MOUNT_MAP_SPECIAL_CHR ); +if (tcon->ses->server->ops->query_all_EAs ==NULL ) { +cifs_put_tlink (tlink); +return -EOPNOTSUPP ; + } + + rc = tcon->ses->server->ops->query_all_EAs (xid, tcon, path, +"SETFILEBITS" , ea_value,4 /* size of buf */ , + cifs_sb->local_nls, + cifs_sb->mnt_cifs_flags &CIFS_MOUNT_MAP_SPECIAL_CHR );cifs_put_tlink (tlink);if (rc <0 )return (int )rc;
fs/cifs/smb1ops.c +8 -0
@@ -1003,6 +1003,14 @@ struct smb_version_operations smb1_operations = { .push_mand_locks = cifs_push_mandatory_locks, .query_mf_symlink = open_query_close_cifs_symlink, .is_read_op = cifs_is_read_op, +#ifdef CONFIG_CIFS_XATTR + .query_all_EAs = CIFSSMBQAllEAs, + .set_EA = CIFSSMBSetEA, +#endif /* CIFS_XATTR */ +#ifdef CONFIG_CIFS_ACL + .get_acl = get_cifs_acl, + .set_acl = set_cifs_acl, +#endif /* CIFS_ACL */ };struct smb_version_values smb1_values = {
fs/cifs/xattr.c +41 -23
112 lines not on this page · raw message
fs/file.c +1 -1
@@ -34,7 +34,7 @@ static void *alloc_fdmem(size_t size)* vmalloc() if the allocation size will be considered "large" by the VM. */ if (size <= (PAGE_SIZE <<PAGE_ALLOC_COSTLY_ORDER )) { -void *data =kmalloc (size,GFP_KERNEL |__GFP_NOWARN); +void *data =kmalloc (size,GFP_KERNEL |__GFP_NOWARN|__GFP_NORETRY);if (data !=NULL )return data; }
fs/lockd/svclock.c +8 -0
@@ -779,6 +779,7 @@ nlmsvc_grant_blocked(struct nlm_block *block)struct nlm_file *file = block->b_file;struct nlm_lock *lock = &block->b_call->a_args.lock;int error; +loff_t fl_start, fl_end;dprintk ("lockd: grant blocked lock %p\n" , block);
@@ -796,9 +797,16 @@ nlmsvc_grant_blocked(struct nlm_block *block) }/* Try the lock operation again */ +/* vfs_lock_file() can mangle fl_start and fl_end, but we need +* them unchanged for the GRANT_MSG +*/ lock->fl.fl_flags |=FL_SLEEP ; + fl_start = lock->fl.fl_start; + fl_end = lock->fl.fl_end; error =vfs_lock_file (file->f_file,F_SETLK , &lock->fl,NULL ); lock->fl.fl_flags &= ~FL_SLEEP ; + lock->fl.fl_start = fl_start; + lock->fl.fl_end = fl_end;switch (error) {case 0 :
fs/nfs/dir.c +5 -0
@@ -1852,6 +1852,11 @@ int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) GFP_KERNEL)) {SetPageUptodate (page);unlock_page (page); +/* +* add_to_page_cache_lru() grabs an extra page refcount. +* Drop it here to avoid leaking this page later. +*/ +page_cache_release (page); } else__free_page (page );
include/linux/compiler-gcc4.h +1 -5
@@ -75,11 +75,7 @@* * (asm goto is automatically volatile - the naming reflects this.) */ -#if GCC_VERSION <=40801 -# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -#else -# define asm_volatile_goto(x...) do { asm goto(x); } while (0) -#endif +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP #if GCC_VERSION >=40400
include/linux/usb.h +0 -2
@@ -1262,8 +1262,6 @@ typedef void (*usb_complete_t)(struct urb *);* @sg: scatter gather buffer list, the buffer size of each element in * the list (except the last) must be divisible by the endpoint's * max packet size if no_sg_constraint isn't set in 'struct usb_bus' -* (FIXME: scatter-gather under xHCI is broken for periodic transfers. -* Do not use urb->sg for interrupt endpoints for now, only bulk.) * @num_mapped_sgs: (internal) number of mapped sg entries * @num_sgs: number of entries in the sg list * @transfer_buffer_length: How big is transfer_buffer. The transfer may
kernel/irq/irqdesc.c +1 -0
@@ -274,6 +274,7 @@ struct irq_desc *irq_to_desc(unsigned int irq) {return (irq <NR_IRQS ) ? irq_desc + irq :NULL ; } +EXPORT_SYMBOL (irq_to_desc);static void free_desc (unsigned int irq) {
kernel/time/jiffies.c +6 -0
@@ -51,7 +51,13 @@* HZ shrinks, so values greater than 8 overflow 32bits when * HZ=100. */ +#if HZ <34 +#define JIFFIES_SHIFT 6 +#elif HZ <67 +#define JIFFIES_SHIFT 7 +#else #define JIFFIES_SHIFT 8 +#endif static cycle_t jiffies_read (struct clocksource *cs) {
kernel/time/tick-broadcast.c +1 -0
@@ -755,6 +755,7 @@ out:static void tick_broadcast_clear_oneshot (int cpu) {cpumask_clear_cpu (cpu, tick_broadcast_oneshot_mask); +cpumask_clear_cpu (cpu, tick_broadcast_pending_mask); } static void tick_broadcast_init_next_event(struct cpumask *mask,
kernel/trace/ring_buffer.c +7 -0
@@ -2397,6 +2397,13 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, write &=RB_WRITE_MASK ; tail = write - length; +/* +* If this is the first commit on the page, then it has the same +* timestamp as the page itself. +*/ +if (!tail) + delta =0 ; +/* See if we shot pass the end of this buffer page */ if (unlikely (write >BUF_PAGE_SIZE )) return rb_move_tail(cpu_buffer, length, tail,
mm/memory-failure.c +4 -2
@@ -945,8 +945,10 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn,* to it. Similarly, page lock is shifted. */ if (hpage != p) { -put_page (hpage); -get_page (p); +if (!(flags &MF_COUNT_INCREASED )) { +put_page (hpage); +get_page (p); + }lock_page (p);unlock_page (hpage); *hpagep = p;
net/mac80211/cfg.c +22 -19
66 lines not on this page · raw message
net/mac80211/tx.c +1 -1
@@ -874,7 +874,7 @@ static int ieee80211_fragment(struct ieee80211_tx_data *tx, }/* adjust first fragment's length */ - skb->len = hdrlen + per_fragm; +skb_trim (skb, hdrlen + per_fragm);return 0 ; }
net/wireless/nl80211.c +2 -1
@@ -1655,9 +1655,10 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)* We can then retry with the larger buffer. */ if ((ret == -ENOBUFS || ret == -EMSGSIZE ) && - !skb->len && + !skb->len && !state->split && cb->min_dump_alloc <4096 ) { cb->min_dump_alloc =4096 ; + state->split_start =0 ;rtnl_unlock ();return 1 ; }
scripts/mod/file2alias.c +2 -2
@@ -210,8 +210,8 @@ static void do_usb_entry(void *symval, range_lo <0x9 ?"[%X-9" :"[%X" , range_lo);sprintf (alias +strlen (alias), - range_hi >0xA ?"a-%X]" :"%X]" , - range_lo); + range_hi >0xA ?"A-%X]" :"%X]" , + range_hi); } }if (bcdDevice_initial_digits < (sizeof (bcdDevice_lo) *2 -1 ))
sound/pci/hda/patch_realtek.c +1 -0
@@ -4057,6 +4057,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x8398 ,"ASUS P1005" ,ALC269_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1043 ,0x83ce ,"ASUS P1005" ,ALC269_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1043 ,0x8516 ,"ASUS X101CH" ,ALC269_FIXUP_ASUS_X101 ), +SND_PCI_QUIRK (0x104d ,0x90b5 ,"Sony VAIO Pro 11" ,ALC286_FIXUP_SONY_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x104d ,0x90b6 ,"Sony VAIO Pro 13" ,ALC286_FIXUP_SONY_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x104d ,0x9073 ,"Sony VAIO" ,ALC275_FIXUP_SONY_VAIO_GPIO2 ), SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
virt/kvm/coalesced_mmio.c +2 -6
@@ -154,17 +154,13 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,list_add_tail (&dev->list, &kvm->coalesced_zones);mutex_unlock (&kvm->slots_lock); -return ret; +return 0 ; out_free_dev:mutex_unlock (&kvm->slots_lock); -kfree (dev); -if (dev ==NULL ) -return -ENXIO ; - -return 0 ; +return ret; } int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,