Linux 3.1.1
I'm announcing the release of the 3.1.1 kernel.
All users of the 3.1 kernel series must upgrade.
The updated 3.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.1.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/hwspinlock.txt | 18 - Documentation/power/runtime_pm.txt | 10 + Documentation/stable_kernel_rules.txt | 14 - MAINTAINERS | 12 - Makefile | 2 arch/arm/mach-exynos4/platsmp.c | 10 - arch/arm/mach-msm/platsmp.c | 6 arch/arm/mach-omap2/omap-smp.c | 10 - arch/arm/mach-pxa/cm-x300.c | 8 arch/arm/mach-realview/platsmp.c | 10 - arch/arm/mach-shmobile/platsmp.c | 6 arch/arm/mach-tegra/platsmp.c | 8 arch/arm/mach-ux500/cpu.c | 25 ++ arch/arm/mach-ux500/platsmp.c | 10 - arch/arm/mach-vexpress/ct-ca9x4.c | 6 arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 - arch/powerpc/include/asm/sparsemem.h | 2 arch/powerpc/mm/gup.c | 12 - arch/powerpc/mm/hash_utils_64.c | 6 arch/powerpc/mm/hugetlbpage.c | 21 +- arch/powerpc/mm/mem.c | 3 arch/powerpc/mm/mmu_context_hash64.c | 12 - arch/powerpc/mm/numa.c | 3 arch/powerpc/platforms/pseries/dlpar.c | 4 arch/powerpc/platforms/pseries/eeh.c | 2 arch/s390/kernel/ptrace.c | 28 +-- arch/s390/kvm/kvm-s390.c | 14 + arch/s390/mm/gup.c | 14 + arch/s390/mm/pgtable.c | 5 arch/sparc/mm/gup.c | 2 arch/um/drivers/ubd_kern.c | 31 +++ arch/um/sys-x86_64/vdso/vma.c | 2 arch/x86/include/asm/apic.h | 2 arch/x86/include/asm/uv/uv_bau.h | 1 arch/x86/include/asm/uv/uv_hub.h | 37 +++- arch/x86/kernel/apic/bigsmp_32.c | 20 +- arch/x86/kernel/apic/probe_32.c | 10 - arch/x86/kernel/apic/x2apic_uv_x.c | 7 arch/x86/kernel/kprobes.c | 4 arch/x86/mm/gup.c | 10 - arch/x86/platform/uv/tlb_uv.c | 17 - block/blk-core.c | 2 block/blk-flush.c | 3 block/genhd.c | 8 crypto/cryptd.c | 2 drivers/acpi/atomicio.c | 2 drivers/ata/ata_piix.c | 37 +++- drivers/base/power/runtime.c | 18 + drivers/block/cciss.c | 7 drivers/block/xen-blkback/blkback.c | 2 drivers/gpu/drm/i915/intel_dp.c | 31 +++ drivers/gpu/drm/i915/intel_drv.h | 2 drivers/gpu/drm/i915/intel_panel.c | 21 +- drivers/gpu/drm/radeon/atombios_dp.c | 11 + drivers/gpu/drm/radeon/evergreen.c | 1 drivers/gpu/drm/radeon/r100.c | 1 drivers/gpu/drm/radeon/r600.c | 19 -- drivers/gpu/drm/radeon/radeon.h | 1 drivers/gpu/drm/radeon/radeon_combios.c | 4 drivers/gpu/drm/radeon/radeon_connectors.c | 29 ++- drivers/gpu/drm/radeon/radeon_drv.c | 4 drivers/gpu/drm/radeon/radeon_irq_kms.c | 48 ++++- drivers/gpu/drm/radeon/radeon_mode.h | 1 drivers/gpu/drm/radeon/rs600.c | 1 drivers/hid/Kconfig | 3 drivers/hid/hid-apple.c | 21 ++ drivers/hid/hid-core.c | 14 + drivers/hid/hid-ids.h | 13 + drivers/hid/hid-multitouch.c | 5 drivers/hwmon/coretemp.c | 3 drivers/hwmon/w83627ehf.c | 12 + drivers/hwspinlock/hwspinlock_core.c | 45 ++-- drivers/iommu/amd_iommu.c | 2 drivers/leds/led-class.c | 7 drivers/md/raid10.c | 2 drivers/md/raid5.c | 18 + drivers/media/dvb/dvb-usb/dib0700_core.c | 81 +++++++- drivers/media/dvb/frontends/dib0070.c | 37 +++- drivers/media/dvb/frontends/dib0090.c | 70 ++++++- drivers/media/dvb/frontends/dib7000m.c | 27 ++ drivers/media/dvb/frontends/dib7000p.c | 32 +++ drivers/media/dvb/frontends/dib8000.c | 72 ++++++- drivers/media/dvb/frontends/dib9000.c | 164 +++++++++++++++--- drivers/media/dvb/frontends/dibx000_common.c | 76 +++++++- drivers/media/dvb/frontends/dibx000_common.h | 1 drivers/media/video/cx23885/cx23885-dvb.c | 2 drivers/mmc/core/core.c | 10 - drivers/mmc/core/core.h | 1 drivers/mmc/core/mmc.c | 3 drivers/mmc/core/sd.c | 1 drivers/mmc/core/sdio.c | 1 drivers/mtd/mtdchar.c | 1 drivers/mtd/nand/nand_base.c | 27 +- drivers/mtd/nand/pxa3xx_nand.c | 14 - drivers/mtd/redboot.c | 3 drivers/net/phy/dp83640.c | 9 drivers/net/rionet.c | 4 drivers/net/tg3.c | 8 drivers/net/wireless/ath/ath9k/ani.c | 5 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 3 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 4 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 12 - drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 10 - drivers/net/wireless/ath/ath9k/hif_usb.c | 1 drivers/net/wireless/ath/ath9k/hw.c | 4 drivers/net/wireless/ath/ath9k/recv.c | 5 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 9 drivers/net/wireless/iwlwifi/iwl-core.c | 4 drivers/net/wireless/iwlwifi/iwl-rx.c | 2 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c | 2 drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c | 4 drivers/net/wireless/wl12xx/scan.c | 19 +- drivers/pci/quirks.c | 28 +-- drivers/pci/xen-pcifront.c | 5 drivers/platform/x86/samsung-laptop.c | 39 +++- drivers/platform/x86/wmi.c | 6 drivers/power/ds2780_battery.c | 86 +++++---- drivers/s390/cio/ccwgroup.c | 42 ++-- drivers/scsi/device_handler/scsi_dh.c | 10 - drivers/scsi/hosts.c | 9 drivers/scsi/hpsa.c | 7 drivers/scsi/ipr.c | 2 drivers/scsi/isci/isci.h | 2 drivers/scsi/isci/port_config.c | 2 drivers/scsi/isci/request.c | 49 ++--- drivers/scsi/isci/request.h | 3 drivers/scsi/isci/sas.h | 2 drivers/scsi/libsas/sas_expander.c | 2 drivers/scsi/megaraid/megaraid_sas_base.c | 3 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 15 + drivers/scsi/scsi_lib.c | 9 drivers/scsi/scsi_scan.c | 1 drivers/scsi/st.c | 4 drivers/spi/spi-omap2-mcspi.c | 7 drivers/staging/hv/hyperv_storage.h | 1 drivers/staging/hv/netvsc_drv.c | 2 drivers/staging/hv/storvsc_drv.c | 2 drivers/staging/quatech_usb2/quatech_usb2.c | 9 drivers/staging/serqt_usb2/serqt_usb2.c | 3 drivers/staging/usbip/usbip_common.h | 8 drivers/target/iscsi/iscsi_target.c | 11 - drivers/target/loopback/tcm_loop.c | 18 + drivers/target/target_core_alua.c | 20 ++ drivers/target/target_core_tmr.c | 209 ++++++++++++++--------- drivers/target/target_core_transport.c | 45 ++-- drivers/tty/pty.c | 26 +- drivers/tty/serial/jsm/jsm.h | 7 drivers/tty/serial/jsm/jsm_driver.c | 1 drivers/tty/serial/jsm/jsm_neo.c | 29 +-- drivers/tty/serial/jsm/jsm_tty.c | 94 +--------- drivers/tty/serial/pxa.c | 20 ++ drivers/tty/serial/serial_core.c | 2 drivers/tty/tty_io.c | 48 +++-- drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/devio.c | 27 ++ drivers/usb/core/driver.c | 7 drivers/usb/core/quirks.c | 24 ++ drivers/usb/gadget/printer.c | 2 drivers/usb/host/ehci-dbg.c | 2 drivers/usb/host/ehci-hcd.c | 32 +++ drivers/usb/host/ehci-pci.c | 5 drivers/usb/host/ehci-sched.c | 30 ++- drivers/usb/host/ehci.h | 17 + drivers/usb/host/fhci-sched.c | 19 +- drivers/usb/host/ohci-hub.c | 5 drivers/usb/host/xhci-hub.c | 22 +- drivers/usb/host/xhci-mem.c | 54 +++-- drivers/usb/host/xhci-pci.c | 3 drivers/usb/host/xhci-ring.c | 63 +++--- drivers/usb/host/xhci.c | 6 drivers/usb/host/xhci.h | 3 drivers/usb/mon/mon_bin.c | 2 drivers/usb/serial/ftdi_sio.c | 4 drivers/usb/serial/ftdi_sio_ids.h | 7 drivers/usb/serial/option.c | 170 +++++++++++------- drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 5 drivers/usb/serial/qcserial.c | 2 drivers/usb/storage/Kconfig | 2 drivers/usb/storage/realtek_cr.c | 35 +++ drivers/usb/storage/transport.c | 34 ++- drivers/usb/storage/usb.c | 16 + drivers/video/carminefb.c | 6 drivers/video/fbmem.c | 3 drivers/video/fbsysfs.c | 3 drivers/video/sh_mobile_hdmi.c | 47 ++--- drivers/video/via/via_modesetting.h | 5 drivers/video/via/viafbdev.c | 16 + drivers/w1/slaves/w1_ds2780.c | 48 +++-- drivers/w1/slaves/w1_ds2780.h | 2 drivers/xen/events.c | 2 drivers/xen/swiotlb-xen.c | 7 fs/binfmt_elf.c | 11 + fs/block_dev.c | 13 - fs/cifs/connect.c | 4 fs/cifs/inode.c | 19 +- fs/eventpoll.c | 25 +- fs/ext4/ext4.h | 3 fs/ext4/inode.c | 1 fs/ext4/namei.c | 8 fs/ext4/xattr.c | 6 fs/namei.c | 34 +++ fs/namespace.c | 1 fs/nfs/blocklayout/blocklayout.c | 58 +++--- fs/nfs/blocklayout/blocklayout.h | 4 fs/nfs/blocklayout/blocklayoutdev.c | 35 --- fs/nfs/idmap.c | 25 -- fs/nfs/nfs4filelayout.c | 19 -- fs/nfs/pnfs.c | 52 ++--- fs/nfs/pnfs.h | 5 fs/nfs/read.c | 12 + fs/nfs/write.c | 68 ++++--- fs/nfsd/nfs4proc.c | 6 fs/nfsd/nfs4recover.c | 2 fs/nfsd/nfs4state.c | 30 ++- fs/nfsd/nfs4xdr.c | 12 + fs/nfsd/state.h | 6 fs/nfsd/vfs.c | 3 fs/nfsd/vfs.h | 1 fs/proc/task_mmu.c | 3 fs/stat.c | 5 fs/statfs.c | 2 include/acpi/acpi_drivers.h | 2 include/drm/drm_dp_helper.h | 3 include/linux/ext2_fs.h | 4 include/linux/ext3_fs.h | 4 include/linux/interrupt.h | 3 include/linux/io-mapping.h | 4 include/linux/jiffies.h | 2 include/linux/mm.h | 67 +++---- include/linux/mm_types.h | 21 +- include/linux/namei.h | 1 include/linux/phy.h | 2 include/linux/skbuff.h | 7 include/linux/sunrpc/rpc_pipe_fs.h | 2 include/linux/tty.h | 4 include/linux/usb/hcd.h | 2 include/linux/vmalloc.h | 1 kernel/irq/pm.c | 48 ++++- kernel/kmod.c | 4 kernel/power/suspend.c | 2 kernel/time.c | 2 kernel/trace/trace.c | 4 kernel/trace/trace_kprobe.c | 58 +++++- lib/kobject_uevent.c | 2 lib/nlattr.c | 1 mm/huge_memory.c | 37 ++-- mm/internal.h | 46 +++++ mm/memory.c | 2 mm/swap.c | 83 +++++---- mm/vmalloc.c | 65 +++++-- net/caif/caif_dev.c | 5 net/core/dev.c | 1 net/core/sock.c | 1 net/core/timestamping.c | 12 + net/ipv4/xfrm4_policy.c | 14 - net/ipv6/route.c | 3 net/mac80211/cfg.c | 2 net/mac80211/ieee80211_i.h | 2 net/mac80211/mlme.c | 18 + net/mac80211/status.c | 2 net/mac80211/work.c | 9 net/sunrpc/auth_gss/auth_gss.c | 24 -- net/sunrpc/auth_unix.c | 3 net/sunrpc/rpc_pipe.c | 20 ++ scripts/kconfig/menu.c | 7 sound/pci/hda/alc269_quirks.c | 14 + sound/pci/hda/hda_intel.c | 4 sound/pci/hda/patch_conexant.c | 73 +++++--- sound/pci/hda/patch_realtek.c | 28 ++- sound/pci/hda/patch_sigmatel.c | 56 +----- sound/soc/codecs/ak4535.c | 10 - sound/soc/codecs/ak4642.c | 22 +- sound/soc/codecs/wm8711.c | 4 sound/soc/codecs/wm8741.c | 4 sound/soc/codecs/wm8904.c | 2 sound/soc/codecs/wm8940.c | 2 sound/soc/codecs/wm8962.c | 53 +++-- sound/soc/codecs/wm8994.c | 4 sound/soc/codecs/wm8996.c | 2 sound/usb/misc/ua101.c | 28 ++- tools/perf/util/probe-event.c | 4 283 files changed, 3105 insertions(+), 1479 deletions(-)
Adam Cozzette (1):
ums_realtek: do not use stack memory for DMA
Adam Radford (1):
megaraid_sas: Fix instance access in megasas_reset_timer
Al Viro (1):
VFS: we need to set LOOKUP_JUMPED on mountpoint crossing
Alan Stern (3):
EHCI: workaround for MosChip controller bug PM / Runtime: Automatically retry failed autosuspends
USB: Update last_busy time after autosuspend fails
Alex Deucher (8):
drm/radeon/kms: bail early in dvi_detect for digital only connectors drm/radeon/kms: handle !force case in connector detect more gracefully drm/radeon/kms: split MSI check into a separate function drm/radeon/kms: Add MSI quirk for HP RS690
drm/radeon/kms: properly set panel mode for eDP drm/radeon/kms: Add MSI quirk for Dell RS690 drm/radeon/kms: add MSI module parameter
drm/radeon/kms: set HPD polarity in hpd_init()
Alexander Thomas (1):
staging: usbip: fix up api changes that broke windows clients
Alexandre Bounine (1):
drivers/net/rionet.c: fix ethernet address macros for LE platforms
Andiry Xu (3):
xHCI: AMD isoc link TRB chain bit quirk
xHCI: test and clear RWC bit
xHCI: Clear PLC for USB2 root hub ports
Andrea Arcangeli (10):
mm: thp: tail page refcounting fix
powerpc: remove superfluous PageTail checks on the pte gup_fast
powerpc: get_hugepte() don't put_page() the wrong page
powerpc: gup_hugepte() avoid freeing the head page too many times
powerpc: gup_hugepte() support THP based tail recounting
powerpc: gup_huge_pmd() return 0 if pte changes
s390: gup_huge_pmd() support THP tail recounting
s390: gup_huge_pmd() return 0 if pte changes
sparc: gup_pte_range() support THP based tail recounting
thp: share get_huge_page_tail()
Andreas Krist (1):
HID: hid-apple: add device ID of another wireless aluminium
Andrei Warkentin (1):
mmc: core: ext_csd.raw_* used in comparison but never set
Andres Salomon (1):
mtd: provide an alias for the redboot module name
Andrew Morton (1):
/proc/self/numa_maps: restore "huge" tag for hugetlb vmas
Andy Whitcroft (1):
readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Anton Blanchard (6):
ipr: Always initiate hard reset in kdump kernel
Fix block queue and elevator memory leak in scsi_alloc_sdev powerpc/numa: Remove double of_node_put in hot_add_node_scn_to_nid
powerpc: Fix oops when echoing bad values to /sys/devices/system/memory/probe powerpc/pseries: Avoid spurious error during hotplug CPU add
powerpc: Fix deadlock in icswx code
Antonio Ospite (2):
leds: save the delay values after a successful call to blink_set()
leds: turn the blink_timer off before starting to blink
Axel Lin (9):
ASoC: wm8940: Properly set codec->dapm.bias_level
ASoC: wm8741: Fix setting interface format for DSP modes
ASoC: ak4535: fixup cache register table
ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
ASoC: wm8994: Fix setting rate_reg for wm8994-aif2
ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
ARM: pxa/cm-x300: properly set bt_reset pin
ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt
Bart Van Assche (2):
Make scsi_free_queue() kill pending SCSI commands
ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
Bernd Schubert (1):
nfsd4: Remove check for a 32-bit cookie in nfsd4_readdir()
Bill Pemberton (1):
staging: serqt_usb2: remove ssu100 from supported devices
Bruno Prémont (1):
fb: sh-mobile: Fix deadlock risk between lock_fb_info() and console_lock()
Bryan Schumaker (1):
vfs: add "device" tag to /proc/self/mountstats
Carsten Otte (1):
KVM: s390: check cpu_id prior to using it
Charles Chin (3):
ALSA: hda - Remove bad code for IDT 92HD83 family patch
ALSA: hda - Disable power-widget control for IDT 92HD83/93 as default
ALSA: hda - Add support for 92HD65 / 92HD66 family of codecs
Clemens Ladisch (1):
ALSA: ua101: fix crash when unplugging
Clifton Barnes (3):
drivers/power/ds2780_battery.c: create central point for calling w1 interface drivers/power/ds2780_battery.c: add a nolock function to w1 interface drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Dan Carpenter (1):
PM / Suspend: Off by one in pm_suspend()
Dan McGee (1):
VFS: fix statfs() automounter semantics regression
Dan Williams (6):
isci: fix support for large smp requests
USB: option: convert interface blacklisting to bitfields
USB: option: convert Huawei K3765, K4505, K4605 reservered interface to blacklist
USB: option: add ZTE product 0x0037 to sendsetup blacklist
USB: option: add various ZTE device network interfaces to the blacklist md/raid5: STRIPE_ACTIVE has lock semantics, add barriers
Daniel Mack (1):
mtd: pxa3xx_nand: Fix blank page ECC mismatch
Daniel Vetter (1):
io-mapping: ensure io_mapping_map_atomic _is_ atomic
Darrick J. Wong (2):
ext4: ext4_rename should dirty dir_bh with the correct directory
ext4: ext4_mkdir should dirty dir_block with newly created directory inode
Dave Jones (1):
um: Fix kmalloc argument order in um/vdso/vma.c
David Henningsson (1):
ALSA: HDA: Add new revision for ALC662
David Herrmann (1):
Platform: Fix error path in samsung-laptop init
David Woodhouse (1):
caif: Fix BUG() with network namespaces
Denis Pershin (1):
usb: cdc-acm: Owen SI-30 support
Dmitry Torokhov (1):
WMI: properly cleanup devices to avoid crashes
Eliad Peller (2):
mac80211: fix remain_off_channel regression
mac80211: config hw when going back on-channel
Eric Benoit (1):
USB: pl2303: add id for SMART device
Eric Dumazet (1):
tg3: fix tigon3_dma_hwbug_workaround()
Eric Sandeen (1):
ext4: fix race in xattr block allocation path
Eric W. Biederman (1):
rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
Fabian Godehardt (1):
USB: g_printer: fix bug in unregistration
Felix Fietkau (1):
ath9k: disable unnecessary PHY error reporting
Florian Tobias Schandinat (2):
viafb: use display information in info not in var for panning
viafb: improve pitch handling
Gao feng (1):
ipv6: fix route error binding peer in func icmp6_dst_alloc
Greg Kroah-Hartman (1):
Linux 3.1.1
Guenter Roeck (1):
hwmon: (w83627ehf) Fix broken driver init
Gökçen Eraslan (1):
HID: Add device IDs for Macbook Pro 8 keyboards
Haiyang Zhang (1):
staging: hv: fix a kernel warning in netvsc_linkstatus_callback()
Hakan Kvist (1):
USB: ftdi_sio: add PID for Sony Ericsson Urban
Harro Haan (1):
USB: fix ehci alignment error
Herbert Xu (1):
crypto: cryptd - Use subsys_initcall to prevent races with aesni
Herton Ronaldo Krzesinski (1):
fb: avoid possible deadlock caused by fb_set_suspend
Hong Xu (1):
ASoC: WM8904: Set `invert' bit for Capture Switch
Ian Campbell (1):
genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
J. Bruce Fields (5):
nfsd4: stop using nfserr_resource for transitory errors
nfsd4: fix seqid_mutating_error
nfsd4: permit read opens of executable-only files
nfsd4: fix open downgrade, again
nfsd4: ignore WANT bits in open downgrade
Jack Steiner (1):
x86: uv2: Workaround for UV2 Hub bug (system global address format)
Jack Wang (1):
libsas: set sas_address and device type of rphy
Jan Beulich (1):
apic, i386/bigsmp: Fix false warnings regarding logical APIC ID mismatches
Jason Stubbs (1):
platform: samsung_laptop: fix samsung brightness min/max calculations
Jean Delvare (4):
drm/radeon/kms: Fix I2C mask definitions
carminefb: Fix module parameters permissions
hwmon: (coretemp) Fix for non-SMP builds
hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types
Jeff Brown (1):
HID: hid-multitouch: Add LG Display Multitouch device.
Jeff Layton (2):
nfs: don't redirty inode when ncommit == 0 in nfs_commit_unstable_pages
nfs: don't try to migrate pages with active requests
Jeff Moyer (2):
blk-flush: fix invalid BUG_ON in blk_insert_flush
blk-flush: move the queue kick into
Jeff Skirvin (1):
isci: fix missed unlock in apc_agent_timeout()
Jerome Glisse (2):
drm/radeon: avoid bouncing connector status btw disconnected & unknown drm/radeon: set hpd polarity at init time so hotplug detect works
Jerry Huang (1):
QE/FHCI: fixed the CONTROL bug
Jesse Barnes (1):
drm/i915: use correct SPD type value
Jim Rees (2):
pnfsblock: fix return code confusion
pnfsblock: fix size of upcall message
Jim Wylder (1):
USB: for usb_autopm_get_interface_async -EINPROGRESS is not an error
Jiri Kosina (4):
kmod: prevent kmod_loop_msg overflow in __request_module()
binfmt_elf: fix PIE execution with randomization disabled
HID: add MacBookAir4,2 to hid_have_special_driver[]
HID: consolidate MacbookAir 4,1 mappings
Jiri Slaby (3):
TTY: drop driver reference in tty_open fail path
TTY: make tty_add_file non-failing
TTY: pty, release tty in all ptmx_open fail paths
Joerg Roedel (1):
iommu/amd: Fix wrong shift direction
Joern Engel (2):
target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list
target: Fix wrong se_tmr being added to drain_tmr_list
Johannes Berg (4):
mac80211: fix offchannel TX cookie matching
iwlagn: do not use interruptible waits
netlink: validate NLA_MSECS length
mac80211: disable powersave for broken APs
Johannes Stezenbach (1):
usbmon vs. tcpdump: fix dropped packet count
Jon Levell (1):
USB: add quirk for Logitech C300 web cam
Josh Boyer (2):
PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823 Update email address for stable patch submission
Josh Stone (1):
x86: Fix compilation bug in kprobes' twobyte_is_boostable
Joshua V. Dillon (1):
HID: add support for MacBookAir4,2 keyboard.
Juan Gutierrez (1):
hwspinlock/core: use a mutex to protect the radix tree
Kautuk Consul (2):
staging: quatech_usb2: Potential lost wakeup scenario in TIOCMIWAIT xhci-mem.c: Check for ring->first_seg != NULL
Keith Packard (1):
drm/i915: Wrap DP EDID fetch functions to enable eDP panel power
Konrad Rzeszutek Wilk (3):
xen-pcifront: Update warning comment to use 'e820_host' option.
xen-swiotlb: Fix wrong panic.
xen/blkback: Report VBD_WSECT (wr_sect) properly.
Kuninori Morimoto (1):
ASoC: ak4642: fixup cache register table
Lei Wen (1):
mtd: pxa3xx_nand: fix nand detection issue
Linus Torvalds (1):
hid/apple: modern macbook airs use the standard apple function key translations
Linus Walleij (1):
ARM: mach-ux500: unlock I&D l2x0 caches before init
Luben Tuikov (1):
USB: storage: Use normalized sense when emulating autosense
Luciano Coelho (1):
wl12xx: fix forced passive scans
Luis R. Rodriguez (2):
MAINTANERS: update Qualcomm Atheros addresses
ath9k_htc: add AVM FRITZ!WLAN 11N v2 support
Marcus Folkesson (1):
serial: pxa: work around for errata #20
Mark Brown (4):
ASoC: Remove direct register cache accesses from WM8962 driver
ASoC: Ensure WM8962 PLL registers are reset
ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
Martin Schwidefsky (2):
user per registers vs. ptrace single stepping memory leak with RCU_TABLE_FREE
Masami Hiramatsu (2):
perf probe: Fix to show correct error string ftrace/kprobes: Fix not to delete probes if in use
Matthew Garrett (1):
USB: Fix runtime wakeup on OHCI
Matthias Dellweg (1):
usb/core/devio.c: Check for printer class specific request
Matthieu CASTET (1):
EHCI : introduce a common ehci_setup
Mauro Carvalho Chehab (1):
tuner_xc2028: Allow selection of the frequency adjustment code for XC3028
Mike Miller (2):
cciss: add small delay when using PCI Power Management to reset for kump
hpsa: add small delay when using PCI Power Management to reset for kump
Mike Sterling (1):
Staging: hv: Add support for >2 TB LUN in storage driver.
Milan Broz (1):
kobj_uevent: Ignore if some listeners cannot handle message
Ming Lei (1):
ata_piix: make DVD Drive recognisable on systems with Intel Sandybridge chipsets(v2)
Mitsuo Hayasaka (1):
mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Moger, Babu (1):
scsi_dh: check queuedata pointer before proceeding further
Mohammed Shafi Shajakhan (1):
ath9k_hw: Fix number of GPIO pins for AR9287/9300
NeilBrown (4):
md/raid5: fix bug that could result in reads from a failed device. md/raid10: Fix bug when activating a hot-spare. NFS/sunrpc: don't use a credential with extra groups. md/raid5: abort any pending parity operations when array fails.
Nelson Elhage (1):
epoll: fix spurious lockdep warnings
Nicholas Bellinger (8):
target: Fix transport_cmd_finish_abort queue removal bug
target: Prevent transport_send_task_abort when CHECK_CONDITION status
target: Prevent TRANSPORT_FREE_CMD_INTR processing in core_tmr_drain_cmd_list
target: Fix REPORT TARGET PORT GROUPS handling with small allocation length
target: Re-org of core_tmr_lun_reset
tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB
iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd
iscsi-target: Fix non-immediate TMR handling
Ning Jiang (1):
serial-core: power up uart port early before we do set_termios when resuming
Nobuhiro Iwamatsu (1):
HID: Add support MacbookAir 4,1 keyboard
Oliver Neukum (1):
USB: add RESET_RESUME for webcams shown to be quirky
Olivier Grenie (1):
dib0700: protect the dib0700 buffer access
Patrick Boettcher (1):
DiBcom: protect the I2C bufer access
Paul Fertser (1):
plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
Pavel Shilovsky (2):
CIFS: Fix incorrect max RFC1002 write size value
CIFS: Fix DFS handling in cifs_get_file_info
Peng Tao (7):
pnfsblock: add missing rpc_put_mount and path_put
pnfs: make _set_lo_fail generic
pnfs: recoalesce when ld write pagelist fails
pnfs: recoalesce when ld read pagelist fails
pnfsblock: fix NULL pointer dereference
pnfsblock: fix writeback deadlock SUNRPC/NFS: make rpc pipe upcall generic
Peter Stuge (1):
USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
Peter Wippich (1):
mtd: mtdchar: add missing initializer on raw write
Petr Uzel (1):
st: fix race in st_scsi_execute_end
Rajkumar Manoharan (4):
ath9k_hw: Fix descriptor status of TxOpExceeded
ath9k_hw: Fix magnitude/phase coeff correction
ath9k_hw: Update AR9485 initvals to fix system hang issue
ath9k_hw: Fix regression of register offset for AR9003 chips
Richard Cochran (3):
dp83640: free packet queues on remove
net: hold sock reference while processing tx timestamps
dp83640: use proper function to free transmit time stamping packets
Richard Hartmann (1):
USB: qcserial: Add support for Sierra Wireless MC8355/Gobi 3000
Richard Weinberger (1):
um: fix ubd cow size
Rigbert Hamisch (1):
USB: qcserial: add device ID for "HP un2430 Mobile Broadband Module"
Roland Dreier (1):
target: Prevent cmd->se_queue_node double add
Russell King (1):
ARM: smp: fix clipping of number of CPUs
Sarah Sharp (1):
xhci: If no endpoints changed, don't issue BW command.
Sebastian Ott (1):
ccwgroup: move attributes to attribute group
Serge Hallyn (1):
USB: pid_ns: ensure pid is not freed during kill_pid_info_as_uid
Sergei Kolzun (1):
HID: ACRUX - fix enabling force feedback support
Seth Forshee (1):
usb_storage: Don't freeze in usb-stor-scan
Shubhrajyoti D (1):
OMAP: SPI: Fix the trying to free nonexistent resource error
Smelov Andrey (1):
Platform: samsung_laptop: samsung backlight for R528/R728
Srinivas Kandagatla (1):
kbuild: Fix help text not displayed in choice option.
Stanislaw Gruszka (1):
iwlagn: fix priv->cfg->ht_params NULL pointer dereference
Stefan Beller (1):
platform: samsung_laptop: add dmi information for Samsung R700 laptops
Steven Rostedt (1):
tracing: Fix returning of duplicate data after EOF in trace_pipe_raw
Susan Gao (1):
ASoC: Fix a bug in WM8962 DSP_A and DSP_B settings
THOMSON, Adam (Adam) (1):
mtd: nand_base: always initialise oob_poi before writing OOB data
Takashi Iwai (8):
drm/i915/panel: Always record the backlight level again (but cleverly)
ALSA: hda - Keep EAPD turned on for old Conexant chips
ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
ALSA: hda - Add missing static ADC tables for ALC269 quirks
ALSA: hda/realtek - Don't create alt-stream for capture when unnecessary
ALSA: hda/realtek - Skip invalid digital out pins
ALSA: hda - Fix silent output regression with ALC861
ALSA: hda - Fix a regression for DMA-position check with CA0110
Tejun Heo (1):
block: make gendisk hold a reference to its queue
Thadeu Lima de Souza Cascardo (2):
jsm: remove buggy write queue
powerpc/eeh: Fix /proc/ppc64/eeh creation
Theodore Ts'o (2):
ext2,ext3,ext4: don't inherit APPEND_FL or IMMUTABLE_FL for new inodes
ext4: call ext4_handle_dirty_metadata with correct inode in ext4_dx_add_entry
Thomas Gleixner (1):
net: Unlock sock before calling sk_free()
Tommaso Massimi (1):
Platform: samsung_laptop: add support for X520 machines.
Tony Luck (1):
ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
Trond Myklebust (1):
Revert "NFS: Ensure that writeback_single_inode() calls write_inode() when syncing"
Ulf Hansson (1):
mmc: core: Fix hangs related to insert/remove of cards
Vincent Palatin (1):
usb-storage: fix realtek cr configuration
Yan, Zheng (1):
ipv4: fix ipsec forward performance regression
Yongqiang Yang (1):
ext4: let ext4_page_mkwrite stop started handle in failure
hank (1):
time: Change jiffies_to_clock_t() argument type to unsigned long
[email protected] (1):
mpt2sas: Fix for system hang when discovery in progress
Documentation/hwspinlock.txt +7 -11
@@ -39,23 +39,20 @@ independent, drivers. in case an unused hwspinlock isn't available. Users of this API will usually want to communicate the lock's id to the remote core before it can be used to achieve synchronization. - Can be called from an atomic context (this function will not sleep) but - not from within interrupt context. + Should be called from a process context (might sleep). struct hwspinlock *hwspin_lock_request_specific(unsigned int id); - assign a specific hwspinlock id and return its address, or NULL if that hwspinlock is already in use. Usually board code will be calling this function in order to reserve specific hwspinlock ids for predefined purposes. - Can be called from an atomic context (this function will not sleep) but - not from within interrupt context. + Should be called from a process context (might sleep). int hwspin_lock_free(struct hwspinlock *hwlock); - free a previously-assigned hwspinlock; returns 0 on success, or an appropriate error code on failure (e.g. -EINVAL if the hwspinlock is already free). - Can be called from an atomic context (this function will not sleep) but - not from within interrupt context. + Should be called from a process context (might sleep). int hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int timeout); - lock a previously-assigned hwspinlock with a timeout limit (specified in
@@ -232,15 +229,14 @@ int hwspinlock_example2(void) int hwspin_lock_register(struct hwspinlock *hwlock); - to be called from the underlying platform-specific implementation, in - order to register a new hwspinlock instance. Can be called from an atomic - context (this function will not sleep) but not from within interrupt - context. Returns 0 on success, or appropriate error code on failure. + order to register a new hwspinlock instance. Should be called from + a process context (this function might sleep). + Returns 0 on success, or appropriate error code on failure. struct hwspinlock *hwspin_lock_unregister(unsigned int id); - to be called from the underlying vendor-specific implementation, in order to unregister an existing (and unused) hwspinlock instance. - Can be called from an atomic context (will not sleep) but not from - within interrupt context. + Should be called from a process context (this function might sleep). Returns the address of hwspinlock on success, or NULL on error (e.g. if the hwspinlock is sill in use).
Documentation/power/runtime_pm.txt +10 -0
@@ -782,6 +782,16 @@ will behave normally, not taking the autosuspend delay into account. Similarly, if the power.use_autosuspend field isn't set then the autosuspend helper functions will behave just like the non-autosuspend counterparts. +Under some circumstances a driver or subsystem may want to prevent a device +from autosuspending immediately, even though the usage counter is zero and the +autosuspend delay time has expired. If the ->runtime_suspend() callback +returns -EAGAIN or -EBUSY, and if the next autosuspend delay expiration time is +in the future (as it normally would be if the callback invoked +pm_runtime_mark_last_busy()), the PM core will automatically reschedule the +autosuspend. The ->runtime_suspend() callback can't do this rescheduling +itself because no suspend requests of any kind are accepted while the device is +suspending (i.e., while the callback is running). + The implementation is well suited for asynchronous use in interrupt contexts. However such use inevitably involves races, because the PM core can't synchronize ->runtime_suspend() callbacks with the arrival of I/O requests.
Documentation/stable_kernel_rules.txt +7 -7
@@ -24,10 +24,10 @@ Rules on what kind of patches are accepted, and which ones are not, into the Procedure for submitting patches to the -stable tree: - Send the patch, after verifying that it follows the above rules, to - [email protected]. You must note the upstream commit ID in the changelog - of your submission. + [email protected]. You must note the upstream commit ID in the + changelog of your submission. - To have the patch automatically included in the stable tree, add the tag - Cc: [email protected] + Cc: [email protected] in the sign-off area. Once the patch is merged it will be applied to the stable tree without anything else needing to be done by the author or subsystem maintainer.
@@ -35,10 +35,10 @@ Procedure for submitting patches to the -stable tree: cherry-picked than this can be specified in the following format in the sign-off area: - Cc: <[email protected]> # .32.x: a1f84a3: sched: Check for idle - Cc: <[email protected]> # .32.x: 1b9508f: sched: Rate-limit newidle - Cc: <[email protected]> # .32.x: fd21073: sched: Fix affinity logic - Cc: <[email protected]> # .32.x + Cc: <[email protected]> # .32.x: a1f84a3: sched: Check for idle + Cc: <[email protected]> # .32.x: 1b9508f: sched: Rate-limit newidle + Cc: <[email protected]> # .32.x: fd21073: sched: Fix affinity logic + Cc: <[email protected]> # .32.x Signed-off-by: Ingo Molnar <[email protected]> The tag sequence has the meaning of:
MAINTAINERS +6 -6
@@ -1230,7 +1230,7 @@ F: Documentation/aoe/ F: drivers/block/aoe/ ATHEROS ATH GENERIC UTILITIES -M: "Luis R. Rodriguez" <[email protected]> +M: "Luis R. Rodriguez" <[email protected]> L: [email protected] S: Supported F: drivers/net/wireless/ath/*
@@ -1238,7 +1238,7 @@ F: drivers/net/wireless/ath/* ATHEROS ATH5K WIRELESS DRIVER M: Jiri Slaby <[email protected]> M: Nick Kossifidis <[email protected]> -M: "Luis R. Rodriguez" <[email protected]> +M: "Luis R. Rodriguez" <[email protected]> M: Bob Copeland <[email protected]> L: [email protected] L: [email protected]
@@ -1247,10 +1247,10 @@ S: Maintained F: drivers/net/wireless/ath/ath5k/ ATHEROS ATH9K WIRELESS DRIVER -M: "Luis R. Rodriguez" <[email protected]> -M: Jouni Malinen <[email protected]> -M: Vasanthakumar Thiagarajan <[email protected]> -M: Senthil Balasubramanian <[email protected]> +M: "Luis R. Rodriguez" <[email protected]> +M: Jouni Malinen <[email protected]> +M: Vasanthakumar Thiagarajan <[email protected]> +M: Senthil Balasubramanian <[email protected]> L: [email protected] L: [email protected] W: http://wireless.kernel.org/en/users/Drivers/ath9k
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 1 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = "Divemaster Edition"
arch/arm/mach-exynos4/platsmp.c +4 -6
@@ -193,12 +193,10 @@ void __init smp_init_cpus(void) ncores = scu_base ?scu_get_core_count (scu_base) :1 ;/* sanity check */ -if (ncores >NR_CPUS ) { -printk (KERN_WARNING -"EXYNOS4: no. of cores (%d) greater than configured " -"maximum of %d - clipping\n" , - ncores,NR_CPUS ); - ncores =NR_CPUS ; +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; }for (i =0 ; i < ncores; i++)
arch/arm/mach-msm/platsmp.c +6 -0
@@ -156,6 +156,12 @@ void __init smp_init_cpus(void) {unsigned int i, ncores =get_core_count (); +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; + } +for (i =0 ; i < ncores; i++)set_cpu_possible (i, true);
arch/arm/mach-omap2/omap-smp.c +4 -6
@@ -109,12 +109,10 @@ void __init smp_init_cpus(void) ncores =scu_get_core_count (scu_base);/* sanity check */ -if (ncores >NR_CPUS ) { -printk (KERN_WARNING -"OMAP4: no. of cores (%d) greater than configured " -"maximum of %d - clipping\n" , - ncores,NR_CPUS ); - ncores =NR_CPUS ; +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; }for (i =0 ; i < ncores; i++)
arch/arm/mach-pxa/cm-x300.c +3 -5
@@ -775,7 +775,6 @@ static struct gpio cm_x300_wi2wi_gpios[] __initdata = {static void __init cm_x300_init_wi2wi (void ) { -int bt_reset, wlan_en;int err;if (system_rev <130 ) {
@@ -791,12 +790,11 @@ static void __init cm_x300_init_wi2wi(void) }udelay (10 ); -gpio_set_value (bt_reset,0 ); +gpio_set_value (cm_x300_wi2wi_gpios[1 ].gpio,0 );udelay (10 ); -gpio_set_value (bt_reset,1 ); +gpio_set_value (cm_x300_wi2wi_gpios[1 ].gpio,1 ); -gpio_free (wlan_en); -gpio_free (bt_reset); +gpio_free_array (ARRAY_AND_SIZE (cm_x300_wi2wi_gpios)); }/* MFP */
arch/arm/mach-realview/platsmp.c +4 -6
@@ -52,12 +52,10 @@ void __init smp_init_cpus(void) ncores = scu_base ?scu_get_core_count (scu_base) :1 ;/* sanity check */ -if (ncores >NR_CPUS ) { -printk (KERN_WARNING -"Realview: no. of cores (%d) greater than configured " -"maximum of %d - clipping\n" , - ncores,NR_CPUS ); - ncores =NR_CPUS ; +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; }for (i =0 ; i < ncores; i++)
arch/arm/mach-shmobile/platsmp.c +6 -0
@@ -56,6 +56,12 @@ void __init smp_init_cpus(void)unsigned int ncores =shmobile_smp_get_core_count ();unsigned int i; +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; + } +for (i =0 ; i < ncores; i++)set_cpu_possible (i, true);
arch/arm/mach-tegra/platsmp.c +4 -4
@@ -114,10 +114,10 @@ void __init smp_init_cpus(void) {unsigned int i, ncores =scu_get_core_count (scu_base); -if (ncores >NR_CPUS ) { -printk (KERN_ERR "Tegra: no. of cores (%u) greater than configured (%u), clipping\n" , - ncores,NR_CPUS ); - ncores =NR_CPUS ; +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; }for (i =0 ; i < ncores; i++)
arch/arm/mach-ux500/cpu.c +24 -1
@@ -99,7 +99,27 @@ static void ux500_l2x0_inv_all(void)ux500_cache_sync (); } -static int ux500_l2x0_init (void ) +static int __init ux500_l2x0_unlock (void ) +{ +int i; + +/* +* Unlock Data and Instruction Lock if locked. Ux500 U-Boot versions +* apparently locks both caches before jumping to the kernel. The +* l2x0 core will not touch the unlock registers if the l2x0 is +* already enabled, so we do it right here instead. The PL310 has +* 8 sets of registers, one per possible CPU. +*/ +for (i =0 ; i <8 ; i++) { +writel_relaxed (0x0 , l2x0_base +L2X0_LOCKDOWN_WAY_D_BASE + + i *L2X0_LOCKDOWN_STRIDE ); +writel_relaxed (0x0 , l2x0_base +L2X0_LOCKDOWN_WAY_I_BASE + + i *L2X0_LOCKDOWN_STRIDE ); + } +return 0 ; +} + +static int __init ux500_l2x0_init (void ) {if (cpu_is_u5500 ()) l2x0_base =__io_address (U5500_L2CC_BASE );
@@ -108,6 +128,9 @@ static int ux500_l2x0_init(void)else ux500_unknown_soc (); +/* Unlock before init */ +ux500_l2x0_unlock (); +/* 64KB way size, 8 way associativity, force WA */ l2x0_init (l2x0_base,0x3e060000 ,0xc0000fff );
arch/arm/mach-ux500/platsmp.c +4 -6
@@ -156,12 +156,10 @@ void __init smp_init_cpus(void) ncores = scu_base ?scu_get_core_count (scu_base) :1 ;/* sanity check */ -if (ncores >NR_CPUS ) { -printk (KERN_WARNING -"U8500: no. of cores (%d) greater than configured " -"maximum of %d - clipping\n" , - ncores,NR_CPUS ); - ncores =NR_CPUS ; +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; }for (i =0 ; i < ncores; i++)
arch/arm/mach-vexpress/ct-ca9x4.c +6 -0
@@ -221,6 +221,12 @@ static void ct_ca9x4_init_cpu_map(void) {int i, ncores =scu_get_core_count (MMIO_P2V (A9_MPCORE_SCU )); +if (ncores > nr_cpu_ids) { +pr_warn ("SMP: %u cores greater than maximum (%u), clipping\n" , + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; + } +for (i =0 ; i < ncores; ++i)set_cpu_possible (i, true);
arch/arm/plat-mxc/include/mach/iomux-v3.h +5 -5
@@ -89,11 +89,11 @@ typedef u64 iomux_v3_cfg_t;#define PAD_CTL_HYS (1 << 8)#define PAD_CTL_PKE (1 << 7) -#define PAD_CTL_PUE (1 << 6) -#define PAD_CTL_PUS_100K_DOWN (0 << 4) -#define PAD_CTL_PUS_47K_UP (1 << 4) -#define PAD_CTL_PUS_100K_UP (2 << 4) -#define PAD_CTL_PUS_22K_UP (3 << 4) +#define PAD_CTL_PUE (1 << 6 | PAD_CTL_PKE) +#define PAD_CTL_PUS_100K_DOWN (0 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_47K_UP (1 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_100K_UP (2 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_22K_UP (3 << 4 | PAD_CTL_PUE)#define PAD_CTL_ODE (1 << 3)
arch/powerpc/include/asm/sparsemem.h +1 -1
@@ -16,7 +16,7 @@#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_MEMORY_HOTPLUG -extern void create_section_mapping (unsigned long start,unsigned long end); +extern int create_section_mapping (unsigned long start,unsigned long end);extern int remove_section_mapping (unsigned long start,unsigned long end);#ifdef CONFIG_NUMA extern int hot_add_scn_to_nid (unsigned long scn_addr);
arch/powerpc/mm/gup.c +0 -12
@@ -16,16 +16,6 @@#ifdef __HAVE_ARCH_PTE_SPECIAL -static inline void get_huge_page_tail (struct page *page) -{ -/* -* __split_huge_page_refcount() cannot run -* from under us. -*/ -VM_BUG_ON (atomic_read (&page->_count) <0 ); -atomic_inc (&page->_count); -} -/* * The performance critical leaf functions are made noinline otherwise gcc * inlines everything into a single function which results in too much
@@ -57,8 +47,6 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,put_page (page);return 0 ; } -if (PageTail (page)) -get_huge_page_tail (page); pages[*nr] = page; (*nr)++;
arch/powerpc/mm/hash_utils_64.c +3 -3
@@ -534,11 +534,11 @@ static unsigned long __init htab_get_table_size(void) }#ifdef CONFIG_MEMORY_HOTPLUG -void create_section_mapping (unsigned long start,unsigned long end) +int create_section_mapping (unsigned long start,unsigned long end) { -BUG_ON (htab_bolt_mapping (start, end,__pa (start), +return htab_bolt_mapping (start, end,__pa (start),pgprot_val (PAGE_KERNEL ), mmu_linear_psize, - mmu_kernel_ssize)); + mmu_kernel_ssize); }int remove_section_mapping (unsigned long start,unsigned long end)
arch/powerpc/mm/hugetlbpage.c +16 -5
@@ -390,7 +390,7 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add {unsigned long mask;unsigned long pte_end; -struct page *head, *page; +struct page *head, *page, *tail;pte_t pte;int refs;
@@ -413,6 +413,7 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add head =pte_page (pte); page = head + ((addr & (sz-1 )) >>PAGE_SHIFT ); + tail = page; do { VM_BUG_ON(compound_head(page) != head); pages[*nr] = page;
@@ -428,10 +429,20 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addif (unlikely (pte_val (pte) !=pte_val (*ptep))) {/* Could be optimized better */ -while (*nr) { -put_page (page); - (*nr)--; - } + *nr -= refs; +while (refs--) +put_page (head); +return 0 ; + } + +/* +* Any tail page need their mapcount reference taken before we +* return. +*/ +while (refs--) { +if (PageTail (tail)) +get_huge_page_tail (tail); + tail++; }return 1 ;
arch/powerpc/mm/mem.c +2 -1
@@ -123,7 +123,8 @@ int arch_add_memory(int nid, u64 start, u64 size) pgdata =NODE_DATA (nid); start = (unsigned long )__va (start); -create_section_mapping (start, start + size); +if (create_section_mapping (start, start + size)) +return -EINVAL ;/* this should work for most non-highmem platforms */ zone = pgdata->node_zones;
arch/powerpc/mm/mmu_context_hash64.c +6 -6
@@ -136,8 +136,8 @@ int use_cop(unsigned long acop, struct mm_struct *mm)if (!mm || !acop)return -EINVAL ; -/* We need to make sure mm_users doesn't change */ -down_read (&mm->mmap_sem); +/* The page_table_lock ensures mm_users won't change under us */ +spin_lock (&mm->page_table_lock);spin_lock (mm->context.cop_lockp);if (mm->context.cop_pid ==COP_PID_NONE ) {
@@ -164,7 +164,7 @@ int use_cop(unsigned long acop, struct mm_struct *mm) out:spin_unlock (mm->context.cop_lockp); -up_read (&mm->mmap_sem); +spin_unlock (&mm->page_table_lock);return ret; }
@@ -185,8 +185,8 @@ void drop_cop(unsigned long acop, struct mm_struct *mm)if (WARN_ON_ONCE (!mm))return ; -/* We need to make sure mm_users doesn't change */ -down_read (&mm->mmap_sem); +/* The page_table_lock ensures mm_users won't change under us */ +spin_lock (&mm->page_table_lock);spin_lock (mm->context.cop_lockp); mm->context.acop &= ~acop;
@@ -213,7 +213,7 @@ void drop_cop(unsigned long acop, struct mm_struct *mm) }spin_unlock (mm->context.cop_lockp); -up_read (&mm->mmap_sem); +spin_unlock (&mm->page_table_lock); }EXPORT_SYMBOL_GPL (drop_cop);
arch/powerpc/mm/numa.c +2 -1
@@ -1214,11 +1214,12 @@ int hot_add_node_scn_to_nid(unsigned long scn_addr)break ; } -of_node_put (memory);if (nid >=0 )break ; } +of_node_put (memory); +return nid; }
arch/powerpc/platforms/pseries/dlpar.c +4 -0
@@ -112,6 +112,7 @@ void dlpar_free_cc_nodes(struct device_node *dn)dlpar_free_one_cc_node (dn); } +#define COMPLETE 0#define NEXT_SIBLING 1#define NEXT_CHILD 2#define NEXT_PROPERTY 3
@@ -158,6 +159,9 @@ struct device_node *dlpar_configure_connector(u32 drc_index)spin_unlock (&rtas_data_buf_lock);switch (rc) { +case COMPLETE : +break ; +case NEXT_SIBLING : dn =dlpar_parse_cc_node (ccwa);if (!dn)
arch/powerpc/platforms/pseries/eeh.c +1 -1
@@ -1338,7 +1338,7 @@ static const struct file_operations proc_eeh_operations = {static int __init eeh_init_proc (void ) {if (machine_is (pseries)) -proc_create ("ppc64/eeh" ,0 ,NULL , &proc_eeh_operations); +proc_create ("powerpc/eeh" ,0 ,NULL , &proc_eeh_operations);return 0 ; }__initcall (eeh_init_proc);
arch/s390/kernel/ptrace.c +15 -13
@@ -47,29 +47,31 @@ enum s390_regset {void update_per_regs (struct task_struct *task) { -static const struct per_regs per_single_step = { - .control =PER_EVENT_IFETCH , - .start =0 , - .end =PSW_ADDR_INSN , - };struct pt_regs *regs =task_pt_regs (task);struct thread_struct *thread = &task->thread; -const struct per_regs *new; -struct per_regs old; +struct per_regs old, new; -/* TIF_SINGLE_STEP overrides the user specified PER registers. */ - new =test_tsk_thread_flag (task,TIF_SINGLE_STEP ) ? - &per_single_step : &thread->per_user; +/* Copy user specified PER registers */ + new.control = thread->per_user.control; + new.start = thread->per_user.start; + new.end = thread->per_user.end; + +/* merge TIF_SINGLE_STEP into user specified PER registers. */ +if (test_tsk_thread_flag (task,TIF_SINGLE_STEP )) { + new.control |=PER_EVENT_IFETCH ; + new.start =0 ; + new.end =PSW_ADDR_INSN ; + }/* Take care of the PER enablement bit in the PSW. */ -if (!(new->control &PER_EVENT_MASK )) { +if (!(new.control &PER_EVENT_MASK )) { regs->psw.mask &= ~PSW_MASK_PER ;return ; } regs->psw.mask |=PSW_MASK_PER ;__ctl_store (old,9 ,11 ); -if (memcmp (new, &old,sizeof (struct per_regs )) !=0 ) -__ctl_load (*new,9 ,11 ); +if (memcmp (&new, &old,sizeof (struct per_regs )) !=0 ) +__ctl_load (new,9 ,11 ); }void user_enable_single_step (struct task_struct *task)
arch/s390/kvm/kvm-s390.c +10 -4
@@ -312,11 +312,17 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) { -struct kvm_vcpu *vcpu =kzalloc (sizeof (struct kvm_vcpu ),GFP_KERNEL ); -int rc = -ENOMEM ; +struct kvm_vcpu *vcpu; +int rc = -EINVAL ; + +if (id >=KVM_MAX_VCPUS ) + goto out; + + rc = -ENOMEM ; + vcpu =kzalloc (sizeof (struct kvm_vcpu ),GFP_KERNEL );if (!vcpu) - goto out_nomem; + goto out; vcpu->arch.sie_block = (struct kvm_s390_sie_block *)get_zeroed_page (GFP_KERNEL );
@@ -352,7 +358,7 @@ out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); out_free_cpu:kfree (vcpu); -out_nomem: +out:return ERR_PTR (rc); }
arch/s390/mm/gup.c +13 -1
@@ -52,7 +52,7 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, unsigned long end, int write, struct page **pages, int *nr) { unsigned long mask, result; -struct page *head, *page; +struct page *head, *page, *tail;int refs; result = write ?0 : _SEGMENT_ENTRY_RO;
@@ -64,6 +64,7 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, refs =0 ; head =pmd_page (pmd); page = head + ((addr & ~PMD_MASK ) >>PAGE_SHIFT ); + tail = page; do { VM_BUG_ON(compound_head(page) != head); pages[*nr] = page;
@@ -81,6 +82,17 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, *nr -= refs;while (refs--)put_page (head); +return 0 ; + } + +/* +* Any tail page need their mapcount reference taken before we +* return. +*/ +while (refs--) { +if (PageTail (tail)) +get_huge_page_tail (tail); + tail++; }return 1 ;
arch/s390/mm/pgtable.c +3 -2
@@ -662,8 +662,9 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table)void __tlb_remove_table (void *_table) { -void *table = (void *)((unsigned long ) _table &PAGE_MASK ); -unsigned type = (unsigned long ) _table & ~PAGE_MASK ; +const unsigned long mask = (FRAG_MASK <<4 ) |FRAG_MASK ; +void *table = (void *)((unsigned long ) _table & ~mask); +unsigned type = (unsigned long ) _table & mask;if (type)__page_table_free_rcu (table, type);
arch/sparc/mm/gup.c +2 -0
@@ -56,6 +56,8 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,put_page (head);return 0 ; } +if (head != page) +get_huge_page_tail (page); pages[*nr] = page; (*nr)++;
arch/um/drivers/ubd_kern.c +30 -1
@@ -513,8 +513,37 @@ __uml_exitcall(kill_io_thread);static inline int ubd_file_size (struct ubd *ubd_dev,__u64 *size_out) {char *file; +int fd; +int err; + +__u32 version; +__u32 align; +char *backing_file; +time_t mtime; +unsigned long long size; +int sector_size; +int bitmap_offset; + +if (ubd_dev->file && ubd_dev->cow.file) { + file = ubd_dev->cow.file; + + goto out; + } - file = ubd_dev->cow.file ? ubd_dev->cow.file : ubd_dev->file; + fd =os_open_file (ubd_dev->file, global_openflags,0 ); +if (fd <0 ) +return fd; + + err =read_cow_header (file_reader, &fd, &version, &backing_file, \ + &mtime, &size, §or_size, &align, &bitmap_offset); +os_close_file (fd); + +if (err == -EINVAL ) + file = ubd_dev->file; +else + file = backing_file; + +out:return os_file_size (file, size_out); }
arch/um/sys-x86_64/vdso/vma.c +1 -1
@@ -28,7 +28,7 @@ static int __init init_vdso(void) um_vdso_addr = task_size -PAGE_SIZE ; - vdsop =kmalloc (GFP_KERNEL ,sizeof (struct page *)); + vdsop =kmalloc (sizeof (struct page *),GFP_KERNEL );if (!vdsop) goto oom;
arch/x86/include/asm/apic.h +1 -1
@@ -495,7 +495,7 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)return ; } -extern struct apic *generic_bigsmp_probe (void ); +extern void generic_bigsmp_probe (void );#ifdef CONFIG_X86_LOCAL_APIC
arch/x86/include/asm/uv/uv_bau.h +1 -0
@@ -55,6 +55,7 @@#define UV_BAU_TUNABLES_DIR "sgi_uv"#define UV_BAU_TUNABLES_FILE "bau_tunables"#define WHITESPACE " \t\n" +#define uv_mmask ((1UL << uv_hub_info->m_val) - 1)#define uv_physnodeaddr (x) ((__pa((unsigned long)(x)) & uv_mmask))#define cpubit_isset (cpu, bau_local_cpumask) \ test_bit((cpu), (bau_local_cpumask).bits)
arch/x86/include/asm/uv/uv_hub.h +34 -3
@@ -46,6 +46,13 @@* PNODE - the low N bits of the GNODE. The PNODE is the most useful variant * of the nasid for socket usage. * +* GPA - (global physical address) a socket physical address converted +* so that it can be used by the GRU as a global address. Socket +* physical addresses 1) need additional NASID (node) bits added +* to the high end of the address, and 2) unaliased if the +* partition does not have a physical address 0. In addition, on +* UV2 rev 1, GPAs need the gnode left shifted to bits 39 or 40. +* * * NumaLink Global Physical Address Format: * +--------------------------------+---------------------+
@@ -141,6 +148,8 @@ struct uv_hub_info_s {unsigned int gnode_extra;unsigned char hub_revision;unsigned char apic_pnode_shift; +unsigned char m_shift; +unsigned char n_lshift;unsigned long gnode_upper;unsigned long lowmem_remap_top;unsigned long lowmem_remap_base;
@@ -177,6 +186,16 @@ static inline int is_uv2_hub(void)return uv_hub_info->hub_revision >=UV2_HUB_REVISION_BASE ; } +static inline int is_uv2_1_hub (void ) +{ +return uv_hub_info->hub_revision ==UV2_HUB_REVISION_BASE ; +} + +static inline int is_uv2_2_hub (void ) +{ +return uv_hub_info->hub_revision ==UV2_HUB_REVISION_BASE +1 ; +} + union uvh_apicid { unsigned long v; struct uvh_apicid_s {
@@ -276,7 +295,10 @@ static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr) {if (paddr < uv_hub_info->lowmem_remap_top) paddr |= uv_hub_info->lowmem_remap_base; -return paddr | uv_hub_info->gnode_upper; + paddr |= uv_hub_info->gnode_upper; + paddr = ((paddr << uv_hub_info->m_shift) >> uv_hub_info->m_shift) | + ((paddr >> uv_hub_info->m_val) << uv_hub_info->n_lshift); +return paddr; }
@@ -300,16 +322,19 @@ static inline unsigned long uv_gpa_to_soc_phys_ram(unsigned long gpa)unsigned long remap_base = uv_hub_info->lowmem_remap_base;unsigned long remap_top = uv_hub_info->lowmem_remap_top; + gpa = ((gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift) | + ((gpa >> uv_hub_info->n_lshift) << uv_hub_info->m_val); + gpa = gpa & uv_hub_info->gpa_mask;if (paddr >= remap_base && paddr < remap_base + remap_top) paddr -= remap_base;return paddr; } -/* gnode -> pnode */ +/* gpa -> pnode */ static inline unsigned long uv_gpa_to_gnode (unsigned long gpa) { -return gpa >> uv_hub_info->m_val; +return gpa >> uv_hub_info->n_lshift; }/* gpa -> pnode */
@@ -320,6 +345,12 @@ static inline int uv_gpa_to_pnode(unsigned long gpa)return uv_gpa_to_gnode (gpa) & n_mask; } +/* gpa -> node offset*/ +static inline unsigned long uv_gpa_to_offset (unsigned long gpa) +{ +return (gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift; +} +/* pnode, offset --> socket virtual */ static inline void *uv_pnode_offset_to_vaddr (int pnode,unsigned long offset) {
arch/x86/kernel/apic/bigsmp_32.c +16 -4
@@ -255,12 +255,24 @@ static struct apic apic_bigsmp = { .x86_32_early_logical_apicid = bigsmp_early_logical_apicid, }; -struct apic *__init generic_bigsmp_probe (void ) +void __init generic_bigsmp_probe (void ) { -if (probe_bigsmp ()) -return &apic_bigsmp; +unsigned int cpu; -return NULL ; +if (!probe_bigsmp ()) +return ; + + apic = &apic_bigsmp; + +for_each_possible_cpu (cpu) { +if (early_per_cpu (x86_cpu_to_logical_apicid, + cpu) ==BAD_APICID ) +continue ; +early_per_cpu (x86_cpu_to_logical_apicid, cpu) = +bigsmp_early_logical_apicid (cpu); + } + +pr_info ("Overriding APIC driver with %s\n" , apic_bigsmp.name); }apic_driver (apic_bigsmp);
arch/x86/kernel/apic/probe_32.c +2 -8
@@ -200,14 +200,8 @@ void __init default_setup_apic_routing(void)* - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support */ -if (!cmdline_apic && apic == &apic_default) { -struct apic *bigsmp =generic_bigsmp_probe (); -if (bigsmp) { - apic = bigsmp; -printk (KERN_INFO "Overriding APIC driver with %s\n" , - apic->name); - } - } +if (!cmdline_apic && apic == &apic_default) +generic_bigsmp_probe ();#endif if (apic->setup_apic_routing)
arch/x86/kernel/apic/x2apic_uv_x.c +5 -2
@@ -832,6 +832,10 @@ void __init uv_system_init(void)uv_cpu_hub_info (cpu)->apic_pnode_shift = uvh_apicid.s.pnode_shift;uv_cpu_hub_info (cpu)->hub_revision = uv_hub_info->hub_revision; +uv_cpu_hub_info (cpu)->m_shift =64 - m_val; +uv_cpu_hub_info (cpu)->n_lshift =is_uv2_1_hub () ? + (m_val ==40 ?40 :39 ) : m_val; + pnode =uv_apicid_to_pnode (apicid); blade =boot_pnode_to_blade (pnode); lcpu = uv_blade_info[blade].nr_possible_cpus;
@@ -862,8 +866,7 @@ void __init uv_system_init(void)if (uv_node_to_blade[nid] >=0 )continue ; paddr =node_start_pfn (nid) <<PAGE_SHIFT ; - paddr =uv_soc_phys_ram_to_gpa (paddr); - pnode = (paddr >> m_val) & pnode_mask; + pnode =uv_gpa_to_pnode (uv_soc_phys_ram_to_gpa (paddr)); blade =boot_pnode_to_blade (pnode); uv_node_to_blade[nid] = blade; }
arch/x86/kernel/kprobes.c +3 -1
@@ -75,8 +75,10 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);/* * Undefined/reserved opcodes, conditional jump, Opcode Extension * Groups, and some special opcodes can not boost. +* This is non-const to keep gcc from statically optimizing it out, as +* variable_test_bit makes gcc think only *(unsigned long*) is used. */ -static const u32 twobyte_is_boostable[256 /32 ] = { +static u32 twobyte_is_boostable[256 /32 ] = {/* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ /* ---------------------------------------------- */ W(0x00, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0) | /* 00 */
arch/x86/mm/gup.c +0 -10
@@ -108,16 +108,6 @@ static inline void get_head_page_multiple(struct page *page, int nr)SetPageReferenced (page); } -static inline void get_huge_page_tail (struct page *page) -{ -/* -* __split_huge_page_refcount() cannot run -* from under us. -*/ -VM_BUG_ON (atomic_read (&page->_count) <0 ); -atomic_inc (&page->_count); -} - static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr,unsigned long end,int write,struct page **pages,int *nr) {
arch/x86/platform/uv/tlb_uv.c +6 -11
@@ -115,9 +115,6 @@ early_param("nobau", setup_nobau);/* base pnode in this partition */ static int uv_base_pnode__read_mostly ; -/* position of pnode (which is nasid>>1): */ -static int uv_nshift__read_mostly ; -static unsigned long uv_mmask__read_mostly ; static DEFINE_PER_CPU(struct ptc_stats, ptcstats); static DEFINE_PER_CPU(struct bau_control, bau_control);
@@ -1435,7 +1432,7 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode) {int i;int cpu; -unsigned long pa; +unsigned long gpa;unsigned long m;unsigned long n;size_t dsize;
@@ -1451,9 +1448,9 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode) bau_desc =kmalloc_node (dsize,GFP_KERNEL , node);BUG_ON (!bau_desc); - pa =uv_gpa (bau_desc);/* need the real nasid*/ - n = pa >> uv_nshift; - m = pa & uv_mmask; + gpa =uv_gpa (bau_desc); + n =uv_gpa_to_gnode (gpa); + m =uv_gpa_to_offset (gpa);/* the 14-bit pnode */ write_mmr_descriptor_base (pnode, (n <<UV_DESC_PSHIFT | m));
@@ -1525,9 +1522,9 @@ static void pq_init(int node, int pnode) bcp->queue_last = pqp + (DEST_Q_SIZE -1 ); }/* -* need the pnode of where the memory was really allocated +* need the gnode of where the memory was really allocated */ - pn =uv_gpa (pqp) >> uv_nshift; + pn =uv_gpa_to_gnode (uv_gpa (pqp)); first =uv_physnodeaddr (pqp); pn_first = ((unsigned long )pn <<UV_PAYLOADQ_PNODE_SHIFT ) | first; last =uv_physnodeaddr (pqp + (DEST_Q_SIZE -1 ));
@@ -1837,8 +1834,6 @@ static int __init uv_bau_init(void)zalloc_cpumask_var_node (mask,GFP_KERNEL ,cpu_to_node (cur_cpu)); } - uv_nshift = uv_hub_info->m_val; - uv_mmask = (1UL << uv_hub_info->m_val) -1 ; nuvhubs =uv_num_possible_blades ();spin_lock_init (&disable_lock); congested_cycles =usec_2_cycles (congested_respns_us);
block/blk-core.c +2 -0
@@ -1725,6 +1725,8 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq) where =ELEVATOR_INSERT_FLUSH ;add_acct_request (q, rq, where); +if (where ==ELEVATOR_INSERT_FLUSH ) +__blk_run_queue (q);spin_unlock_irqrestore (q->queue_lock, flags);return 0 ;
block/blk-flush.c +1 -2
@@ -320,7 +320,7 @@ void blk_insert_flush(struct request *rq)return ; } -BUG_ON (!rq->bio || rq->bio != rq->biotail); +BUG_ON (rq->bio != rq->biotail);/*assumes zero or single bio rq */ /* * If there's data but flush is not necessary, the request can be
@@ -330,7 +330,6 @@ void blk_insert_flush(struct request *rq)if ((policy &REQ_FSEQ_DATA ) && !(policy & (REQ_FSEQ_PREFLUSH |REQ_FSEQ_POSTFLUSH ))) {list_add_tail (&rq->queuelist, &q->queue_head); -blk_run_queue_async (q);return ; }
block/genhd.c +8 -0
@@ -611,6 +611,12 @@ void add_disk(struct gendisk *disk)register_disk (disk);blk_register_queue (disk); +/* +* Take an extra ref on queue which will be put on disk_release() +* so that it sticks around as long as @disk is there. +*/ +WARN_ON_ONCE (blk_get_queue (disk->queue)); + retval =sysfs_create_link (&disk_to_dev (disk)->kobj, &bdi->dev->kobj,"bdi" );WARN_ON (retval);
@@ -1095,6 +1101,8 @@ static void disk_release(struct device *dev)disk_replace_part_tbl (disk,NULL );free_part_stats (&disk->part0);free_part_info (&disk->part0); +if (disk->queue) +blk_put_queue (disk->queue);kfree (disk); }struct class block_class = {
crypto/cryptd.c +1 -1
@@ -945,7 +945,7 @@ static void __exit cryptd_exit(void)crypto_unregister_template (&cryptd_tmpl); } -module_init (cryptd_init); +subsys_initcall (cryptd_init);module_exit (cryptd_exit);MODULE_LICENSE ("GPL" );
drivers/acpi/atomicio.c +1 -1
@@ -76,7 +76,7 @@ static void __iomem *__acpi_ioremap_fast(phys_addr_t paddr, {struct acpi_iomap *map; - map =__acpi_find_iomap (paddr, size); + map =__acpi_find_iomap (paddr, size/8 );if (map)return map->vaddr + (paddr - map->paddr);else
drivers/ata/ata_piix.c +32 -5
@@ -113,6 +113,8 @@ enum {PIIX_PATA_FLAGS =ATA_FLAG_SLAVE_POSS ,PIIX_SATA_FLAGS =ATA_FLAG_SATA |PIIX_FLAG_CHECKINTR , +PIIX_FLAG_PIO16 = (1 <<30 ),/*support 16bit PIO only*/ +PIIX_80C_PRI = (1 <<5 ) | (1 <<4 ), PIIX_80C_SEC = (1 << 7) | (1 << 6),
@@ -147,6 +149,7 @@ enum piix_controller_ids { ich8m_apple_sata,/* locks up on second port enable */ tolapai_sata, piix_pata_vmw,/* PIIX4 for VMware, spurious DMA_ERR */ + ich8_sata_snb, }; struct piix_map_db {
@@ -177,6 +180,7 @@ static int piix_sidpr_scr_write(struct ata_link *link,static int piix_sidpr_set_lpm (struct ata_link *link,enum ata_lpm_policy policy,unsigned hints);static bool piix_irq_check (struct ata_port *ap); +static int piix_port_start (struct ata_port *ap);#ifdef CONFIG_PM static int piix_pci_device_suspend (struct pci_dev *pdev,pm_message_t mesg);static int piix_pci_device_resume (struct pci_dev *pdev);
@@ -298,21 +302,21 @@ static const struct pci_device_id piix_pci_tbl[] = {/* SATA Controller IDE (PCH) */ { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },/* SATA Controller IDE (CPT) */ - { 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, + { 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },/* SATA Controller IDE (CPT) */ - { 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, + { 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },/* SATA Controller IDE (CPT) */ { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (CPT) */ { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (PBG) */ - { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, + { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },/* SATA Controller IDE (PBG) */ { 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (Panther Point) */ - { 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, + { 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },/* SATA Controller IDE (Panther Point) */ - { 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, + { 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },/* SATA Controller IDE (Panther Point) */ { 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (Panther Point) */
@@ -338,6 +342,7 @@ static struct scsi_host_template piix_sht = {static struct ata_port_operations piix_sata_ops = { .inherits = &ata_bmdma32_port_ops, .sff_irq_check = piix_irq_check, + .port_start = piix_port_start, };static struct ata_port_operations piix_pata_ops = {
@@ -478,6 +483,7 @@ static const struct piix_map_db *piix_map_db_table[] = { [ich8_2port_sata] = &ich8_2port_map_db, [ich8m_apple_sata] = &ich8m_apple_map_db, [tolapai_sata] = &tolapai_map_db, + [ich8_sata_snb] = &ich8_map_db, };static struct ata_port_info piix_port_info[] = {
@@ -606,6 +612,19 @@ static struct ata_port_info piix_port_info[] = { .port_ops = &piix_vmw_ops, }, +/* +* some Sandybridge chipsets have broken 32 mode up to now, +* see https://bugzilla.kernel.org/show_bug.cgi?id=40592 +*/ + [ich8_sata_snb] = + { + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR | PIIX_FLAG_PIO16, + .pio_mask = ATA_PIO4, + .mwdma_mask = ATA_MWDMA2, + .udma_mask = ATA_UDMA6, + .port_ops = &piix_sata_ops, + }, + };static struct pci_bits piix_enable_bits[] = {
@@ -649,6 +668,14 @@ static const struct ich_laptop ich_laptop[] = { { 0, } }; +static int piix_port_start (struct ata_port *ap) +{ +if (!(ap->flags &PIIX_FLAG_PIO16 )) + ap->pflags |=ATA_PFLAG_PIO32 |ATA_PFLAG_PIO32CHANGE ; + +return ata_bmdma_port_start (ap); +} +/** * ich_pata_cable_detect - Probe host controller cable detect info * @ap: Port for which cable detect info is desired
drivers/base/power/runtime.c +16 -2
@@ -285,6 +285,9 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev)* If a deferred resume was requested while the callback was running then carry * it out; otherwise send an idle notification for the device (if the suspend * failed) or for its parent (if the suspend succeeded). +* If ->runtime_suspend failed with -EAGAIN or -EBUSY, and if the RPM_AUTO +* flag is set and the next autosuspend-delay expiration time is in the +* future, schedule another autosuspend attempt. * * This function must be called under dev->power.lock with interrupts disabled. */
@@ -396,10 +399,21 @@ static int rpm_suspend(struct device *dev, int rpmflags)if (retval) {__update_runtime_status (dev,RPM_ACTIVE ); dev->power.deferred_resume = false; -if (retval == -EAGAIN || retval == -EBUSY ) +if (retval == -EAGAIN || retval == -EBUSY ) { dev->power.runtime_error =0 ; -else + +/* +* If the callback routine failed an autosuspend, and +* if the last_busy time has been updated so that there +* is a new autosuspend expiration time, automatically +* reschedule another autosuspend. +*/ +if ((rpmflags &RPM_AUTO ) && +pm_runtime_autosuspend_expiration (dev) !=0 ) + goto repeat; + }else {pm_runtime_cancel_pending (dev); + } }else { no_callback:__update_runtime_status (dev,RPM_SUSPENDED );
drivers/block/cciss.c +7 -0
@@ -4533,6 +4533,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev, pmcsr &= ~PCI_PM_CTRL_STATE_MASK ; pmcsr |=PCI_D0 ;pci_write_config_word (pdev, pos +PCI_PM_CTRL , pmcsr); + +/* +* The P600 requires a small delay when changing states. +* Otherwise we may think the board did not reset and we bail. +* This for kdump only and is particular to the P600. +*/ +msleep (500 ); }return 0 ; }
drivers/block/xen-blkback/blkback.c +1 -1
@@ -685,7 +685,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,if (operation ==READ ) blkif->st_rd_sect += preq.nr_sects; -else if (operation ==WRITE || operation ==WRITE_FLUSH ) +else if (operation &WRITE ) blkif->st_wr_sect += preq.nr_sects;return 0 ;
drivers/gpu/drm/i915/intel_dp.c +28 -3
@@ -1683,6 +1683,31 @@ g4x_dp_detect(struct intel_dp *intel_dp)return intel_dp_detect_dpcd (intel_dp); } +static struct edid * +intel_dp_get_edid (struct drm_connector *connector,struct i2c_adapter *adapter) +{ +struct intel_dp *intel_dp =intel_attached_dp (connector); +struct edid *edid; + +ironlake_edp_panel_vdd_on (intel_dp); + edid =drm_get_edid (connector, adapter); +ironlake_edp_panel_vdd_off (intel_dp); +return edid; +} + +static int +intel_dp_get_edid_modes (struct drm_connector *connector,struct i2c_adapter *adapter) +{ +struct intel_dp *intel_dp =intel_attached_dp (connector); +int ret; + +ironlake_edp_panel_vdd_on (intel_dp); + ret =intel_ddc_get_modes (connector, adapter); +ironlake_edp_panel_vdd_off (intel_dp); +return ret; +} + +/** * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect DP connection. *
@@ -1715,7 +1740,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (intel_dp->force_audio) { intel_dp->has_audio = intel_dp->force_audio >0 ; }else { - edid =drm_get_edid (connector, &intel_dp->adapter); + edid =intel_dp_get_edid (connector, &intel_dp->adapter);if (edid) { intel_dp->has_audio =drm_detect_monitor_audio (edid); connector->display_info.raw_edid =NULL ;
@@ -1736,7 +1761,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)/* We should parse the EDID data and find out if it has an audio sink */ - ret =intel_ddc_get_modes (connector, &intel_dp->adapter); + ret =intel_dp_get_edid_modes (connector, &intel_dp->adapter);if (ret) {if (is_edp (intel_dp) && !dev_priv->panel_fixed_mode) {struct drm_display_mode *newmode;
@@ -1772,7 +1797,7 @@ intel_dp_detect_audio(struct drm_connector *connector)struct edid *edid;bool has_audio = false; - edid =drm_get_edid (connector, &intel_dp->adapter); + edid =intel_dp_get_edid (connector, &intel_dp->adapter);if (edid) { has_audio =drm_detect_monitor_audio (edid);
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -184,7 +184,7 @@ struct intel_crtc {#define DIP_VERSION_AVI 0x2#define DIP_LEN_AVI 13 -#define DIP_TYPE_SPD 0x3 +#define DIP_TYPE_SPD 0x83#define DIP_VERSION_SPD 0x1#define DIP_LEN_SPD 25#define DIP_SPD_UNKNOWN 0
drivers/gpu/drm/i915/intel_panel.c +13 -8
@@ -226,7 +226,7 @@ static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)I915_WRITE (BLC_PWM_CPU_CTL , val | level); } -void intel_panel_set_backlight (struct drm_device *dev,u32 level) +static void intel_panel_actually_set_backlight (struct drm_device *dev,u32 level) {struct drm_i915_private *dev_priv = dev->dev_private;u32 tmp;
@@ -254,16 +254,21 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level)I915_WRITE (BLC_PWM_CTL , tmp | level); } -void intel_panel_disable_backlight (struct drm_device *dev) +void intel_panel_set_backlight (struct drm_device *dev,u32 level) {struct drm_i915_private *dev_priv = dev->dev_private; -if (dev_priv->backlight_enabled) { - dev_priv->backlight_level =intel_panel_get_backlight (dev); - dev_priv->backlight_enabled = false; - } + dev_priv->backlight_level = level; +if (dev_priv->backlight_enabled) +intel_panel_actually_set_backlight (dev, level); +} + +void intel_panel_disable_backlight (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; -intel_panel_set_backlight (dev,0 ); + dev_priv->backlight_enabled = false; +intel_panel_actually_set_backlight (dev,0 ); }void intel_panel_enable_backlight (struct drm_device *dev)
@@ -273,8 +278,8 @@ void intel_panel_enable_backlight(struct drm_device *dev)if (dev_priv->backlight_level ==0 ) dev_priv->backlight_level =intel_panel_get_max_backlight (dev); -intel_panel_set_backlight (dev, dev_priv->backlight_level); dev_priv->backlight_enabled = true; +intel_panel_actually_set_backlight (dev, dev_priv->backlight_level); }static void intel_panel_init_backlight (struct drm_device *dev)
drivers/gpu/drm/radeon/atombios_dp.c +11 -0
@@ -553,6 +553,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, {struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private; +struct radeon_connector *radeon_connector =to_radeon_connector (connector);int panel_mode =DP_PANEL_MODE_EXTERNAL_DP_MODE ;if (!ASIC_IS_DCE4 (rdev))
@@ -560,10 +561,20 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,if (radeon_connector_encoder_is_dp_bridge (connector)) panel_mode =DP_PANEL_MODE_INTERNAL_DP1_MODE ; +else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +u8 tmp =radeon_read_dpcd_reg (radeon_connector,DP_EDP_CONFIGURATION_CAP ); +if (tmp &1 ) + panel_mode =DP_PANEL_MODE_INTERNAL_DP2_MODE ; + }atombios_dig_encoder_setup (encoder,ATOM_ENCODER_CMD_SETUP_PANEL_MODE , panel_mode); + +if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) && + (panel_mode ==DP_PANEL_MODE_INTERNAL_DP2_MODE )) { +radeon_write_dpcd_reg (radeon_connector,DP_EDP_CONFIGURATION_SET ,1 ); + } } void radeon_dp_set_link_config(struct drm_connector *connector,
drivers/gpu/drm/radeon/evergreen.c +1 -0
@@ -353,6 +353,7 @@ void evergreen_hpd_init(struct radeon_device *rdev)default :break ; } +radeon_hpd_set_polarity (rdev, radeon_connector->hpd.hpd); }if (rdev->irq.installed)evergreen_irq_set (rdev);
drivers/gpu/drm/radeon/r100.c +1 -0
@@ -434,6 +434,7 @@ void r100_hpd_init(struct radeon_device *rdev)default :break ; } +radeon_hpd_set_polarity (rdev, radeon_connector->hpd.hpd); }if (rdev->irq.installed)r100_irq_set (rdev);
drivers/gpu/drm/radeon/r600.c +9 -10
@@ -762,13 +762,14 @@ void r600_hpd_init(struct radeon_device *rdev)struct drm_device *dev = rdev->ddev;struct drm_connector *connector; -if (ASIC_IS_DCE3 (rdev)) { -u32 tmp =DC_HPDx_CONNECTION_TIMER (0x9c4 ) |DC_HPDx_RX_INT_TIMER (0xfa ); -if (ASIC_IS_DCE32 (rdev)) - tmp |= DC_HPDx_EN; +list_for_each_entry (connector, &dev->mode_config.connector_list, head) { +struct radeon_connector *radeon_connector =to_radeon_connector (connector); + +if (ASIC_IS_DCE3 (rdev)) { +u32 tmp =DC_HPDx_CONNECTION_TIMER (0x9c4 ) |DC_HPDx_RX_INT_TIMER (0xfa ); +if (ASIC_IS_DCE32 (rdev)) + tmp |= DC_HPDx_EN; -list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -struct radeon_connector *radeon_connector =to_radeon_connector (connector);switch (radeon_connector->hpd.hpd) {case RADEON_HPD_1 :WREG32 (DC_HPD1_CONTROL , tmp);
@@ -798,10 +799,7 @@ void r600_hpd_init(struct radeon_device *rdev)default :break ; } - } - }else { -list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -struct radeon_connector *radeon_connector =to_radeon_connector (connector); + }else {switch (radeon_connector->hpd.hpd) {case RADEON_HPD_1 :WREG32 (DC_HOT_PLUG_DETECT1_CONTROL , DC_HOT_PLUG_DETECTx_EN);
@@ -819,6 +817,7 @@ void r600_hpd_init(struct radeon_device *rdev)break ; } } +radeon_hpd_set_polarity (rdev, radeon_connector->hpd.hpd); }if (rdev->irq.installed)r600_irq_set (rdev);
drivers/gpu/drm/radeon/radeon.h +1 -0
@@ -93,6 +93,7 @@ extern int radeon_audio;extern int radeon_disp_priority;extern int radeon_hw_i2c;extern int radeon_pcie_gen2; +extern int radeon_msi;/* * Copy from radeon_drv.h so we don't have to include both and have conflicting
drivers/gpu/drm/radeon/radeon_combios.c +2 -2
@@ -620,8 +620,8 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde i2c.y_data_mask =0x80 ; }else {/* default masks for ddc pads */ - i2c.mask_clk_mask =RADEON_GPIO_EN_1 ; - i2c.mask_data_mask =RADEON_GPIO_EN_0 ; + i2c.mask_clk_mask =RADEON_GPIO_MASK_1 ; + i2c.mask_data_mask =RADEON_GPIO_MASK_0 ; i2c.a_clk_mask =RADEON_GPIO_A_1 ; i2c.a_data_mask =RADEON_GPIO_A_0 ; i2c.en_clk_mask =RADEON_GPIO_EN_1 ;
drivers/gpu/drm/radeon/radeon_connectors.c +26 -3
@@ -724,6 +724,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force) dret =radeon_ddc_probe (radeon_connector, radeon_connector->requires_extended_probe);if (dret) { + radeon_connector->detected_by_load = false;if (radeon_connector->edid) {kfree (radeon_connector->edid); radeon_connector->edid =NULL ;
@@ -750,12 +751,21 @@ radeon_vga_detect(struct drm_connector *connector, bool force) }else {/* if we aren't forcing don't do destructive polling */ -if (!force) -return connector->status; +if (!force) { +/* only return the previous status if we last +* detected a monitor via load. +*/ +if (radeon_connector->detected_by_load) +return connector->status; +else +return ret; + }if (radeon_connector->dac_load_detect && encoder) { encoder_funcs = encoder->helper_private; ret = encoder_funcs->detect (encoder, connector); +if (ret != connector_status_disconnected) + radeon_connector->detected_by_load = true; } }
@@ -897,6 +907,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) dret =radeon_ddc_probe (radeon_connector, radeon_connector->requires_extended_probe);if (dret) { + radeon_connector->detected_by_load = false;if (radeon_connector->edid) {kfree (radeon_connector->edid); radeon_connector->edid =NULL ;
@@ -959,8 +970,18 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)if ((ret == connector_status_connected) && (radeon_connector->use_digital == true)) goto out; +/* DVI-D and HDMI-A are digital only */ +if ((connector->connector_type ==DRM_MODE_CONNECTOR_DVID ) || + (connector->connector_type ==DRM_MODE_CONNECTOR_HDMIA )) + goto out; + +/* if we aren't forcing don't do destructive polling */ if (!force) { - ret = connector->status; +/* only return the previous status if we last +* detected a monitor via load. +*/ +if (radeon_connector->detected_by_load) + ret = connector->status; goto out; }
@@ -985,6 +1006,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)if (ret == connector_status_connected) { radeon_connector->use_digital = false; } +if (ret != connector_status_disconnected) + radeon_connector->detected_by_load = true; }break ; }
drivers/gpu/drm/radeon/radeon_drv.c +4 -0
@@ -118,6 +118,7 @@ int radeon_audio = 0;int radeon_disp_priority =0 ;int radeon_hw_i2c =0 ;int radeon_pcie_gen2 =0 ; +int radeon_msi =-1 ;MODULE_PARM_DESC (no_wb,"Disable AGP writeback for scratch registers" );module_param_named (no_wb, radeon_no_wb, int,0444 );
@@ -164,6 +165,9 @@ module_param_named(hw_i2c, radeon_hw_i2c, int, 0444);MODULE_PARM_DESC (pcie_gen2,"PCIE Gen2 mode (1 = enable)" );module_param_named (pcie_gen2, radeon_pcie_gen2, int,0444 ); +MODULE_PARM_DESC (msi,"MSI support (1 = enable, 0 = disable, -1 = auto)" ); +module_param_named (msi, radeon_msi, int,0444 ); +static int radeon_suspend (struct drm_device *dev,pm_message_t state) {drm_radeon_private_t *dev_priv = dev->dev_private;
drivers/gpu/drm/radeon/radeon_irq_kms.c +42 -6
60 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +1 -0
@@ -447,6 +447,7 @@ struct radeon_connector {struct edid *edid;void *con_priv;bool dac_load_detect; +bool detected_by_load;/* if the connection status was determined by load */ uint16_t connector_object_id;struct radeon_hpd hpd;struct radeon_router router;
drivers/gpu/drm/radeon/rs600.c +1 -0
@@ -287,6 +287,7 @@ void rs600_hpd_init(struct radeon_device *rdev)default :break ; } +radeon_hpd_set_polarity (rdev, radeon_connector->hpd.hpd); }if (rdev->irq.installed)rs600_irq_set (rdev);
drivers/hid/Kconfig +2 -1
@@ -69,7 +69,7 @@ config HID_ACRUX Say Y here if you want to enable support for ACRUX game controllers. config HID_ACRUX_FF - tristate "ACRUX force feedback support" + bool "ACRUX force feedback support" depends on HID_ACRUX select INPUT_FF_MEMLESS ---help---
@@ -328,6 +328,7 @@ config HID_MULTITOUCH - Hanvon dual touch panels - Ilitek dual touch panels - IrTouch Infrared USB panels + - LG Display panels (Dell ST2220Tc) - Lumio CrystalTouch panels - MosArt dual-touch panels - PenMount dual touch panels
drivers/hid/hid-apple.c +21 -0
@@ -455,6 +455,9 @@ static const struct hid_device_id apple_devices[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), .driver_data =APPLE_NUMLOCK_EMULATION |APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO), + .driver_data =APPLE_NUMLOCK_EMULATION |APPLE_HAS_FN | + APPLE_ISO_KEYBOARD }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
@@ -493,6 +496,24 @@ static const struct hid_device_id apple_devices[] = { .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI), + .driver_data = APPLE_HAS_FN }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO), + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS), + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI), + .driver_data = APPLE_HAS_FN }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO), + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS), + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI), + .driver_data = APPLE_HAS_FN }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO), + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
drivers/hid/hid-core.c +14 -0
@@ -1340,12 +1340,22 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
@@ -1399,6 +1409,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
@@ -1892,6 +1903,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { }
drivers/hid/hid-ids.h +13 -0
@@ -109,12 +109,22 @@#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 +#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI 0x0249 +#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO 0x024a +#define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS 0x024b +#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI 0x024c +#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO 0x024d +#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS 0x024e#define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI 0x024f#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO 0x0250#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS 0x0251 +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b +#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
@@ -423,6 +433,9 @@#define USB_DEVICE_ID_LD_HYBRID 0x2090#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 +#define USB_VENDOR_ID_LG 0x1fd2 +#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064 +#define USB_VENDOR_ID_LOGITECH 0x046d#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110
drivers/hid/hid-multitouch.c +5 -0
@@ -672,6 +672,11 @@ static const struct hid_device_id mt_devices[] = { HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, +/* LG Display panels */ + { .driver_data = MT_CLS_DEFAULT, +HID_USB_DEVICE (USB_VENDOR_ID_LG , + USB_DEVICE_ID_LG_MULTITOUCH) }, + /* Lumio panels */ { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,
drivers/hwmon/coretemp.c +1 -2
@@ -60,14 +60,13 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius");#ifdef CONFIG_SMP #define TO_PHYS_ID (cpu) cpu_data(cpu).phys_proc_id#define TO_CORE_ID (cpu) cpu_data(cpu).cpu_core_id -#define TO_ATTR_NO (cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)#define for_each_sibling (i, cpu) for_each_cpu(i, cpu_sibling_mask(cpu))#else #define TO_PHYS_ID (cpu) (cpu)#define TO_CORE_ID (cpu) (cpu) -#define TO_ATTR_NO (cpu) (cpu)#define for_each_sibling (i, cpu) for (i = 0; false; )#endif +#define TO_ATTR_NO (cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO)/* * Per-Core Temperature Data
drivers/hwmon/w83627ehf.c +11 -1
@@ -1756,7 +1756,17 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data, diode =0x70 ; }for (i =0 ; i <3 ; i++) { -if ((tmp & (0x02 << i))) +const char *label =NULL ; + +if (data->temp_label) + label = data->temp_label[data->temp_src[i]]; + +/* Digital source overrides analog type */ +if (label &&strncmp (label,"PECI" ,4 ) ==0 ) + data->temp_type[i] =6 ; +else if (label &&strncmp (label,"AMD" ,3 ) ==0 ) + data->temp_type[i] =5 ; +else if ((tmp & (0x02 << i))) data->temp_type[i] = (diode & (0x10 << i)) ?1 :3 ;else data->temp_type[i] =4 ;/* thermistor */
drivers/hwspinlock/hwspinlock_core.c +20 -25
149 lines not on this page · raw message
drivers/iommu/amd_iommu.c +1 -1
@@ -1283,7 +1283,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom,if (!pte || !IOMMU_PTE_PRESENT (*pte))continue ; -dma_ops_reserve_addresses (dma_dom, i <<PAGE_SHIFT ,1 ); +dma_ops_reserve_addresses (dma_dom, i >>PAGE_SHIFT ,1 ); }update_domain (&dma_dom->domain);
drivers/leds/led-class.c +6 -1
@@ -267,9 +267,14 @@ void led_blink_set(struct led_classdev *led_cdev,unsigned long *delay_on, unsigned long *delay_off) { + del_timer_sync(&led_cdev->blink_timer); +if (led_cdev->blink_set && - !led_cdev->blink_set (led_cdev, delay_on, delay_off)) + !led_cdev->blink_set (led_cdev, delay_on, delay_off)) { + led_cdev->blink_delay_on = *delay_on; + led_cdev->blink_delay_off = *delay_off;return ; + }/* blink with 1 Hz as default if nothing specified */ if (!*delay_on && !*delay_off)
drivers/md/raid10.c +1 -1
@@ -1337,7 +1337,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)mirror_info_t *p = &conf->mirrors[mirror];if (p->recovery_disabled == mddev->recovery_disabled)continue ; -if (!p->rdev) +if (p->rdev)continue ; disk_stack_limits(mddev->gendisk, rdev->bdev,
drivers/md/raid5.c +11 -7
@@ -3069,7 +3069,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) } }else if (test_bit (In_sync, &rdev->flags))set_bit (R5_Insync, &dev->flags); -else { +else if (!test_bit (Faulty, &rdev->flags)) {/* in sync if before recovery_offset */ if (sh->sector +STRIPE_SECTORS <= rdev->recovery_offset)set_bit (R5_Insync, &dev->flags);
@@ -3116,7 +3116,7 @@ static void handle_stripe(struct stripe_head *sh)struct r5dev *pdev, *qdev;clear_bit (STRIPE_HANDLE , &sh->state); -if (test_and_set_bit (STRIPE_ACTIVE , &sh->state)) { +if (test_and_set_bit_lock (STRIPE_ACTIVE , &sh->state)) {/* already being handled, ensure it gets handled * again when current action finishes */ set_bit (STRIPE_HANDLE , &sh->state);
@@ -3165,10 +3165,14 @@ static void handle_stripe(struct stripe_head *sh)/* check if the array has lost more than max_degraded devices and, * if so, some requests might need to be failed. */ -if (s.failed > conf->max_degraded && s.to_read+s.to_write+s.written) -handle_failed_stripe (conf, sh, &s, disks, &s.return_bi); -if (s.failed > conf->max_degraded && s.syncing) -handle_failed_sync (conf, sh, &s); +if (s.failed > conf->max_degraded) { + sh->check_state =0 ; + sh->reconstruct_state =0 ; +if (s.to_read+s.to_write+s.written) +handle_failed_stripe (conf, sh, &s, disks, &s.return_bi); +if (s.syncing) +handle_failed_sync (conf, sh, &s); + }/* * might be able to return some write requests if the parity blocks
@@ -3377,7 +3381,7 @@ finish:return_io (s.return_bi); -clear_bit (STRIPE_ACTIVE , &sh->state); +clear_bit_unlock (STRIPE_ACTIVE , &sh->state); }static void raid5_activate_delayed (raid5_conf_t *conf)
drivers/media/dvb/dvb-usb/dib0700_core.c +72 -9
205 lines not on this page · raw message
drivers/media/dvb/frontends/dib0070.c +30 -7
@@ -27,6 +27,7 @@#include <linux/kernel.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/mutex.h> #include "dvb_frontend.h"
@@ -78,10 +79,18 @@ struct dib0070_state {struct i2c_msg msg[2 ];u8 i2c_write_buffer[3 ];u8 i2c_read_buffer[2 ]; +struct mutex i2c_buffer_lock; }; -static uint16_t dib0070_read_reg (struct dib0070_state *state,u8 reg) +static u16 dib0070_read_reg (struct dib0070_state *state,u8 reg) { +u16 ret; + +if (mutex_lock_interruptible (&state->i2c_buffer_lock) <0 ) { +dprintk ("could not acquire lock" ); +return 0 ; + } + state->i2c_write_buffer[0 ] = reg;memset (state->msg,0 ,2 *sizeof (struct i2c_msg ));
@@ -96,13 +105,23 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)if (i2c_transfer (state->i2c, state->msg,2 ) !=2 ) {printk (KERN_WARNING "DiB0070 I2C read failed\n" ); -return 0 ; - } -return (state->i2c_read_buffer[0 ] <<8 ) | state->i2c_read_buffer[1 ]; + ret =0 ; + }else + ret = (state->i2c_read_buffer[0 ] <<8 ) + | state->i2c_read_buffer[1 ]; + +mutex_unlock (&state->i2c_buffer_lock); +return ret; }static int dib0070_write_reg (struct dib0070_state *state,u8 reg,u16 val) { +int ret; + +if (mutex_lock_interruptible (&state->i2c_buffer_lock) <0 ) { +dprintk ("could not acquire lock" ); +return -EINVAL ; + } state->i2c_write_buffer[0 ] = reg; state->i2c_write_buffer[1 ] = val >>8 ; state->i2c_write_buffer[2 ] = val &0xff ;
@@ -115,9 +134,12 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)if (i2c_transfer (state->i2c, state->msg,1 ) !=1 ) {printk (KERN_WARNING "DiB0070 I2C write failed\n" ); -return -EREMOTEIO ; - } -return 0 ; + ret = -EREMOTEIO ; + }else + ret =0 ; + +mutex_unlock (&state->i2c_buffer_lock); +return ret; }#define HARD_RESET (state) do { \
@@ -734,6 +756,7 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter state->cfg = cfg; state->i2c = i2c; state->fe = fe; +mutex_init (&state->i2c_buffer_lock); fe->tuner_priv = state;if (dib0070_reset (fe) !=0 )
drivers/media/dvb/frontends/dib0090.c +58 -12
141 lines not on this page · raw message
drivers/media/dvb/frontends/dib7000m.c +25 -2
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/mutex.h> #include "dvb_frontend.h"
@@ -55,6 +56,7 @@ struct dib7000m_state {struct i2c_msg msg[2 ];u8 i2c_write_buffer[4 ];u8 i2c_read_buffer[2 ]; +struct mutex i2c_buffer_lock; };enum dib7000m_power_mode {
@@ -69,6 +71,13 @@ enum dib7000m_power_mode {static u16 dib7000m_read_word (struct dib7000m_state *state,u16 reg) { +u16 ret; + +if (mutex_lock_interruptible (&state->i2c_buffer_lock) <0 ) { +dprintk ("could not acquire lock" ); +return 0 ; + } + state->i2c_write_buffer[0 ] = (reg >>8 ) |0x80 ; state->i2c_write_buffer[1 ] = reg &0xff ;
@@ -85,11 +94,21 @@ static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg)if (i2c_transfer (state->i2c_adap, state->msg,2 ) !=2 )dprintk ("i2c read error on %d" ,reg); -return (state->i2c_read_buffer[0 ] <<8 ) | state->i2c_read_buffer[1 ]; + ret = (state->i2c_read_buffer[0 ] <<8 ) | state->i2c_read_buffer[1 ]; +mutex_unlock (&state->i2c_buffer_lock); + +return ret; }static int dib7000m_write_word (struct dib7000m_state *state,u16 reg,u16 val) { +int ret; + +if (mutex_lock_interruptible (&state->i2c_buffer_lock) <0 ) { +dprintk ("could not acquire lock" ); +return -EINVAL ; + } + state->i2c_write_buffer[0 ] = (reg >>8 ) &0xff ; state->i2c_write_buffer[1 ] = reg &0xff ; state->i2c_write_buffer[2 ] = (val >>8 ) &0xff ;
@@ -101,7 +120,10 @@ static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val) state->msg[0 ].buf = state->i2c_write_buffer; state->msg[0 ].len =4 ; -return i2c_transfer (state->i2c_adap, state->msg,1 ) !=1 ? -EREMOTEIO :0 ; + ret = (i2c_transfer (state->i2c_adap, state->msg,1 ) !=1 ? + -EREMOTEIO :0 ); +mutex_unlock (&state->i2c_buffer_lock); +return ret; }static void dib7000m_write_tab (struct dib7000m_state *state,u16 *buf) {
@@ -1385,6 +1407,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, demod = &st->demod; demod->demodulator_priv = st;memcpy (&st->demod.ops, &dib7000m_ops,sizeof (struct dvb_frontend_ops )); +mutex_init (&st->i2c_buffer_lock); st->timf_default = cfg->bw->timf;
drivers/media/dvb/frontends/dib7000p.c +28 -4
@@ -10,6 +10,7 @@#include <linux/kernel.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/mutex.h> #include "dvb_math.h" #include "dvb_frontend.h"
@@ -68,6 +69,7 @@ struct dib7000p_state {struct i2c_msg msg[2 ];u8 i2c_write_buffer[4 ];u8 i2c_read_buffer[2 ]; +struct mutex i2c_buffer_lock; };enum dib7000p_power_mode {
@@ -81,6 +83,13 @@ static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);static u16 dib7000p_read_word (struct dib7000p_state *state,u16 reg) { +u16 ret; + +if (mutex_lock_interruptible (&state->i2c_buffer_lock) <0 ) { +dprintk ("could not acquire lock" ); +return 0 ; + } + state->i2c_write_buffer[0 ] = reg >>8 ; state->i2c_write_buffer[1 ] = reg &0xff ;
@@ -97,11 +106,20 @@ static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)if (i2c_transfer (state->i2c_adap, state->msg,2 ) !=2 )dprintk ("i2c read error on %d" , reg); -return (state->i2c_read_buffer[0 ] <<8 ) | state->i2c_read_buffer[1 ]; + ret = (state->i2c_read_buffer[0 ] <<8 ) | state->i2c_read_buffer[1 ]; +mutex_unlock (&state->i2c_buffer_lock); +return ret; }static int dib7000p_write_word (struct dib7000p_state *state,u16 reg,u16 val) { +int ret; + +if (mutex_lock_interruptible (&state->i2c_buffer_lock) <0 ) { +dprintk ("could not acquire lock" ); +return -EINVAL ; + } + state->i2c_write_buffer[0 ] = (reg >>8 ) &0xff ; state->i2c_write_buffer[1 ] = reg &0xff ; state->i2c_write_buffer[2 ] = (val >>8 ) &0xff ;
@@ -113,7 +131,10 @@ static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val) state->msg[0 ].buf = state->i2c_write_buffer; state->msg[0 ].len =4 ; -return i2c_transfer (state->i2c_adap, state->msg,1 ) !=1 ? -EREMOTEIO :0 ; + ret = (i2c_transfer (state->i2c_adap, state->msg,1 ) !=1 ? + -EREMOTEIO :0 ); +mutex_unlock (&state->i2c_buffer_lock); +return ret; }static void dib7000p_write_tab (struct dib7000p_state *state,u16 * buf)
@@ -1646,6 +1667,7 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defaureturn -ENOMEM ; dpst->i2c_adap = i2c; +mutex_init (&dpst->i2c_buffer_lock);for (k = no_of_demods -1 ; k >=0 ; k--) { dpst->cfg = cfg[k];
@@ -2324,6 +2346,7 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, demod = &st->demod; demod->demodulator_priv = st;memcpy (&st->demod.ops, &dib7000p_ops,sizeof (struct dvb_frontend_ops )); +mutex_init (&st->i2c_buffer_lock);dib7000p_write_word (st,1287 ,0x0003 );/* sram lead in, rdy */
@@ -2333,8 +2356,9 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, st->version =dib7000p_read_word (st,897 );/* FIXME: make sure the dev.parent field is initialized, or else -request_firmware() will hit an OOPS (this should be moved somewhere -more common) */ +request_firmware() will hit an OOPS (this should be moved somewhere +more common) */ + st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent;/* FIXME: make sure the dev.parent field is initialized, or else request_firmware() will hit an OOPS (this should be moved somewhere
drivers/media/dvb/frontends/dib8000.c +61 -11
161 lines not on this page · raw message
drivers/media/dvb/frontends/dib9000.c +145 -19
334 lines not on this page · raw message
drivers/media/dvb/frontends/dibx000_common.c +64 -12
103 lines not on this page · raw message
drivers/media/dvb/frontends/dibx000_common.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/media/video/cx23885/cx23885-dvb.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/ar9003_calib.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/ar9003_mac.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/ar9003_phy.h +6 -6
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/ar9485_initvals.h +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/hif_usb.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +2 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-core.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/ds2780_battery.c +51 -35
86 lines not on this page · raw message
drivers/s390/cio/ccwgroup.c +22 -20
42 lines not on this page · raw message
drivers/scsi/isci/request.c +20 -29
49 lines not on this page · raw message
drivers/scsi/megaraid/megaraid_sas_base.c +1 -2
Lines of this file are not shown. View the raw message.
drivers/staging/quatech_usb2/quatech_usb2.c +7 -2
Lines of this file are not shown. View the raw message.
drivers/staging/serqt_usb2/serqt_usb2.c +0 -3
Lines of this file are not shown. View the raw message.
drivers/target/target_core_tmr.c +136 -73
209 lines not on this page · raw message
drivers/target/target_core_transport.c +27 -18
45 lines not on this page · raw message
drivers/tty/serial/jsm/jsm_tty.c +13 -81
94 lines not on this page · raw message
drivers/tty/tty_io.c +36 -12
48 lines not on this page · raw message
drivers/usb/host/xhci-mem.c +30 -24
54 lines not on this page · raw message
drivers/usb/host/xhci-ring.c +35 -28
63 lines not on this page · raw message
drivers/usb/serial/option.c +108 -62
170 lines not on this page · raw message
drivers/video/sh_mobile_hdmi.c +26 -21
47 lines not on this page · raw message
drivers/w1/slaves/w1_ds2780.c +35 -13
48 lines not on this page · raw message
fs/nfs/blocklayout/blocklayout.c +31 -27
58 lines not on this page · raw message
fs/nfs/pnfs.c +26 -26
52 lines not on this page · raw message
fs/nfs/write.c +41 -27
68 lines not on this page · raw message
include/linux/mm.h +33 -34
67 lines not on this page · raw message
kernel/irq/pm.c +41 -7
48 lines not on this page · raw message
kernel/trace/trace_kprobe.c +49 -9
58 lines not on this page · raw message
mm/internal.h +46 -0
46 lines not on this page · raw message
mm/swap.c +53 -30
83 lines not on this page · raw message
mm/vmalloc.c +48 -17
65 lines not on this page · raw message
sound/pci/hda/patch_conexant.c +50 -23
73 lines not on this page · raw message
sound/pci/hda/patch_sigmatel.c +18 -38
56 lines not on this page · raw message
sound/soc/codecs/wm8962.c +32 -21
53 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.