Linux 2.6.33.6
Subsystems (70)
I'm announcing the release of the 2.6.33.6 kernel.
All users of the 2.6.33 kernel series should upgrade.
There will only be one more .33-stable release after this one. Everyone using the .33 series should be looking into moving to the .34 kernel tree at this point in time. Yeah, I said that for the last .33 release, but this time I really mean it :)
The updated 2.6.33.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.33.y.git;a=summarythanks,
greg k-h
------------
Documentation/hwmon/ltc4245 | 4 Makefile | 2 arch/arm/common/sa1111.c | 9 arch/arm/mm/copypage-feroceon.c | 4 arch/arm/mm/copypage-v4wb.c | 4 arch/arm/mm/copypage-v4wt.c | 4 arch/arm/mm/copypage-xsc3.c | 4 arch/arm/mm/fault.c | 3 arch/arm/mm/init.c | 6 arch/arm/vfp/vfphw.S | 2 arch/blackfin/include/asm/cache.h | 2 arch/frv/include/asm/cache.h | 2 arch/m68k/include/asm/cache.h | 2 arch/mn10300/include/asm/cache.h | 2 arch/parisc/math-emu/decode_exc.c | 1 arch/powerpc/kvm/book3s.c | 10 + arch/powerpc/kvm/booke.c | 15 + arch/powerpc/kvm/powerpc.c | 3 arch/powerpc/lib/string.S | 4 arch/powerpc/oprofile/op_model_cell.c | 2 arch/powerpc/platforms/pseries/hotplug-cpu.c | 30 --- arch/powerpc/platforms/pseries/plpar_wrappers.h | 8 arch/powerpc/platforms/pseries/smp.c | 28 ++ arch/s390/kvm/kvm-s390.c | 4 arch/x86/include/asm/kvm_host.h | 3 arch/x86/include/asm/msr-index.h | 5 arch/x86/kernel/amd_iommu.c | 16 - arch/x86/kernel/amd_iommu_init.c | 20 +- arch/x86/kernel/cpu/perf_event.c | 5 arch/x86/kernel/pvclock.c | 24 ++ arch/x86/kernel/setup.c | 11 + arch/x86/kernel/tboot.c | 1 arch/x86/kvm/mmu.c | 12 + arch/x86/kvm/svm.c | 164 +++++++++++------ arch/x86/kvm/vmx.c | 37 ++- arch/x86/kvm/x86.c | 58 +++--- arch/x86/oprofile/nmi_int.c | 10 - arch/x86/xen/suspend.c | 4 arch/xtensa/include/asm/cache.h | 1 block/cfq-iosched.c | 20 +- drivers/acpi/video_detect.c | 2 drivers/ata/libata-core.c | 7 drivers/ata/libata-sff.c | 2 drivers/ata/sata_nv.c | 5 drivers/ata/sata_via.c | 13 + drivers/base/cpu.c | 2 drivers/char/ipmi/ipmi_si_intf.c | 11 - drivers/clocksource/sh_cmt.c | 21 +- drivers/clocksource/sh_tmu.c | 20 +- drivers/firewire/core-card.c | 24 ++ drivers/gpu/drm/drm_edid.c | 2 drivers/gpu/drm/i915/i915_drv.c | 5 drivers/gpu/drm/i915/i915_drv.h | 3 drivers/gpu/drm/i915/i915_gem.c | 19 ++ drivers/gpu/drm/radeon/radeon_atombios.c | 7 drivers/gpu/drm/radeon/radeon_cp.c | 1 drivers/gpu/drm/radeon/radeon_drv.h | 2 drivers/gpu/drm/radeon/radeon_state.c | 7 drivers/hid/hid-core.c | 1 drivers/hid/hid-gyration.c | 1 drivers/hid/hid-ids.h | 1 drivers/hwmon/ltc4245.c | 18 - drivers/input/mouse/psmouse-base.c | 14 + drivers/md/linear.c | 1 drivers/md/md.c | 99 +++++++++- drivers/md/md.h | 1 drivers/md/raid1.c | 9 drivers/md/raid10.c | 2 drivers/md/raid5.c | 7 drivers/media/video/gspca/stv06xx/stv06xx.c | 2 drivers/net/arcnet/com20020-pci.c | 4 drivers/net/can/sja1000/sja1000.c | 20 +- drivers/net/can/sja1000/sja1000.h | 1 drivers/net/mlx4/icm.c | 3 drivers/net/pppol2tp.c | 3 drivers/net/wireless/ath/ar9170/hw.h | 1 drivers/net/wireless/ath/ar9170/main.c | 2 drivers/net/wireless/ath/ar9170/usb.c | 10 + drivers/net/wireless/ath/ath5k/base.c | 11 - drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 10 - drivers/net/wireless/iwlwifi/iwl-agn.c | 8 drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 drivers/net/wireless/p54/p54usb.c | 1 drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 drivers/net/wireless/wl12xx/wl1251_sdio.c | 1 drivers/oprofile/cpu_buffer.c | 63 +----- drivers/pci/quirks.c | 14 + drivers/platform/x86/eeepc-laptop.c | 18 + drivers/rtc/rtc-cmos.c | 5 drivers/rtc/rtc-s3c.c | 5 drivers/scsi/qla2xxx/qla_isr.c | 28 +- drivers/staging/comedi/drivers/ni_mio_cs.c | 2 drivers/staging/rt2860/usb_main_dev.c | 1 drivers/staging/rtl8192su/r8192U_core.c | 1 drivers/staging/vt6655/device_main.c | 2 drivers/usb/class/cdc-acm.c | 6 drivers/usb/gadget/fsl_udc_core.c | 2 drivers/usb/host/ehci-hub.c | 17 + drivers/usb/host/fhci.h | 9 drivers/usb/host/xhci-hcd.c | 54 ++++- drivers/usb/host/xhci-pci.c | 2 drivers/usb/host/xhci-ring.c | 37 +++ drivers/usb/serial/cp210x.c | 11 + drivers/usb/serial/ftdi_sio.c | 4 drivers/usb/serial/ir-usb.c | 2 drivers/usb/serial/kl5kusb105.c | 1 drivers/usb/serial/kobil_sct.c | 3 drivers/usb/serial/mos7840.c | 1 drivers/usb/serial/option.c | 226 ++++++++++++++++++++++++ drivers/usb/serial/visor.c | 1 drivers/usb/storage/unusual_devs.h | 15 + drivers/xen/xenbus/xenbus_xs.c | 2 fs/btrfs/acl.c | 3 fs/cifs/cifsproto.h | 6 fs/cifs/dir.c | 20 +- fs/cifs/file.c | 11 - fs/exofs/dir.c | 2 fs/ext4/move_extent.c | 3 fs/ext4/resize.c | 3 fs/fs-writeback.c | 14 + fs/gfs2/file.c | 7 fs/libfs.c | 3 fs/namespace.c | 9 fs/nfsd/nfssvc.c | 2 include/linux/fs.h | 4 include/linux/pci_ids.h | 1 include/linux/swap.h | 10 - include/linux/tboot.h | 1 include/net/sctp/structs.h | 1 include/trace/events/signal.h | 3 kernel/compat.c | 25 +- kernel/mutex.c | 7 kernel/perf_event.c | 45 ++-- kernel/posix-timers.c | 11 - kernel/signal.c | 6 kernel/trace/trace.c | 136 ++++++++++---- mm/filemap.c | 10 - net/mac80211/Kconfig | 9 net/mac80211/cfg.c | 7 net/mac80211/rx.c | 3 net/mac80211/tx.c | 5 net/sctp/sm_make_chunk.c | 62 ++++++ net/wireless/core.h | 2 net/wireless/nl80211.c | 37 --- net/wireless/util.c | 33 +++ net/wireless/wext-compat.c | 5 scripts/kconfig/Makefile | 2 security/keys/keyring.c | 18 - security/keys/process_keys.c | 6 sound/pci/hda/hda_intel.c | 9 sound/pci/hda/patch_realtek.c | 1 sound/pci/hda/patch_sigmatel.c | 2 sound/soc/codecs/wm8350.c | 4 sound/soc/codecs/wm8400.c | 18 - sound/soc/codecs/wm8990.c | 18 - 155 files changed, 1492 insertions(+), 562 deletions(-)
Adam Jackson (2):
drm/i915: Fix 82854 PCI ID, and treat it like other 85X drm/edid: Fix 1024x768@85Hz
Al Viro (1):
Fix racy use of anon_inode_getfd() in perf_event.c
Alan Jenkins (1):
eeepc-laptop: check wireless hotplug events
Alek Du (1):
USB: EHCI: clear PHCD before resuming
Alex Deucher (3):
PCI quirks: disable msi on AMD rs4xx internal gfx bridges drm/radeon/kms: reset ddc_bus in object header parsing drm/radeon/kms/atom: fix typo in LVDS panel info parsing
Andi Kleen (1):
oprofile: remove double ring buffering
Andiry Xu (1):
USB: xHCI: Fix wrong usage of macro TRB_TYPE
Andreas Bombe (1):
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
Andres Salomon (1):
mac80211: give warning if building w/out rate ctrl algorithm
Andrey Vagin (1):
posix_timer: Fix error path in timer_create
Anfei (1):
ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6
Anton Vorontsov (1):
USB: FHCI: cq_get() should check kfifo_out()'s return value
Aurelien Jarno (1):
clocksource: sh_tmu: compute mult and shift before registration
Avi Kivity (6):
KVM: Don't allow lmsw to clear cr0.pe
KVM: MMU: Segregate shadow pages with different cr0.wp
KVM: MMU: Don't read pdptrs with mmu spinlock held in mmu_alloc_roots
KVM: Fix wallclock version writing race
KVM: PPC: Add missing vcpu_load()/vcpu_put() in vcpu ioctls
KVM: x86: Add missing locking to arch specific vcpu ioctls
Axel Lin (1):
USB: cdc-acm: fix resource reclaim in error path of acm_probe
Ben Hutchings (2):
PCI: Disable MSI for MCP55 on P5N32-E SLI
qla2xxx: Disable MSI on qla24xx chips other than QLA2432.
Bob Copeland (1):
ath5k: retain promiscuous setting
Bruno Randolf (1):
ath5k: consistently use rx_bufsize for RX DMA
Chris Wilson (2):
drm/i915: Reject bind_to_gtt() early if object > aperture drm/i915: Rebind bo if currently bound with incorrect alignment.
Christian Lamparter (2):
ar9170usb: add a couple more USB IDs
ar9170usb: fix panic triggered by undersized rxstream buffer
Cory Maccarrone (1):
HID: Add the GYR4101US USB ID to hid-gyration
Craig Shelley (1):
USB: CP210x New Device IDs 11 New device IDs
Dan Carpenter (3):
exofs: confusion between kmap() and kmap_atomic() api
rtc-cmos: do dev_set_drvdata() earlier in the initialization
KEYS: Return more accurate error codes
Dan Williams (1):
md: set mddev readonly flag on blkdev BLKROSET ioctl
Daniel Mack (1):
USB: ftdi_sio: fix DTR/RTS line modes
Daniel T Chen (9):
ALSA: hda: Fix model quirk for Dell M1730
ALSA: hda: Use LPIB for Toshiba A100-259
ALSA: hda: Use LPIB for Acer Aspire 5110
ALSA: hda: Use LPIB for Sony VPCS11V9E
ALSA: hda: Use LPIB for a Shuttle device
ALSA: hda: Use LPIB for an ASUS device
ALSA: hda: Use mb31 quirk for an iMac model
ALSA: hda: Use LPIB for another mainboard
ALSA: hda: Use LPIB for ASUS M2V
Dave Airlie (2):
drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/radeon: fix the r100/r200 ums block 0 page fix
Denis Kirjanov (1):
powerpc/oprofile: fix potential buffer overrun in op_model_cell.c
Dinh Nguyen (1):
USB: mxc: gadget: Fix bitfield for calculating maximum packet size
Dmitry Torokhov (1):
Input: psmouse - reset all types of mice before reconnecting
Eric Sandeen (1):
ext4: check s_log_groups_per_flex in online resize code
Erik Andrén (1):
V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver
FUJITA Tomonori (5):
mn10300: set ARCH_KMALLOC_MINALIGN
m68k: set ARCH_KMALLOC_MINALIGN
frv: set ARCH_KMALLOC_MINALIGN
xtensa: set ARCH_KMALLOC_MINALIGN
Blackfin: set ARCH_KMALLOC_MINALIGN
Felix Fietkau (1):
mac80211: fix handling of 4-address-mode in ieee80211_change_iface
Gabor Gombas (1):
x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
Glauber Costa (1):
x86, paravirt: Add a global synchronization point for pvclock
Grazvydas Ignotas (1):
wl1251: fix a memory leak in probe
Greg Kroah-Hartman (2):
USB: serial: option: add cinterion device id Linux 2.6.33.6
Hans de Goede (1):
USB: unusual-dev: Add bad sense flag for Appotech ax203 based picture frames
Helge Deller (1):
parisc: clear floating point exception flag on SIGFPE signal
Ian Campbell (2):
xen: ensure timer tick is resumed even on CPU driving the resume
xen: avoid allocation causing potential swap activity on the resume path
Ira W. Snyder (1):
hwmon: (ltc4245) Read only one GPIO pin
James Chapman (1):
l2tp: Fix oops in pppol2tp_xmit
Jan Beulich (1):
drivers/base/cpu.c: fix the output from /sys/devices/system/cpu/offline
Jason Dravet (1):
p54usb: Add device ID for Dell WLA3310 USB
Jeff Mahoney (1):
powerpc: Fix handling of strncmp with zero len
Jeff Moyer (1):
do_generic_file_read: clear page errors when issuing a fresh read of the page
Jens Axboe (1):
writeback: disable periodic old data writeback for !dirty_writeback_centisecs
Jiri Kosina (1):
ipmi: handle run_to_completion properly in deliver_recv_msg()
Joerg Roedel (11):
x86/amd-iommu: Fix crash when request_mem_region fails x86/amd-iommu: Fall back to GART if initialization fails
KVM: SVM: Don't use kmap_atomic in nested_svm_map
KVM: SVM: Fix schedule-while-atomic on nested exception handling
KVM: SVM: Sync all control registers on nested vmexit
KVM: SVM: Fix nested msr intercept handling
KVM: SVM: Don't sync nested cr8 to lapic and back
KVM: SVM: Fix wrong interrupt injection in enable_irq_windows
KVM: x86: Add callback to let modules decide over some supported cpuid bits
KVM: SVM: Report emulated SVM features to userspace
KVM: SVM: Don't allow nested guest to VMMCALL into host
Johan Hovold (5):
USB: visor: fix memory leak
USB: kobil: fix memory leak
USB: ir-usb: fix double free
USB: kl5usb105: fix memory leak
USB: mos7840: fix null-pointer dereference
John W. Linville (2):
rtl8180: fix tx status reporting
wireless: report reasonable bitrate for MCS rates through wext
Jouni Malinen (1):
mac80211: Fix robust management frame handling (MFP)
Julia Lawall (1):
arch/x86/kernel: Add missing spin_unlock
KOSAKI Motohiro (2):
cpumask: fix compat getaffinity
tmpfs: insert tmpfs cache pages to inactive list at first
Kamal Mostafa (1):
ACPI: video: fix acpi_backlight=video
Khem Raj (1):
ARM: 6164/1: Add kto and kfrom to input operands list.
Lai Jiangshan (1):
tracing: Consolidate protection of reader access to the ring buffer
Larry Finger (1):
staging: vt6655: Fix kernel BUG on driver wpa initialization
Linus Walleij (1):
ARM: 6144/1: TCM memory bug freeing bug
Marek Vašut (1):
ARM: 6146/1: sa1111: Prevent deadlock in resume path
Mark Brown (3):
ASoC: Fix dB scales for WM835x
ASoC: Fix dB scales for WM8400
ASoC: Fix dB scales for WM8990
Martin Homuth-Rosemann (1):
Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c
Matthew Wilcox (1):
PCI quirk: Disable MSI on VIA K8T890 systems
Maurus Cuelenaere (1):
rtc: s3c: initialize driver data before using it
Michael Neuling (2):
powerpc/pseries: Only call start-cpu when a CPU is stopped powerpc/pseries: Make query_cpu_stopped callable outside hotplug cpu
Miklos Szeredi (1):
vfs: add NOFOLLOW flag to umount(2)
Neil Horman (1):
sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)
NeilBrown (5):
md/raid1: fix counting of write targets.
md: Fix read balancing in RAID1 and RAID10 on drives > 2TB md/linear: avoid possible oops and array stop
md: remove unneeded sysfs files more promptly
md: manage redundancy group in sysfs when changing level.
Nils Radtke (1):
USB: option.c: OLIVETTI OLICARD100 support
Nobuhiro KUSUNO (1):
Staging: rt2870: add device ID of MelCo.,Inc. WLI-UC-G301N
Oleg Nesterov (2):
signals: check_kill_permission(): don't check creds if same_thread_group()
tracing: Fix null pointer deref with SEND_SIG_FORCED
Oliver Hartkopp (1):
can: Fix SJA1000 command register writes on SMP systems
Paul Mundt (1):
clocksource: sh_cmt: compute mult and shift before registration
Pavel Emelyanov (1):
NFSD: don't report compiled-out versions as present
Peter Zijlstra (1):
perf: Fix signed comparison in perf_adjust_period()
Reinette Chatre (2):
iwlwifi: reset card during probe
iwlwifi: recalculate average tpt if not current
Richard Kennedy (1):
gconfig: fix build failure on fedora 13
Robert Richter (1):
oprofile/x86: fix uninitialized counter usage during cpu hotplug
Roberto Sassu (1):
wrong type for 'magic' argument in simple_fill_super()
Rodrigo Linfati (1):
Staging: add Add Sitecom WL-349 to rtl8192su
Roedel, Joerg (1):
KVM: x86: Inject #GP with the right rip on efer writes
Russell King (1):
ARM: VFP: Fix vfp_put_double() for d16-d31
Sarah Sharp (5):
USB: xhci: Fix issue with set interface after stall.
USB: xhci: Limit bus sg_tablesize to 62 TRBs.
USB: xhci: Fix check for room on the ring.
USB: xhci: Wait for host to start running.
USB: xhci: Wait for controller to be ready after reset.
Sebastian Andrzej Siewior (1):
libata: don't flush dcache on slab pages
Sebastien Dugue (1):
mlx4_core: Fix possible chunk sg list overflow in mlx4_alloc_icm()
Shane Wang (1):
KVM: VMX: enable VMXON check with SMX enabled (Intel TXT)
Shanyu Zhao (1):
mac80211: fix rts threshold check
Shaohua Li (1):
cfq-iosched: fix an oops caused by slab leak
Sheng Yang (1):
KVM: x86: Check LMA bit before set_efer
Shi Weihua (1):
Btrfs: should add a permission check for setfacl
Stefan Richter (1):
firewire: core: check for 1394a compliant IRM, fix inaccessibility of Sony camcorder
Stephane Eranian (1):
perf_events: Fix resource leak in x86 __hw_perf_event_init()
Steve French (1):
CIFS: Allow null nd (as nfs server uses) on create
Steven Whitehouse (1):
GFS2: Fix permissions checking for setflags ioctl()
Tejun Heo (5):
libata: disable ATAPI AN by default
sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()
ahci: add pci quirk for JMB362
sata_nv: don't diddle with nIEN on mcp55
sata_via: magic vt6421 fix for transmission problems w/ WD drives
Theodore Ts'o (1):
ext4: Make sure the MOVE_EXT ioctl can't overwrite append-only files
Tony Breeds (1):
mutex: Fix optimistic spinning vs. BKL
Toshiyuki Okajima (1):
KEYS: find_keyring_by_name() can gain access to a freed keyring
Wei Yongjun (3):
KVM: s390: Fix possible memory leak of in kvm_arch_vcpu_create()
KVM: PPC: Do not create debugfs if fail to create vcpu
sctp: fix append error cause to ERROR chunk correctly
spark (1):
USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff
zhao1980ming (1):
USB: option: add PID for ZTE product
Documentation/hwmon/ltc4245 +1 -3
@@ -72,9 +72,7 @@ in6_min_alarm 5v output undervoltage alarm in7_min_alarm 3v output undervoltage alarm in8_min_alarm Vee (-12v) output undervoltage alarm -in9_input GPIO #1 voltage data -in10_input GPIO #2 voltage data -in11_input GPIO #3 voltage data +in9_input GPIO voltage data power1_input 12v power usage (mW) power2_input 5v power usage (mW)
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 33 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/common/sa1111.c +7 -2
@@ -887,8 +887,6 @@ static int sa1111_resume(struct platform_device *dev)if (!save)return 0 ; -spin_lock_irqsave (&sachip->lock, flags); -/* * Ensure that the SA1111 is still here. * FIXME: shouldn't do this here.
@@ -905,6 +903,13 @@ static int sa1111_resume(struct platform_device *dev)* First of all, wake up the chip. */ sa1111_wake (sachip); + +/* +* Only lock for write ops. Also, sa1111_wake must be called with +* released spinlock! +*/ +spin_lock_irqsave (&sachip->lock, flags); +sa1111_writel (0 , sachip->base +SA1111_INTC +SA1111_INTEN0 );sa1111_writel (0 , sachip->base +SA1111_INTC +SA1111_INTEN1 );
arch/arm/mm/copypage-feroceon.c +2 -2
@@ -18,7 +18,7 @@ feroceon_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4-r9, lr} \n\ - mov ip, %0 \n\ + mov ip, %2 \n\ 1: mov lr, r1 \n\ ldmia r1!, {r2 - r9} \n\ pld [lr, #32] \n\
@@ -64,7 +64,7 @@ feroceon_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\ ldmfd sp!, {r4-r9, pc}" : - : "I" (PAGE_SIZE)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE)); } void feroceon_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/copypage-v4wb.c +2 -2
@@ -27,7 +27,7 @@ v4wb_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, lr} @ 2\n\ - mov r2, %0 @ 1\n\ + mov r2, %2 @ 1\n\ ldmia r1!, {r3, r4, ip, lr} @ 4\n\ 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ stmia r0!, {r3, r4, ip, lr} @ 4\n\
@@ -44,7 +44,7 @@ v4wb_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB\n\ ldmfd sp!, {r4, pc} @ 3" : - : "I" (PAGE_SIZE / 64)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64)); } void v4wb_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/copypage-v4wt.c +2 -2
@@ -25,7 +25,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, lr} @ 2\n\ - mov r2, %0 @ 1\n\ + mov r2, %2 @ 1\n\ ldmia r1!, {r3, r4, ip, lr} @ 4\n\ 1: stmia r0!, {r3, r4, ip, lr} @ 4\n\ ldmia r1!, {r3, r4, ip, lr} @ 4+1\n\
@@ -40,7 +40,7 @@ v4wt_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, r2, c7, c7, 0 @ flush ID cache\n\ ldmfd sp!, {r4, pc} @ 3" : - : "I" (PAGE_SIZE / 64)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64)); } void v4wt_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/copypage-xsc3.c +2 -2
@@ -34,7 +34,7 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, r5, lr} \n\ - mov lr, %0 \n\ + mov lr, %2 \n\ \n\ pld [r1, #0] \n\ pld [r1, #32] \n\
@@ -67,7 +67,7 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom) \n\ ldmfd sp!, {r4, r5, pc}" : - : "I" (PAGE_SIZE / 64 - 1)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64 - 1)); } void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
arch/arm/mm/fault.c +3 -0
@@ -386,6 +386,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,if (addr <TASK_SIZE )return do_page_fault (addr, fsr, regs); +if (user_mode (regs)) + goto bad_area; + index =pgd_index (addr);/*
arch/arm/mm/init.c +3 -3
@@ -632,10 +632,10 @@ void __init mem_init(void)void free_initmem (void ) {#ifdef CONFIG_HAVE_TCM -extern char *__tcm_start, *__tcm_end; +extern char __tcm_start, __tcm_end; - totalram_pages +=free_area (__phys_to_pfn (__pa (__tcm_start)), -__phys_to_pfn (__pa (__tcm_end)), + totalram_pages +=free_area (__phys_to_pfn (__pa (&__tcm_start)), +__phys_to_pfn (__pa (&__tcm_end)),"TCM link" );#endif
arch/arm/vfp/vfphw.S +1 -1
@@ -277,7 +277,7 @@ ENTRY(vfp_put_double) #ifdef CONFIG_VFPv3 @ d16 - d31 registers .irp dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 -1: mcrr p11, 3, r1, r2, c\dr @ fmdrr r1, r2, d\dr +1: mcrr p11, 3, r0, r1, c\dr @ fmdrr r0, r1, d\dr mov pc, lr .org 1b + 8 .endr
arch/blackfin/include/asm/cache.h +2 -0
@@ -15,6 +15,8 @@#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)#define SMP_CACHE_BYTES L1_CACHE_BYTES +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#ifdef CONFIG_SMP #define __cacheline_aligned#else
arch/frv/include/asm/cache.h +2 -0
@@ -17,6 +17,8 @@#define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))#define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
arch/m68k/include/asm/cache.h +2 -0
@@ -8,4 +8,6 @@#define L1_CACHE_SHIFT 4#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#endif
arch/mn10300/include/asm/cache.h +2 -0
@@ -21,6 +21,8 @@#define L1_CACHE_DISPARITY L1_CACHE_NENTRIES * L1_CACHE_BYTES#endif +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +/* data cache purge registers * - read from the register to unconditionally purge that cache line * - write address & 0xffffff00 to conditionally purge that cache line
arch/parisc/math-emu/decode_exc.c +1 -0
@@ -342,6 +342,7 @@ decode_fpu(unsigned int Fpu_register[], unsigned int trap_counts[])return SIGNALCODE (SIGFPE ,FPE_FLTINV );case DIVISIONBYZEROEXCEPTION :update_trap_counts (Fpu_register, aflags, bflags, trap_counts); +Clear_excp_register (exception_index);return SIGNALCODE (SIGFPE ,FPE_FLTDIV );case INEXACTEXCEPTION :update_trap_counts (Fpu_register, aflags, bflags, trap_counts);
arch/powerpc/kvm/book3s.c +10 -0
@@ -766,6 +766,8 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,struct kvmppc_vcpu_book3s *vcpu3s =to_book3s (vcpu);int i; +vcpu_load (vcpu); + sregs->pvr = vcpu->arch.pvr; sregs->u.s.sdr1 =to_book3s (vcpu)->sdr1;
@@ -784,6 +786,9 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, sregs->u.s.ppc32.dbat[i] = vcpu3s->dbat[i].raw; } } + +vcpu_put (vcpu); +return 0 ; }
@@ -793,6 +798,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,struct kvmppc_vcpu_book3s *vcpu3s =to_book3s (vcpu);int i; +vcpu_load (vcpu); +kvmppc_set_pvr (vcpu, sregs->pvr); vcpu3s->sdr1 = sregs->u.s.sdr1;
@@ -819,6 +826,9 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,/* Flush the MMU after messing with the segments */ kvmppc_mmu_pte_flush (vcpu,0 ,0 ); + +vcpu_put (vcpu); +return 0 ; }
arch/powerpc/kvm/booke.c +14 -1
@@ -443,6 +443,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) {int i; +vcpu_load (vcpu); + regs->pc = vcpu->arch.pc; regs->cr = vcpu->arch.cr; regs->ctr = vcpu->arch.ctr;
@@ -463,6 +465,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)for (i =0 ; i <ARRAY_SIZE (regs->gpr); i++) regs->gpr[i] = vcpu->arch.gpr[i]; +vcpu_put (vcpu); +return 0 ; }
@@ -470,6 +474,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) {int i; +vcpu_load (vcpu); + vcpu->arch.pc = regs->pc; vcpu->arch.cr = regs->cr; vcpu->arch.ctr = regs->ctr;
@@ -489,6 +495,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)for (i =0 ; i <ARRAY_SIZE (vcpu->arch.gpr); i++) vcpu->arch.gpr[i] = regs->gpr[i]; +vcpu_put (vcpu); +return 0 ; }
@@ -517,7 +525,12 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)int kvm_arch_vcpu_ioctl_translate (struct kvm_vcpu *vcpu,struct kvm_translation *tr) { -return kvmppc_core_vcpu_translate (vcpu, tr); +int r; + +vcpu_load (vcpu); + r =kvmppc_core_vcpu_translate (vcpu, tr); +vcpu_put (vcpu); +return r; }int kvm_vm_ioctl_get_dirty_log (struct kvm *kvm,struct kvm_dirty_log *log)
arch/powerpc/kvm/powerpc.c +2 -1
@@ -181,7 +181,8 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) {struct kvm_vcpu *vcpu; vcpu =kvmppc_core_vcpu_create (kvm, id); -kvmppc_create_vcpu_debugfs (vcpu, id); +if (!IS_ERR (vcpu)) +kvmppc_create_vcpu_debugfs (vcpu, id);return vcpu; }
arch/powerpc/lib/string.S +3 -1
@@ -71,7 +71,7 @@ _GLOBAL(strcmp) _GLOBAL(strncmp) PPC_LCMPI r5,0 - beqlr + ble- 2f mtctr r5 addi r5,r3,-1 addi r4,r4,-1
@@ -82,6 +82,8 @@ _GLOBAL(strncmp) beqlr 1 bdnzt eq,1b blr +2: li r3,0 + blr _GLOBAL(strlen) addi r4,r3,-1
arch/powerpc/oprofile/op_model_cell.c +1 -1
@@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n) index =ENTRIES -1 ;/* make sure index is valid */ -if ((index >ENTRIES ) || (index <0 )) +if ((index >=ENTRIES ) || (index <0 )) index =ENTRIES -1 ;return initial_lfsr[index];
arch/powerpc/platforms/pseries/hotplug-cpu.c +4 -26
@@ -154,30 +154,6 @@ static void pseries_mach_cpu_die(void)for (;;); } -static int qcss_tok;/* query-cpu-stopped-state token */ - -/* Get state of physical CPU. -* Return codes: -* 0 - The processor is in the RTAS stopped state -* 1 - stop-self is in progress -* 2 - The processor is not in the RTAS stopped state -* -1 - Hardware Error -* -2 - Hardware Busy, Try again later. -*/ -static int query_cpu_stopped (unsigned int pcpu) -{ -int cpu_status, status; - - status =rtas_call (qcss_tok,1 ,2 , &cpu_status, pcpu); -if (status !=0 ) { -printk (KERN_ERR -"RTAS query-cpu-stopped-state failed: %i\n" , status); -return status; - } - -return cpu_status; -} -static int pseries_cpu_disable (void ) {int cpu =smp_processor_id ();
@@ -224,8 +200,9 @@ static void pseries_cpu_die(unsigned int cpu) }else if (get_preferred_offline_state (cpu) ==CPU_STATE_OFFLINE ) {for (tries =0 ; tries <25 ; tries++) { - cpu_status =query_cpu_stopped (pcpu); -if (cpu_status ==0 || cpu_status ==-1 ) + cpu_status =smp_query_cpu_stopped (pcpu); +if (cpu_status ==QCSS_STOPPED || + cpu_status ==QCSS_HARDWARE_ERROR )break ;cpu_relax (); }
@@ -400,6 +377,7 @@ static int __init pseries_cpu_hotplug_init(void)struct device_node *np;const char *typep;int cpu; +int qcss_tok;for_each_node_by_name (np,"interrupt-controller" ) { typep =of_get_property (np,"compatible" ,NULL );
arch/powerpc/platforms/pseries/plpar_wrappers.h +8 -0
@@ -4,6 +4,14 @@#include <asm/hvcall.h> #include <asm/page.h> +/* Get state of physical CPU from query_cpu_stopped */ +int smp_query_cpu_stopped (unsigned int pcpu); +#define QCSS_STOPPED 0 +#define QCSS_STOPPING 1 +#define QCSS_NOT_STOPPED 2 +#define QCSS_HARDWARE_ERROR -1 +#define QCSS_HARDWARE_BUSY -2 +static inline long poll_pending (void ) {return plpar_hcall_norets (H_POLL_PENDING );
arch/powerpc/platforms/pseries/smp.c +28 -0
@@ -57,6 +57,28 @@*/ static cpumask_t of_spin_map; +/* Query where a cpu is now. Return codes #defined in plpar_wrappers.h */ +int smp_query_cpu_stopped (unsigned int pcpu) +{ +int cpu_status, status; +int qcss_tok =rtas_token ("query-cpu-stopped-state" ); + +if (qcss_tok ==RTAS_UNKNOWN_SERVICE ) { +printk (KERN_INFO "Firmware doesn't support " +"query-cpu-stopped-state\n" ); +return QCSS_HARDWARE_ERROR ; + } + + status =rtas_call (qcss_tok,1 ,2 , &cpu_status, pcpu); +if (status !=0 ) { +printk (KERN_ERR +"RTAS query-cpu-stopped-state failed: %i\n" , status); +return status; + } + +return cpu_status; +} +/** * smp_startup_cpu() - start the given cpu *
@@ -82,6 +104,12 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu) pcpu =get_hard_smp_processor_id (lcpu); +/* Check to see if the CPU out of FW already for kexec */ +if (smp_query_cpu_stopped (pcpu) ==QCSS_NOT_STOPPED ){ +cpu_set (lcpu, of_spin_map); +return 1 ; + } +/* Fixup atomic count: it exited inside IRQ handler. */ task_thread_info (paca[lcpu].__current)->preempt_count =0 ;
arch/s390/kvm/kvm-s390.c +3 -1
@@ -339,11 +339,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, rc =kvm_vcpu_init (vcpu, kvm, id);if (rc) - goto out_free_cpu; + goto out_free_sie_block;VM_EVENT (kvm,3 ,"create cpu %d at %p, sie block at %p" , id, vcpu, vcpu->arch.sie_block);return vcpu; +out_free_sie_block: +free_page ((unsigned long )(vcpu->arch.sie_block)); out_free_cpu:kfree (vcpu); out_nomem:
arch/x86/include/asm/kvm_host.h +3 -0
@@ -193,6 +193,7 @@ union kvm_mmu_page_role { unsigned invalid:1; unsigned cr4_pge:1; unsigned nxe:1; + unsigned cr0_wp:1; }; };
@@ -533,6 +534,8 @@ struct kvm_x86_ops {u64 (*get_mt_mask)(struct kvm_vcpu *vcpu,gfn_t gfn,bool is_mmio);bool (*gb_page_enable)(void ); +void (*set_supported_cpuid)(u32 func,struct kvm_cpuid_entry2 *entry); +const struct trace_print_flags *exit_reasons_str; };
arch/x86/include/asm/msr-index.h +3 -2
@@ -199,8 +199,9 @@#define MSR_IA32_EBL_CR_POWERON 0x0000002a#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED (1<<2) +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2)#define MSR_IA32_APICBASE 0x0000001b#define MSR_IA32_APICBASE_BSP (1<<8)
arch/x86/kernel/amd_iommu.c +9 -7
@@ -1419,6 +1419,7 @@ static int __attach_device(struct device *dev, struct protection_domain *domain) {struct iommu_dev_data *dev_data, *alias_data; +int ret; dev_data =get_dev_data (dev); alias_data =get_dev_data (dev_data->alias);
@@ -1430,13 +1431,14 @@ static int __attach_device(struct device *dev,spin_lock (&domain->lock);/* Some sanity checks */ + ret = -EBUSY ;if (alias_data->domain !=NULL && alias_data->domain != domain) -return -EBUSY ; + goto out_unlock;if (dev_data->domain !=NULL && dev_data->domain != domain) -return -EBUSY ; + goto out_unlock;/* Do real assignment */ if (dev_data->alias != dev) {
@@ -1452,10 +1454,14 @@ static int __attach_device(struct device *dev,atomic_inc (&dev_data->bind); + ret =0 ; + +out_unlock: +/* ready */ spin_unlock (&domain->lock); -return 0 ; +return ret; }/*
@@ -2256,10 +2262,6 @@ int __init amd_iommu_init_dma_ops(void) iommu_detected =1 ; swiotlb =0 ; -#ifdef CONFIG_GART_IOMMU - gart_iommu_aperture_disabled =1 ; - gart_iommu_aperture =0 ; -#endif /* Make the driver finally visible to the drivers */ dma_ops = &amd_iommu_dma_ops;
arch/x86/kernel/amd_iommu_init.c +17 -3
@@ -286,8 +286,12 @@ static u8 * __init iommu_map_mmio_space(u64 address) {u8 *ret; -if (!request_mem_region (address,MMIO_REGION_LENGTH ,"amd_iommu" )) +if (!request_mem_region (address,MMIO_REGION_LENGTH ,"amd_iommu" )) { +pr_err ("AMD-Vi: Can not reserve memory region %llx for mmio\n" , + address); +pr_err ("AMD-Vi: This is a BIOS bug. Please contact your hardware vendor\n" );return NULL ; + } ret =ioremap_nocache (address,MMIO_REGION_LENGTH );if (ret !=NULL )
@@ -1296,7 +1300,7 @@ static int __init amd_iommu_init(void) ret =amd_iommu_init_dma_ops ();if (ret) - goto free; + goto free_disable;amd_iommu_init_api ();
@@ -1314,9 +1318,10 @@ static int __init amd_iommu_init(void) out:return ret; -free: +free_disable:disable_iommus (); +free:amd_iommu_uninit_devices (); free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
@@ -1335,6 +1340,15 @@ free:free_unity_maps (); +#ifdef CONFIG_GART_IOMMU +/* +* We failed to initialize the AMD IOMMU - try fallback to GART +* if possible. +*/ +gart_iommu_init (); + +#endif + goto out; }
arch/x86/kernel/cpu/perf_event.c +4 -1
@@ -1060,8 +1060,11 @@ static int __hw_perf_event_init(struct perf_event *event)if (atomic_read (&active_events) ==0 ) {if (!reserve_pmc_hardware ()) err = -EBUSY ; -else +else { err =reserve_bts_hardware (); +if (err) +release_pmc_hardware (); + } }if (!err)atomic_inc (&active_events);
arch/x86/kernel/pvclock.c +24 -0
@@ -109,11 +109,14 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)return pv_tsc_khz; } +static atomic64_t last_value =ATOMIC64_INIT (0 ); +cycle_t pvclock_clocksource_read (struct pvclock_vcpu_time_info *src) {struct pvclock_shadow_time shadow;unsigned version;cycle_t ret, offset; +u64 last; do { version = pvclock_get_time_values(&shadow, src);
@@ -123,6 +126,27 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)barrier (); }while (version != src->version); +/* +* Assumption here is that last_value, a global accumulator, always goes +* forward. If we are less than that, we should not be much smaller. +* We assume there is an error marging we're inside, and then the correction +* does not sacrifice accuracy. +* +* For reads: global may have changed between test and return, +* but this means someone else updated poked the clock at a later time. +* We just need to make sure we are not seeing a backwards event. +* +* For updates: last_value = ret is not enough, since two vcpus could be +* updating at the same time, and one of them could be slightly behind, +* making the assumption that last_value always go forward fail to hold. +*/ + last =atomic64_read (&last_value); +do { +if (ret < last) +return last; + last =atomic64_cmpxchg (&last_value, last, ret); + }while (unlikely (last != ret)); +return ret; }
arch/x86/kernel/setup.c +11 -0
@@ -663,6 +663,17 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "DG45FC"), }, }, + /* + * The Dell Inspiron Mini 1012 has DMI_BIOS_VENDOR = "Dell Inc.", so + * match on the product name. + */ + { + .callback = dmi_low_memory_corruption, + .ident = "Phoenix BIOS", + .matches = { + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"), + }, + }, #endif {} };
arch/x86/kernel/tboot.c +1 -0
@@ -46,6 +46,7 @@/* Global pointer to shared data; NULL means no measured launch. */ struct tboot *tboot__read_mostly ; +EXPORT_SYMBOL (tboot);/* timeout for APs (in secs) to enter wait-for-SIPI state during shutdown */ #define AP_WAIT_TIMEOUT 1
arch/x86/kvm/mmu.c +11 -1
@@ -227,7 +227,7 @@ void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, }EXPORT_SYMBOL_GPL (kvm_mmu_set_mask_ptes); -static int is_write_protection (struct kvm_vcpu *vcpu) +static bool is_write_protection (struct kvm_vcpu *vcpu) {return vcpu->arch.cr0 &X86_CR0_WP ; }
@@ -2097,11 +2097,14 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) direct =1 ;if (mmu_check_root (vcpu, root_gfn))return 1 ; + +spin_lock (&vcpu->kvm->mmu_lock); sp =kvm_mmu_get_page (vcpu, root_gfn,0 ,PT64_ROOT_LEVEL , direct,ACC_ALL ,NULL ); root =__pa (sp->spt); ++sp->root_count; +spin_unlock (&vcpu->kvm->mmu_lock); vcpu->arch.mmu.root_hpa = root;return 0 ; }
@@ -2123,11 +2126,15 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) root_gfn =0 ;if (mmu_check_root (vcpu, root_gfn))return 1 ; + +spin_lock (&vcpu->kvm->mmu_lock); sp =kvm_mmu_get_page (vcpu, root_gfn, i <<30 ,PT32_ROOT_LEVEL , direct,ACC_ALL ,NULL ); root =__pa (sp->spt); ++sp->root_count; +spin_unlock (&vcpu->kvm->mmu_lock); + vcpu->arch.mmu.pae_root[i] = root |PT_PRESENT_MASK ; } vcpu->arch.mmu.root_hpa =__pa (vcpu->arch.mmu.pae_root);
@@ -2448,6 +2455,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu) r =paging32_init_context (vcpu); vcpu->arch.mmu.base_role.glevels = vcpu->arch.mmu.root_level; + vcpu->arch.mmu.base_role.cr0_wp =is_write_protection (vcpu);return r; }
@@ -2487,7 +2495,9 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu) goto out;spin_lock (&vcpu->kvm->mmu_lock);kvm_mmu_free_some_pages (vcpu); +spin_unlock (&vcpu->kvm->mmu_lock); r =mmu_alloc_roots (vcpu); +spin_lock (&vcpu->kvm->mmu_lock);mmu_sync_roots (vcpu);spin_unlock (&vcpu->kvm->mmu_lock);if (r)
arch/x86/kvm/svm.c +106 -58
382 lines not on this page · raw message
arch/x86/kvm/vmx.c +26 -11
@@ -26,6 +26,7 @@#include <linux/sched.h> #include <linux/moduleparam.h> #include <linux/ftrace_event.h> +#include <linux/tboot.h> #include "kvm_cache_regs.h" #include "x86.h"
@@ -1125,9 +1126,16 @@ static __init int vmx_disabled_by_bios(void)u64 msr;rdmsrl (MSR_IA32_FEATURE_CONTROL , msr); -return (msr & (FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED )) - ==FEATURE_CONTROL_LOCKED ; +if (msr &FEATURE_CONTROL_LOCKED ) { +if (!(msr &FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX ) + &&tboot_enabled ()) +return 1 ; +if (!(msr &FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX ) + && !tboot_enabled ()) +return 1 ; + } + +return 0 ;/* locked but not enabled */ }
@@ -1135,21 +1143,23 @@ static int hardware_enable(void *garbage) {int cpu =raw_smp_processor_id ();u64 phys_addr =__pa (per_cpu (vmxarea, cpu)); -u64 old; +u64 old, test_bits;if (read_cr4 () &X86_CR4_VMXE )return -EBUSY ;INIT_LIST_HEAD (&per_cpu (vcpus_on_cpu, cpu));rdmsrl (MSR_IA32_FEATURE_CONTROL , old); -if ((old & (FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED )) - != (FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED )) + + test_bits =FEATURE_CONTROL_LOCKED ; + test_bits |=FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX ; +if (tboot_enabled ()) + test_bits |=FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX ; + +if ((old & test_bits) != test_bits) {/* enable and lock */ -wrmsrl (MSR_IA32_FEATURE_CONTROL , old | -FEATURE_CONTROL_LOCKED | -FEATURE_CONTROL_VMXON_ENABLED ); +wrmsrl (MSR_IA32_FEATURE_CONTROL , old | test_bits); + }write_cr4 (read_cr4 () |X86_CR4_VMXE );/* FIXME: not cpu hotplug safe */ asmvolatile (ASM_VMX_VMXON_RAX : : "a"(&phys_addr), "m"(phys_addr)
@@ -3993,6 +4003,10 @@ static bool vmx_gb_page_enable(void)return false; } +static void vmx_set_supported_cpuid (u32 func,struct kvm_cpuid_entry2 *entry) +{ +} +static struct kvm_x86_ops vmx_x86_ops = { .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios,
@@ -4057,6 +4071,7 @@ static struct kvm_x86_ops vmx_x86_ops = { .exit_reasons_str = vmx_exit_reasons_str, .gb_page_enable = vmx_gb_page_enable, + .set_supported_cpuid = vmx_set_supported_cpuid, };static int __init vmx_init (void )
arch/x86/kvm/x86.c +34 -24
148 lines not on this page · raw message
arch/x86/oprofile/nmi_int.c +8 -2
@@ -95,7 +95,10 @@ static void nmi_cpu_save_registers(struct op_msrs *msrs)static void nmi_cpu_start (void *dummy) {struct op_msrs const *msrs = &__get_cpu_var (cpu_msrs); - model->start (msrs); +if (!msrs->controls) +WARN_ON_ONCE (1 ); +else + model->start (msrs); }static int nmi_start (void )
@@ -107,7 +110,10 @@ static int nmi_start(void)static void nmi_cpu_stop (void *dummy) {struct op_msrs const *msrs = &__get_cpu_var (cpu_msrs); - model->stop (msrs); +if (!msrs->controls) +WARN_ON_ONCE (1 ); +else + model->stop (msrs); }static void nmi_stop (void )
arch/x86/xen/suspend.c +2 -2
@@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data)void xen_arch_resume (void ) { -smp_call_function (xen_vcpu_notify_restore, - (void *)CLOCK_EVT_NOTIFY_RESUME ,1 ); +on_each_cpu (xen_vcpu_notify_restore, + (void *)CLOCK_EVT_NOTIFY_RESUME ,1 ); }
arch/xtensa/include/asm/cache.h +1 -0
@@ -29,5 +29,6 @@# define CACHE_WAY_SIZE ICACHE_WAY_SIZE#endif +#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES#endif /* _XTENSA_CACHE_H */
block/cfq-iosched.c +14 -6
@@ -2481,15 +2481,10 @@ static void cfq_free_io_context(struct io_context *ioc)__call_for_each_cic (ioc, cic_free_func); } -static void cfq_exit_cfqq (struct cfq_data *cfqd,struct cfq_queue *cfqq) +static void cfq_put_cooperator (struct cfq_queue *cfqq) {struct cfq_queue *__cfqq, *next; -if (unlikely (cfqq == cfqd->active_queue)) { -__cfq_slice_expired (cfqd, cfqq,0 ); -cfq_schedule_dispatch (cfqd); - } -/* * If this queue was scheduled to merge with another queue, be * sure to drop the reference taken on that queue (and others in
@@ -2505,6 +2500,16 @@ static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)cfq_put_queue (__cfqq); __cfqq = next; } +} + +static void cfq_exit_cfqq (struct cfq_data *cfqd,struct cfq_queue *cfqq) +{ +if (unlikely (cfqq == cfqd->active_queue)) { +__cfq_slice_expired (cfqd, cfqq,0 ); +cfq_schedule_dispatch (cfqd); + } + +cfq_put_cooperator (cfqq);cfq_put_queue (cfqq); }
@@ -3459,6 +3464,9 @@ split_cfqq(struct cfq_io_context *cic, struct cfq_queue *cfqq) }cic_set_cfqq (cic,NULL ,1 ); + +cfq_put_cooperator (cfqq); +cfq_put_queue (cfqq);return NULL ; }
drivers/acpi/video_detect.c +1 -1
@@ -250,7 +250,7 @@ static int __init acpi_backlight(char *str)ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR ;if (!strcmp ("video" , str)) acpi_video_support |= -ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO ; +ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO ; }return 1 ; }
drivers/ata/libata-core.c +6 -1
@@ -159,6 +159,10 @@ int libata_allow_tpm = 0;module_param_named (allow_tpm, libata_allow_tpm, int,0444 );MODULE_PARM_DESC (allow_tpm,"Permit the use of TPM commands (0=off [default], 1=on)" ); +static int atapi_an; +module_param (atapi_an, int,0444 ); +MODULE_PARM_DESC (atapi_an,"Enable ATAPI AN media presence notification (0=0ff [default], 1=on)" ); +MODULE_AUTHOR ("Jeff Garzik" );MODULE_DESCRIPTION ("Library module for ATA devices" );MODULE_LICENSE ("GPL" );
@@ -2570,7 +2574,8 @@ int ata_dev_configure(struct ata_device *dev)* to enable ATAPI AN to discern between PHY status * changed notifications and ATAPI ANs. */ -if ((ap->flags &ATA_FLAG_AN ) &&ata_id_has_atapi_AN (id) && +if (atapi_an && + (ap->flags &ATA_FLAG_AN ) &&ata_id_has_atapi_AN (id) && (!sata_pmp_attached (ap) ||sata_scr_read (&ap->link,SCR_NOTIFICATION , &sntf) ==0 )) {unsigned int err_mask;
drivers/ata/libata-sff.c +1 -1
@@ -893,7 +893,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) do_write); } -if (!do_write) +if (!do_write && !PageSlab (page))flush_dcache_page (page); qc->curbytes += qc->sect_size;
drivers/ata/sata_nv.c +1 -4
@@ -1673,7 +1673,6 @@ static void nv_mcp55_freeze(struct ata_port *ap) mask =readl (mmio_base +NV_INT_ENABLE_MCP55 ); mask &= ~(NV_INT_ALL_MCP55 << shift);writel (mask, mmio_base +NV_INT_ENABLE_MCP55 ); -ata_sff_freeze (ap); }static void nv_mcp55_thaw (struct ata_port *ap)
@@ -1687,7 +1686,6 @@ static void nv_mcp55_thaw(struct ata_port *ap) mask =readl (mmio_base +NV_INT_ENABLE_MCP55 ); mask |= (NV_INT_MASK_MCP55 << shift);writel (mask, mmio_base +NV_INT_ENABLE_MCP55 ); -ata_sff_thaw (ap); }static void nv_adma_error_handler (struct ata_port *ap)
@@ -2478,8 +2476,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) }pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ipriv->irq_handler, -IRQF_SHARED , ipriv->sht); +return ata_pci_sff_activate_host (host, ipriv->irq_handler, ipriv->sht); }#ifdef CONFIG_PM
drivers/ata/sata_via.c +13 -0
@@ -558,6 +558,19 @@ static void svia_configure(struct pci_dev *pdev) tmp8 |=NATIVE_MODE_ALL ;pci_write_config_byte (pdev,SATA_NATIVE_MODE , tmp8); } + +/* +* vt6421 has problems talking to some drives. The following +* is the magic fix from Joseph Chan <[email protected]>. +* Please add proper documentation if possible. +* +* https://bugzilla.kernel.org/show_bug.cgi?id=15173 +*/ +if (pdev->device ==0x3249 ) { +pci_read_config_byte (pdev,0x52 , &tmp8); + tmp8 |=1 <<2 ; +pci_write_config_byte (pdev,0x52 , tmp8); + } }static int svia_init_one (struct pci_dev *pdev,const struct pci_device_id *ent)
drivers/base/cpu.c +1 -1
@@ -183,7 +183,7 @@ static ssize_t print_cpus_offline(struct sysdev_class *class, char *buf)/* display offline cpus < nr_cpu_ids */ if (!alloc_cpumask_var (&offline,GFP_KERNEL ))return -ENOMEM ; -cpumask_complement (offline, cpu_online_mask); +cpumask_andnot (offline, cpu_possible_mask, cpu_online_mask); n =cpulist_scnprintf (buf, len, offline);free_cpumask_var (offline);
drivers/char/ipmi/ipmi_si_intf.c +8 -3
@@ -311,9 +311,14 @@ static void deliver_recv_msg(struct smi_info *smi_info, {/* Deliver the message to the upper layer with the lock released. */ -spin_unlock (&(smi_info->si_lock)); -ipmi_smi_msg_received (smi_info->intf, msg); -spin_lock (&(smi_info->si_lock)); + +if (smi_info->run_to_completion) { +ipmi_smi_msg_received (smi_info->intf, msg); + }else { +spin_unlock (&(smi_info->si_lock)); +ipmi_smi_msg_received (smi_info->intf, msg); +spin_lock (&(smi_info->si_lock)); + } }static void return_hosed_msg (struct smi_info *smi_info,int cCode)
drivers/clocksource/sh_cmt.c +12 -9
@@ -413,18 +413,10 @@ static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)static int sh_cmt_clocksource_enable (struct clocksource *cs) {struct sh_cmt_priv *p =cs_to_sh_cmt (cs); -int ret; p->total_cycles =0 ; - ret =sh_cmt_start (p,FLAG_CLOCKSOURCE ); -if (ret) -return ret; - -/* TODO: calculate good shift from rate and counter bit width */ - cs->shift =0 ; - cs->mult =clocksource_hz2mult (p->rate, cs->shift); -return 0 ; +return sh_cmt_start (p,FLAG_CLOCKSOURCE ); }static void sh_cmt_clocksource_disable (struct clocksource *cs)
@@ -444,7 +436,18 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p, cs->disable = sh_cmt_clocksource_disable; cs->mask =CLOCKSOURCE_MASK (sizeof (unsigned long ) *8 ); cs->flags =CLOCK_SOURCE_IS_CONTINUOUS ; + +/* clk_get_rate() needs an enabled clock */ +clk_enable (p->clk); + p->rate =clk_get_rate (p->clk) / (p->width ==16 ) ?512 :8 ; +clk_disable (p->clk); + +/* TODO: calculate good shift from rate and counter bit width */ + cs->shift =10 ; + cs->mult =clocksource_hz2mult (p->rate, cs->shift); +pr_info ("sh_cmt: %s used as clock source\n" , cs->name); +clocksource_register (cs);return 0 ; }
drivers/clocksource/sh_tmu.c +11 -9
@@ -199,16 +199,8 @@ static cycle_t sh_tmu_clocksource_read(struct clocksource *cs)static int sh_tmu_clocksource_enable (struct clocksource *cs) {struct sh_tmu_priv *p =cs_to_sh_tmu (cs); -int ret; - - ret =sh_tmu_enable (p); -if (ret) -return ret; -/* TODO: calculate good shift from rate and counter bit width */ - cs->shift =10 ; - cs->mult =clocksource_hz2mult (p->rate, cs->shift); -return 0 ; +return sh_tmu_enable (p); }static void sh_tmu_clocksource_disable (struct clocksource *cs)
@@ -228,6 +220,16 @@ static int sh_tmu_register_clocksource(struct sh_tmu_priv *p, cs->disable = sh_tmu_clocksource_disable; cs->mask =CLOCKSOURCE_MASK (32 ); cs->flags =CLOCK_SOURCE_IS_CONTINUOUS ; + +/* clk_get_rate() needs an enabled clock */ +clk_enable (p->clk); +/* channel will be configured at parent clock / 4 */ + p->rate =clk_get_rate (p->clk) /4 ; +clk_disable (p->clk); +/* TODO: calculate good shift from rate and counter bit width */ + cs->shift =10 ; + cs->mult =clocksource_hz2mult (p->rate, cs->shift); +pr_info ("sh_tmu: %s used as clock source\n" , cs->name);clocksource_register (cs);return 0 ;
drivers/firewire/core-card.c +19 -5
@@ -231,7 +231,7 @@ void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)static void fw_card_bm_work (struct work_struct *work) { struct fw_card *card = container_of(work, struct fw_card, work.work); -struct fw_device *root_device; +struct fw_device *root_device, *irm_device;struct fw_node *root_node;unsigned long flags;int root_id, new_root_id, irm_id, local_id;
@@ -239,6 +239,7 @@ static void fw_card_bm_work(struct work_struct *work)bool do_reset = false;bool root_device_is_running;bool root_device_is_cmc; +bool irm_is_1394_1995_only;spin_lock_irqsave (&card->lock, flags);
@@ -248,12 +249,18 @@ static void fw_card_bm_work(struct work_struct *work) } generation = card->generation; + root_node = card->root_node;fw_node_get (root_node); root_device = root_node->data; root_device_is_running = root_device &&atomic_read (&root_device->state) ==FW_DEVICE_RUNNING ; root_device_is_cmc = root_device && root_device->cmc; + + irm_device = card->irm_node->data; + irm_is_1394_1995_only = irm_device && irm_device->config_rom && + (irm_device->config_rom[2 ] &0x000000f0 ) ==0 ; + root_id = root_node->node_id; irm_id = card->irm_node->node_id; local_id = card->local_node->node_id;
@@ -276,8 +283,15 @@ static void fw_card_bm_work(struct work_struct *work)if (!card->irm_node->link_on) { new_root_id = local_id; -fw_notify ("IRM has link off, making local node (%02x) root.\n" , - new_root_id); +fw_notify ("%s, making local node (%02x) root.\n" , +"IRM has link off" , new_root_id); + goto pick_me; + } + +if (irm_is_1394_1995_only) { + new_root_id = local_id; +fw_notify ("%s, making local node (%02x) root.\n" , +"IRM is not 1394a compliant" , new_root_id); goto pick_me; }
@@ -316,8 +330,8 @@ static void fw_card_bm_work(struct work_struct *work)* root, and thus, IRM. */ new_root_id = local_id; -fw_notify ("BM lock failed, making local node (%02x) root.\n" , - new_root_id); +fw_notify ("%s, making local node (%02x) root.\n" , +"BM lock failed" , new_root_id); goto pick_me; } }else if (card->bm_generation != generation) {
drivers/gpu/drm/drm_edid.c +1 -1
@@ -334,7 +334,7 @@ static struct drm_display_mode drm_dmt_modes[] = { DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },/* 1024x768@85Hz */ {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,94500 ,1024 ,1072 , -1072 ,1376 ,0 ,768 ,769 ,772 ,808 ,0 , +1168 ,1376 ,0 ,768 ,769 ,772 ,808 ,0 , DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },/* 1152x864@75Hz */ { DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216,
drivers/gpu/drm/i915/i915_drv.c +3 -2
@@ -68,7 +68,8 @@ const static struct intel_device_info intel_845g_info = { };const static struct intel_device_info intel_i85x_info = { - .is_i8xx =1 , .is_mobile =1 , .cursor_needs_physical =1 , + .is_i8xx =1 , .is_i85x =1 , .is_mobile =1 , + .cursor_needs_physical =1 , };const static struct intel_device_info intel_i865g_info = {
@@ -140,7 +141,7 @@ const static struct pci_device_id pciidlist[] = {INTEL_VGA_DEVICE (0x3577 , &intel_i830_info),INTEL_VGA_DEVICE (0x2562 , &intel_845g_info),INTEL_VGA_DEVICE (0x3582 , &intel_i85x_info), -INTEL_VGA_DEVICE (0x35e8 , &intel_i85x_info), +INTEL_VGA_DEVICE (0x358e , &intel_i85x_info),INTEL_VGA_DEVICE (0x2572 , &intel_i865g_info),INTEL_VGA_DEVICE (0x2582 , &intel_i915g_info), INTEL_VGA_DEVICE(0x258a, &intel_i915g_info),
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -175,6 +175,7 @@ struct intel_overlay;struct intel_device_info {u8 is_mobile :1 ;u8 is_i8xx :1 ; +u8 is_i85x :1 ;u8 is_i915g :1 ;u8 is_i9xx :1 ;u8 is_i945gm :1 ;
@@ -1027,7 +1028,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);#define IS_I830 (dev) ((dev)->pci_device == 0x3577)#define IS_845G (dev) ((dev)->pci_device == 0x2562) -#define IS_I85X (dev) ((dev)->pci_device == 0x3582) +#define IS_I85X (dev) (INTEL_INFO(dev)->is_i85x)#define IS_I865G (dev) ((dev)->pci_device == 0x2572)#define IS_GEN2 (dev) (INTEL_INFO(dev)->is_i8xx)#define IS_I915G (dev) (INTEL_INFO(dev)->is_i915g)
drivers/gpu/drm/i915/i915_gem.c +19 -0
@@ -2641,6 +2641,14 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)return -EINVAL ; } +/* If the object is bigger than the entire aperture, reject it early +* before evicting everything in a vain attempt to find space. +*/ +if (obj->size > dev->gtt_total) { +DRM_ERROR ("Attempting to bind an object larger than the aperture\n" ); +return -E2BIG ; + } + search_free: free_space =drm_mm_search_free (&dev_priv->mm.gtt_space, obj->size, alignment,0 );
@@ -4175,6 +4183,17 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)int ret;i915_verify_inactive (dev, __FILE__, __LINE__); + +if (obj_priv->gtt_space !=NULL ) { +if (alignment ==0 ) + alignment =i915_gem_get_gtt_alignment (obj); +if (obj_priv->gtt_offset & (alignment -1 )) { + ret =i915_gem_object_unbind (obj); +if (ret) +return ret; + } + } +if (obj_priv->gtt_space ==NULL ) { ret =i915_gem_object_bind_to_gtt (obj, alignment);if (ret)
drivers/gpu/drm/radeon/radeon_atombios.c +3 -4
@@ -514,6 +514,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev) }/* look up gpio for ddc, hpd */ + ddc_bus.valid = false; + hpd.hpd =RADEON_HPD_NONE ;if ((le16_to_cpu (path->usDeviceTag) & (ATOM_DEVICE_TV_SUPPORT |ATOM_DEVICE_CV_SUPPORT )) ==0 ) {for (j =0 ; j < con_obj->ucNumberOfObjects; j++) {
@@ -569,9 +571,6 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)break ; } } - }else { - hpd.hpd =RADEON_HPD_NONE ; - ddc_bus.valid = false; } conn_id =le16_to_cpu (path->usConnObjectId);
@@ -1137,7 +1136,7 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct lvds->native_mode.vtotal = lvds->native_mode.vdisplay +le16_to_cpu (lvds_info->info.sLCDTiming.usVBlanking_Time); lvds->native_mode.vsync_start = lvds->native_mode.vdisplay + -le16_to_cpu (lvds_info->info.sLCDTiming.usVSyncWidth); +le16_to_cpu (lvds_info->info.sLCDTiming.usVSyncOffset); lvds->native_mode.vsync_end = lvds->native_mode.vsync_start +le16_to_cpu (lvds_info->info.sLCDTiming.usVSyncWidth); lvds->panel_pwr_delay =
drivers/gpu/drm/radeon/radeon_cp.c +1 -0
@@ -1646,6 +1646,7 @@ static int radeon_do_resume_cp(struct drm_device *dev, struct drm_file *file_priradeon_cp_load_microcode (dev_priv);radeon_cp_init_ring_buffer (dev, dev_priv, file_priv); + dev_priv->have_z_offset =0 ;radeon_do_engine_reset (dev);radeon_irq_set_state (dev,RADEON_SW_INT_ENABLE ,1 );
drivers/gpu/drm/radeon/radeon_drv.h +2 -0
@@ -268,6 +268,8 @@ typedef struct drm_radeon_private {u32 scratch_ages[5 ]; +int have_z_offset; +/* starting from here on, data is preserved accross an open */ uint32_t flags;/* see radeon_chip_flags */ resource_size_t fb_aper_offset;
drivers/gpu/drm/radeon/radeon_state.c +7 -0
@@ -101,6 +101,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *DRM_ERROR ("Invalid depth buffer offset\n" );return -EINVAL ; } + dev_priv->have_z_offset =1 ;break ;case RADEON_EMIT_PP_CNTL :
@@ -876,6 +877,12 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,if (tmp &RADEON_BACK ) flags |=RADEON_FRONT ; } +if (flags & (RADEON_DEPTH |RADEON_STENCIL )) { +if (!dev_priv->have_z_offset) { +printk_once (KERN_ERR "radeon: illegal depth clear request. Buggy mesa detected - please update.\n" ); + flags &= ~(RADEON_DEPTH |RADEON_STENCIL ); + } + }if (flags & (RADEON_FRONT |RADEON_BACK )) {
drivers/hid/hid-core.c +1 -0
@@ -1305,6 +1305,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { 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) },
drivers/hid/hid-gyration.c +1 -0
@@ -73,6 +73,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field,static const struct hid_device_id gyration_devices[] = { {HID_USB_DEVICE (USB_VENDOR_ID_GYRATION ,USB_DEVICE_ID_GYRATION_REMOTE ) }, {HID_USB_DEVICE (USB_VENDOR_ID_GYRATION ,USB_DEVICE_ID_GYRATION_REMOTE_2 ) }, + {HID_USB_DEVICE (USB_VENDOR_ID_GYRATION ,USB_DEVICE_ID_GYRATION_REMOTE_3 ) }, { } };MODULE_DEVICE_TABLE (hid, gyration_devices);
drivers/hid/hid-ids.h +1 -0
@@ -256,6 +256,7 @@#define USB_VENDOR_ID_GYRATION 0x0c16#define USB_DEVICE_ID_GYRATION_REMOTE 0x0002#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 +#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008#define USB_VENDOR_ID_HAPP 0x078b#define USB_DEVICE_ID_UGCI_DRIVING 0x0010
drivers/hwmon/ltc4245.c +5 -13
@@ -45,9 +45,7 @@ enum ltc4245_cmd {LTC4245_VEEIN =0x19 ,LTC4245_VEESENSE =0x1a ,LTC4245_VEEOUT =0x1b , -LTC4245_GPIOADC1 =0x1c , -LTC4245_GPIOADC2 =0x1d , - LTC4245_GPIOADC3 = 0x1e, + LTC4245_GPIOADC = 0x1c, }; struct ltc4245_data {
@@ -61,7 +59,7 @@ struct ltc4245_data {u8 cregs[0x08 ];/* Voltage registers */ -u8 vregs[0x0f ]; +u8 vregs[0x0d ]; };static struct ltc4245_data *ltc4245_update_device (struct device *dev)
@@ -86,7 +84,7 @@ static struct ltc4245_data *ltc4245_update_device(struct device *dev) data->cregs[i] = val; } -/* Read voltage registers -- 0x10 to 0x1f */ +/* Read voltage registers -- 0x10 to 0x1c */ for (i =0 ; i <ARRAY_SIZE (data->vregs); i++) { val =i2c_smbus_read_byte_data (client, i+0x10 );if (unlikely (val <0 ))
@@ -128,9 +126,7 @@ static int ltc4245_get_voltage(struct device *dev, u8 reg)case LTC4245_VEEOUT : voltage = regval *-55 ;break ; -case LTC4245_GPIOADC1 : -case LTC4245_GPIOADC2 : -case LTC4245_GPIOADC3 : +case LTC4245_GPIOADC : voltage = regval *10 ;break ;default :
@@ -297,9 +293,7 @@ LTC4245_ALARM(in7_min_alarm, (1 << 2), LTC4245_FAULT2);LTC4245_ALARM (in8_min_alarm, (1 <<3 ),LTC4245_FAULT2 );/* GPIO voltages */ -LTC4245_VOLTAGE (in9_input,LTC4245_GPIOADC1 ); -LTC4245_VOLTAGE (in10_input,LTC4245_GPIOADC2 ); -LTC4245_VOLTAGE (in11_input,LTC4245_GPIOADC3 ); +LTC4245_VOLTAGE (in9_input,LTC4245_GPIOADC );/* Power Consumption (virtual) */ LTC4245_POWER (power1_input,LTC4245_12VSENSE );
@@ -342,8 +336,6 @@ static struct attribute *ltc4245_attributes[] = { &sensor_dev_attr_in8_min_alarm.dev_attr.attr, &sensor_dev_attr_in9_input.dev_attr.attr, - &sensor_dev_attr_in10_input.dev_attr.attr, - &sensor_dev_attr_in11_input.dev_attr.attr, &sensor_dev_attr_power1_input.dev_attr.attr, &sensor_dev_attr_power2_input.dev_attr.attr,
drivers/input/mouse/psmouse-base.c +10 -4
@@ -1382,6 +1382,7 @@ static int psmouse_reconnect(struct serio *serio)struct psmouse *psmouse =serio_get_drvdata (serio);struct psmouse *parent =NULL ;struct serio_driver *drv = serio->drv; +unsigned char type;int rc =-1 ;if (!drv || !psmouse) {
@@ -1401,10 +1402,15 @@ static int psmouse_reconnect(struct serio *serio)if (psmouse->reconnect) {if (psmouse->reconnect (psmouse)) goto out; - }else if (psmouse_probe (psmouse) <0 || - psmouse->type !=psmouse_extensions (psmouse, - psmouse_max_proto, false)) { - goto out; + }else { +psmouse_reset (psmouse); + +if (psmouse_probe (psmouse) <0 ) + goto out; + + type =psmouse_extensions (psmouse, psmouse_max_proto, false); +if (psmouse->type != type) + goto out; }/* ok, the device type (and capabilities) match the old one,
drivers/md/linear.c +1 -0
@@ -281,6 +281,7 @@ static int linear_stop (mddev_t *mddev)rcu_barrier ();blk_sync_queue (mddev->queue);/* the unplug fn references 'conf'*/ kfree (conf); + mddev->private =NULL ;return 0 ; }
drivers/md/md.c +85 -14
141 lines not on this page · raw message
drivers/md/md.h +1 -0
@@ -305,6 +305,7 @@ struct mddev_satomic_t max_corr_read_errors;/* max read retries */ struct list_head all_mddevs; +struct attribute_group *to_remove;/* Generic barrier handling. * If there is a pending barrier request, all other * writes are blocked while the devices are flushed.
drivers/md/raid1.c +5 -4
@@ -417,7 +417,7 @@ static void raid1_end_write_request(struct bio *bio, int error)*/ static int read_balance (conf_t *conf,r1bio_t *r1_bio) { -const unsigned long this_sector = r1_bio->sector; +const sector_t this_sector = r1_bio->sector;int new_disk = conf->last_used, disk = new_disk;int wonly_disk =-1 ;const int sectors = r1_bio->sectors;
@@ -433,7 +433,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio) retry:if (conf->mddev->recovery_cp < MaxSector && (this_sector + sectors >= conf->next_resync)) { -/* Choose the first operation device, for consistancy */ +/* Choose the first operational device, for consistancy */ new_disk =0 ; for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev);
@@ -911,9 +911,10 @@ static int make_request(struct request_queue *q, struct bio * bio)if (test_bit (Faulty, &rdev->flags)) {rdev_dec_pending (rdev, mddev); r1_bio->bios[i] =NULL ; - }else + }else { r1_bio->bios[i] = bio; - targets++; + targets++; + } }else r1_bio->bios[i] =NULL ; }
drivers/md/raid10.c +1 -1
@@ -493,7 +493,7 @@ static int raid10_mergeable_bvec(struct request_queue *q,*/ static int read_balance (conf_t *conf,r10bio_t *r10_bio) { -const unsigned long this_sector = r10_bio->sector; +const sector_t this_sector = r10_bio->sector;int disk, slot, nslot;const int sectors = r10_bio->sectors;sector_t new_distance, current_distance;
drivers/md/raid5.c +5 -2
@@ -5086,7 +5086,9 @@ static int run(mddev_t *mddev) }/* Ok, everything is just fine now */ -if (sysfs_create_group (&mddev->kobj, &raid5_attrs_group)) +if (mddev->to_remove == &raid5_attrs_group) + mddev->to_remove =NULL ; +else if (sysfs_create_group (&mddev->kobj, &raid5_attrs_group))printk (KERN_WARNING "raid5: failed to create sysfs attributes for %s\n" ,mdname (mddev));
@@ -5133,7 +5135,8 @@ static int stop(mddev_t *mddev) mddev->queue->backing_dev_info.congested_fn =NULL ;blk_sync_queue (mddev->queue);/* the unplug fn references 'conf'*/ free_conf (conf); - mddev->private = &raid5_attrs_group; + mddev->private =NULL ; + mddev->to_remove = &raid5_attrs_group;return 0 ; }
drivers/media/video/gspca/stv06xx/stv06xx.c +0 -2
@@ -496,8 +496,6 @@ static const __devinitdata struct usb_device_id device_table[] = { {USB_DEVICE(0x046D, 0x08F5), .driver_info = BRIDGE_ST6422 }, /* QuickCam Messenger (new) */ {USB_DEVICE(0x046D, 0x08F6), .driver_info = BRIDGE_ST6422 }, - /* QuickCam Messenger (new) */ - {USB_DEVICE(0x046D, 0x08DA), .driver_info = BRIDGE_ST6422 }, {} };MODULE_DEVICE_TABLE (usb, device_table);
drivers/net/arcnet/com20020-pci.c +2 -2
@@ -165,8 +165,8 @@ static struct pci_device_id com20020pci_id_table[] = { { 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, - { 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, - { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, + { 0x10B5, 0x9030, 0x10B5, 0x2978, 0, 0, ARC_CAN_10MBIT }, + { 0x10B5, 0x9050, 0x10B5, 0x2273, 0, 0, ARC_CAN_10MBIT }, { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, {0,}
drivers/net/can/sja1000/sja1000.c +17 -3
@@ -84,6 +84,20 @@ static struct can_bittiming_const sja1000_bittiming_const = { .brp_inc = 1, }; +static void sja1000_write_cmdreg (struct sja1000_priv *priv,u8 val) +{ +unsigned long flags; + +/* +* The command register needs some locking and time to settle +* the write_reg() operation - especially on SMP systems. +*/ +spin_lock_irqsave (&priv->cmdreg_lock, flags); + priv->write_reg (priv,REG_CMR , val); + priv->read_reg (priv,REG_SR ); +spin_unlock_irqrestore (&priv->cmdreg_lock, flags); +} +static int sja1000_probe_chip (struct net_device *dev) {struct sja1000_priv *priv =netdev_priv (dev);
@@ -279,7 +293,7 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,can_put_echo_skb (skb, dev,0 ); - priv->write_reg (priv,REG_CMR ,CMD_TR ); +sja1000_write_cmdreg (priv,CMD_TR );return NETDEV_TX_OK ; }
@@ -328,7 +342,7 @@ static void sja1000_rx(struct net_device *dev) cf->can_id = id;/* release receive buffer */ - priv->write_reg (priv,REG_CMR ,CMD_RRB ); +sja1000_write_cmdreg (priv,CMD_RRB );netif_rx (skb);
@@ -356,7 +370,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) cf->data[1 ] =CAN_ERR_CRTL_RX_OVERFLOW ; stats->rx_over_errors++; stats->rx_errors++; - priv->write_reg (priv,REG_CMR ,CMD_CDO );/* clear bit */ +sja1000_write_cmdreg (priv,CMD_CDO );/* clear bit */ }if (isrc &IRQ_EI ) {
drivers/net/can/sja1000/sja1000.h +1 -0
@@ -167,6 +167,7 @@ struct sja1000_priv {void __iomem *reg_base;/* ioremap'ed address to registers */ unsigned long irq_flags;/* for request_irq() */ +spinlock_t cmdreg_lock;/* lock for concurrent cmd register writes */ u16 flags;/* custom mode flags */ u8 ocr;/* output control register */
drivers/net/mlx4/icm.c +2 -1
@@ -174,9 +174,10 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,if (chunk->nsg <=0 ) goto fail; + } +if (chunk->npages ==MLX4_ICM_CHUNK_LEN ) chunk =NULL ; - } npages -=1 << cur_order; }else {
drivers/net/pppol2tp.c +2 -1
@@ -977,7 +977,8 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msgh/* Calculate UDP checksum if configured to do so */ if (sk_tun->sk_no_check ==UDP_CSUM_NOXMIT ) skb->ip_summed =CHECKSUM_NONE ; -else if (!(skb_dst (skb)->dev->features &NETIF_F_V4_CSUM )) { +else if ((skb_dst (skb) &&skb_dst (skb)->dev) && + (!(skb_dst (skb)->dev->features &NETIF_F_V4_CSUM ))) { skb->ip_summed =CHECKSUM_COMPLETE ; csum =skb_checksum (skb,0 , udp_len,0 ); uh->check = csum_tcpudp_magic(inet->inet_saddr,
drivers/net/wireless/ath/ar9170/hw.h +1 -0
@@ -424,5 +424,6 @@ enum ar9170_txq {#define AR9170_TXQ_DEPTH 32#define AR9170_TX_MAX_PENDING 128 +#define AR9170_RX_STREAM_MAX_SIZE 65535#endif /* __AR9170_HW_H */
drivers/net/wireless/ath/ar9170/main.c +1 -1
@@ -2538,7 +2538,7 @@ void *ar9170_alloc(size_t priv_size)* tends to split the streams into seperate rx descriptors. */ - skb =__dev_alloc_skb (AR9170_MAX_RX_BUFFER_SIZE ,GFP_KERNEL ); + skb =__dev_alloc_skb (AR9170_RX_STREAM_MAX_SIZE ,GFP_KERNEL );if (!skb) goto err_nomem;
drivers/net/wireless/ath/ar9170/usb.c +10 -0
@@ -66,18 +66,28 @@ static struct usb_device_id ar9170_usb_ids[] = { { USB_DEVICE(0x0cf3, 0x1001) },/* TP-Link TL-WN821N v2 */ { USB_DEVICE(0x0cf3, 0x1002) }, +/* 3Com Dual Band 802.11n USB Adapter */ + { USB_DEVICE(0x0cf3, 0x1010) }, +/* H3C Dual Band 802.11n USB Adapter */ + { USB_DEVICE(0x0cf3, 0x1011) },/* Cace Airpcap NX */ { USB_DEVICE(0xcace, 0x0300) },/* D-Link DWA 160 A1 */ { USB_DEVICE(0x07d1, 0x3c10) },/* D-Link DWA 160 A2 */ { USB_DEVICE(0x07d1, 0x3a09) }, +/* Netgear WNA1000 */ + { USB_DEVICE(0x0846, 0x9040) },/* Netgear WNDA3100 */ { USB_DEVICE(0x0846, 0x9010) },/* Netgear WN111 v2 */ { USB_DEVICE(0x0846, 0x9001) },/* Zydas ZD1221 */ { USB_DEVICE(0x0ace, 0x1221) }, +/* Proxim ORiNOCO 802.11n USB */ + { USB_DEVICE(0x1435, 0x0804) }, +/* WNC Generic 11n USB Dongle */ + { USB_DEVICE(0x1435, 0x0326) },/* ZyXEL NWD271N */ { USB_DEVICE(0x0586, 0x3417) }, /* Z-Com UB81 BG */
drivers/net/wireless/ath/ath5k/base.c +7 -4
@@ -1210,6 +1210,7 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)struct ath5k_hw *ah = sc->ah;struct sk_buff *skb = bf->skb;struct ath5k_desc *ds; +int ret;if (!skb) { skb =ath5k_rx_skb_alloc (sc, &bf->skbaddr);
@@ -1236,9 +1237,9 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) ds = bf->desc; ds->ds_link = bf->daddr;/* link to self */ ds->ds_data = bf->skbaddr; - ah->ah_setup_rx_desc (ah, ds, -skb_tailroom (skb),/* buffer size */ -0 ); + ret = ah->ah_setup_rx_desc (ah, ds, ah->common.rx_bufsize,0 ); +if (ret) +return ret;if (sc->rxlink !=NULL ) *sc->rxlink = bf->daddr;
@@ -2996,13 +2997,15 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,if (changed_flags & (FIF_PROMISC_IN_BSS |FIF_OTHER_BSS )) {if (*new_flags &FIF_PROMISC_IN_BSS ) { - rfilt |=AR5K_RX_FILTER_PROM ;__set_bit (ATH_STAT_PROMISC , sc->status); }else {__clear_bit (ATH_STAT_PROMISC , sc->status); } } +if (test_bit (ATH_STAT_PROMISC , sc->status)) + rfilt |=AR5K_RX_FILTER_PROM ; +/* Note, AR5K_RX_FILTER_MCAST is already enabled */ if (*new_flags &FIF_ALLMULTI ) { mfilt[0 ] = ~0 ;
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +6 -4
@@ -2083,10 +2083,12 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, }/* Else we have enough samples; calculate estimate of * actual average throughput */ - -/* Sanity-check TPT calculations */ -BUG_ON (window->average_tpt != ((window->success_ratio * - tbl->expected_tpt[index] +64 ) /128 )); +if (window->average_tpt != ((window->success_ratio * + tbl->expected_tpt[index] +64 ) /128 )) { +IWL_ERR (priv,"expected_tpt should have been calculated by now\n" ); + window->average_tpt = ((window->success_ratio * + tbl->expected_tpt[index] +64 ) /128 ); + }/* If we are searching for better modulation mode, check success. */ if (lq_sta->search_better_tbl &&
drivers/net/wireless/iwlwifi/iwl-agn.c +8 -0
@@ -3365,6 +3365,14 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)*/ spin_lock_init (&priv->reg_lock);spin_lock_init (&priv->lock); + +/* +* stop and reset the on-board processor just in case it is in a +* strange state ... like being left stranded by a primary kernel +* and this is now the kdump kernel trying to start up +*/ +iwl_write32 (priv,CSR_RESET ,CSR_RESET_REG_FLAG_NEVO_RESET ); +iwl_hw_detect (priv);IWL_INFO (priv,"Detected Intel Wireless WiFi Link %s REV=0x%X\n" , priv->cfg->name, priv->hw_rev);
drivers/net/wireless/iwlwifi/iwl3945-base.c +7 -0
@@ -4022,6 +4022,13 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *espin_lock_init (&priv->reg_lock);spin_lock_init (&priv->lock); +/* +* stop and reset the on-board processor just in case it is in a +* strange state ... like being left stranded by a primary kernel +* and this is now the kdump kernel trying to start up +*/ +iwl_write32 (priv,CSR_RESET ,CSR_RESET_REG_FLAG_NEVO_RESET ); +/*********************** * 4. Read EEPROM * ********************/
drivers/net/wireless/p54/p54usb.c +1 -0
@@ -78,6 +78,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { {USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */ {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ + {USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */ {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ {USB_DEVICE(0x413c, 0x8104)}, /* Cohiba Proto board */ {}
drivers/net/wireless/rtl818x/rtl8180_dev.c +1 -0
@@ -189,6 +189,7 @@ static void rtl8180_handle_tx(struct ieee80211_hw *dev, unsigned int prio) info->flags |=IEEE80211_TX_STAT_ACK ; info->status.rates[0 ].count = (flags &0xFF ) +1 ; + info->status.rates[1 ].idx =-1 ;ieee80211_tx_status_irqsafe (dev, skb);if (ring->entries -skb_queue_len (&ring->queue) ==2 )
drivers/net/wireless/wl12xx/wl1251_sdio.c +1 -0
@@ -160,6 +160,7 @@ disable:sdio_disable_func (func); release:sdio_release_host (func); +wl1251_free_hw (wl);return ret; }
drivers/oprofile/cpu_buffer.c +13 -50
108 lines not on this page · raw message
drivers/pci/quirks.c +10 -4
@@ -1461,7 +1461,8 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) conf5 &= ~(1 <<24 );/* Clear bit 24 */ switch (pdev->device) { -case PCI_DEVICE_ID_JMICRON_JMB360 : +case PCI_DEVICE_ID_JMICRON_JMB360 :/* SATA single port */ +case PCI_DEVICE_ID_JMICRON_JMB362 :/* SATA dual ports */ /* The controller should be in single function ahci mode */ conf1 |=0x0002A100 ;/* Set 8, 13, 15, 17 */ break ;
@@ -1497,12 +1498,14 @@ static void quirk_jmicron_ata(struct pci_dev *pdev) }DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB360 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB361 , quirk_jmicron_ata); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB362 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB363 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB365 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB366 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB368 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB360 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB361 , quirk_jmicron_ata); +DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB362 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB363 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB365 , quirk_jmicron_ata);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB366 , quirk_jmicron_ata);
@@ -2113,6 +2116,8 @@ static void __devinit quirk_disable_msi(struct pci_dev *dev) } }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8131_BRIDGE , quirk_disable_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,0xa238 , quirk_disable_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x5a3f , quirk_disable_msi);/* Go through the list of Hypertransport capabilities and * return 1 if a HT MSI capability is found and enabled */
@@ -2204,15 +2209,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS,DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8132_BRIDGE , ht_enable_msi_mapping); -/* The P5N32-SLI Premium motherboard from Asus has a problem with msi +/* The P5N32-SLI motherboards from Asus have a problem with msi * for the MCP55 NIC. It is not yet determined whether the msi problem * also affects other devices. As for now, turn off msi for this device. */ static void __devinit nvenet_msi_disable (struct pci_dev *dev) { -if (dmi_name_in_vendors ("P5N32-SLI PREMIUM" )) { +if (dmi_name_in_vendors ("P5N32-SLI PREMIUM" ) || +dmi_name_in_vendors ("P5N32-E SLI" )) {dev_info (&dev->dev, -"Disabling msi for MCP55 NIC on P5N32-SLI Premium\n" ); +"Disabling msi for MCP55 NIC on P5N32-SLI\n" ); dev->no_msi =1 ; } }
drivers/platform/x86/eeepc-laptop.c +18 -0
@@ -578,6 +578,8 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)struct pci_dev *dev;struct pci_bus *bus;bool blocked =eeepc_wlan_rfkill_blocked (eeepc); +bool absent; +u32 l;if (eeepc->wlan_rfkill)rfkill_set_sw_state (eeepc->wlan_rfkill, blocked);
@@ -591,6 +593,22 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc) goto out_unlock; } +if (pci_bus_read_config_dword (bus,0 ,PCI_VENDOR_ID , &l)) { +pr_err ("Unable to read PCI config space?\n" ); + goto out_unlock; + } + absent = (l ==0xffffffff ); + +if (blocked != absent) { +pr_warning ("BIOS says wireless lan is %s, " +"but the pci device is %s\n" , + blocked ?"blocked" :"unblocked" , + absent ?"absent" :"present" ); +pr_warning ("skipped wireless hotplug as probably " +"inappropriate for this model\n" ); + goto out_unlock; + } +if (!blocked) { dev =pci_get_slot (bus,0 );if (dev) {
drivers/rtc/rtc-cmos.c +3 -2
@@ -719,6 +719,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) } } + cmos_rtc.dev = dev; +dev_set_drvdata (dev, &cmos_rtc); + cmos_rtc.rtc =rtc_device_register (driver_name, dev, &cmos_rtc_ops,THIS_MODULE );if (IS_ERR (cmos_rtc.rtc)) {
@@ -726,8 +729,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) goto cleanup0; } - cmos_rtc.dev = dev; -dev_set_drvdata (dev, &cmos_rtc);rename_region (ports,dev_name (&cmos_rtc.rtc->dev));spin_lock_irq (&rtc_lock);
drivers/rtc/rtc-s3c.c +3 -2
@@ -456,8 +456,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)pr_debug ("s3c2410_rtc: RTCCON=%02x\n" ,readb (s3c_rtc_base +S3C2410_RTCCON )); -s3c_rtc_setfreq (&pdev->dev,1 ); -device_init_wakeup (&pdev->dev,1 );/* register RTC and exit */
@@ -474,6 +472,9 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) rtc->max_user_freq =128 ;platform_set_drvdata (pdev, rtc); + +s3c_rtc_setfreq (&pdev->dev,1 ); +return 0 ; err_nortc:
drivers/scsi/qla2xxx/qla_isr.c +13 -15
@@ -2169,30 +2169,28 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)/* If possible, enable MSI-X. */ if (!IS_QLA2432 (ha) && !IS_QLA2532 (ha) && - !IS_QLA8432 (ha) && !IS_QLA8001 (ha)) - goto skip_msix; + !IS_QLA8432 (ha) && !IS_QLA8001 (ha)) + goto skip_msi; + +if (ha->pdev->subsystem_vendor ==PCI_VENDOR_ID_HP && + (ha->pdev->subsystem_device ==0x7040 || + ha->pdev->subsystem_device ==0x7041 || + ha->pdev->subsystem_device ==0x1705 )) { +DEBUG2 (qla_printk (KERN_WARNING , ha, +"MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X,0x%X).\n" , + ha->pdev->subsystem_vendor, + ha->pdev->subsystem_device)); + goto skip_msi; + }if (IS_QLA2432 (ha) && (ha->pdev->revision <QLA_MSIX_CHIP_REV_24XX || !QLA_MSIX_FW_MODE_1 (ha->fw_attributes))) {DEBUG2 (qla_printk (KERN_WARNING , ha,"MSI-X: Unsupported ISP2432 (0x%X, 0x%X).\n" , ha->pdev->revision, ha->fw_attributes)); - goto skip_msix; } -if (ha->pdev->subsystem_vendor ==PCI_VENDOR_ID_HP && - (ha->pdev->subsystem_device ==0x7040 || - ha->pdev->subsystem_device ==0x7041 || - ha->pdev->subsystem_device ==0x1705 )) { -DEBUG2 (qla_printk (KERN_WARNING , ha, -"MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X, 0x%X).\n" , - ha->pdev->subsystem_vendor, - ha->pdev->subsystem_device)); - - goto skip_msi; - } - ret =qla24xx_enable_msix (ha, rsp);if (!ret) { DEBUG2(qla_printk(KERN_INFO, ha,
drivers/staging/comedi/drivers/ni_mio_cs.c +1 -1
@@ -123,7 +123,7 @@ static const struct ni_board_struct ni_boards[] = { .adbits = 12, .ai_fifo_depth = 1024, .alwaysdither = 0, - .gainlkup = ai_gain_16, + .gainlkup = ai_gain_4, .ai_speed = 5000, .n_aochan = 2, .aobits = 12,
drivers/staging/rt2860/usb_main_dev.c +1 -0
@@ -97,6 +97,7 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x5A57, 0x0282)}, /* Zinwell */ {USB_DEVICE(0x7392, 0x7718)}, {USB_DEVICE(0x7392, 0x7717)}, + {USB_DEVICE(0x0411, 0x016f)}, /* MelCo.,Inc. WLI-UC-G301N */ {USB_DEVICE(0x1737, 0x0070)}, /* Linksys WUSB100 */ {USB_DEVICE(0x1737, 0x0071)}, /* Linksys WUSB600N */ {USB_DEVICE(0x0411, 0x00e8)}, /* Buffalo WLI-UC-G300N */
drivers/staging/rtl8192su/r8192U_core.c +1 -0
@@ -120,6 +120,7 @@ static struct usb_device_id rtl8192_usb_id_tbl[] = { {USB_DEVICE(0x050d, 0x805E)},/* Sitecom */ {USB_DEVICE(0x0df6, 0x0031)}, + {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 *//* EnGenius */ {USB_DEVICE(0x1740, 0x9201)},/* Dlink */
drivers/staging/vt6655/device_main.c +2 -0
@@ -1089,11 +1089,13 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent) }//2008-07-21-01<Add>by MikeLiu //register wpadev +#if 0 if (wpa_set_wpadev (pDevice,1 )!=0 ) {printk ("Fail to Register WPADEV?\n" );unregister_netdev (pDevice->dev);free_netdev (dev); } +#endif device_print_info (pDevice);pci_set_drvdata (pcid, pDevice);return 0 ;
drivers/usb/class/cdc-acm.c +4 -2
@@ -1201,7 +1201,7 @@ made_compressed_probe:if (rcv->urb ==NULL ) {dev_dbg (&intf->dev,"out of memory (read urbs usb_alloc_urb)\n" ); - goto alloc_fail7; + goto alloc_fail6; } rcv->urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;
@@ -1225,7 +1225,7 @@ made_compressed_probe:if (snd->urb ==NULL ) {dev_dbg (&intf->dev,"out of memory (write urbs usb_alloc_urb)" ); - goto alloc_fail7; + goto alloc_fail8; }if (usb_endpoint_xfer_int (epwrite))
@@ -1264,6 +1264,7 @@ made_compressed_probe: i =device_create_file (&intf->dev, &dev_attr_iCountryCodeRelDate);if (i <0 ) { +device_remove_file (&intf->dev, &dev_attr_wCountryCodes);kfree (acm->country_codes); goto skip_countries; }
@@ -1300,6 +1301,7 @@ alloc_fail8:usb_free_urb (acm->wb[i].urb); alloc_fail7:acm_read_buffers_free (acm); +alloc_fail6:for (i =0 ; i < num_rx_buf; i++)usb_free_urb (acm->ru[i].urb);usb_free_urb (acm->ctrlurb);
drivers/usb/gadget/fsl_udc_core.c +1 -1
@@ -489,7 +489,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,case USB_ENDPOINT_XFER_ISOC :/* Calculate transactions needed for high bandwidth iso */ mult = (unsigned char )(1 + ((max >>11 ) &0x03 )); - max = max &0x8ff ;/* bit 0~10 */ + max = max &0x7ff ;/* bit 0~10 */ /* 3 transactions at most */ if (mult >3 ) goto en_done;
drivers/usb/host/ehci-hub.c +17 -0
@@ -294,6 +294,16 @@ static int ehci_bus_resume (struct usb_hcd *hcd)/* manually resume the ports we suspended during bus_suspend() */ i =HCS_N_PORTS (ehci->hcs_params);while (i--) { +/* clear phy low power mode before resume */ +if (ehci->has_hostpc) { +u32 __iomem *hostpc_reg = + (u32 __iomem *)((u8 *)ehci->regs + +HOSTPC0 +4 * (i &0xff )); + temp =ehci_readl (ehci, hostpc_reg); +ehci_writel (ehci, temp & ~HOSTPC_PHCD , + hostpc_reg); +mdelay (5 ); + } temp =ehci_readl (ehci, &ehci->regs->port_status [i]); temp &= ~(PORT_RWC_BITS |PORT_WAKE_BITS ); if (test_bit(i, &ehci->bus_suspended) &&
@@ -678,6 +688,13 @@ static int ehci_hub_control (if (temp &PORT_SUSPEND ) {if ((temp &PORT_PE ) ==0 ) goto error; +/* clear phy low power mode before resume */ +if (hostpc_reg) { + temp1 =ehci_readl (ehci, hostpc_reg); +ehci_writel (ehci, temp1 & ~HOSTPC_PHCD , + hostpc_reg); +mdelay (5 ); + }/* resume signaling for 20 msec */ temp &= ~(PORT_RWC_BITS |PORT_WAKE_BITS ); ehci_writel(ehci, temp | PORT_RESUME,
drivers/usb/host/fhci.h +7 -2
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/types.h> +#include <linux/bug.h> #include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/kfifo.h>
@@ -515,9 +516,13 @@ static inline int cq_put(struct kfifo *kfifo, void *p)static inline void *cq_get (struct kfifo *kfifo) { -void *p =NULL ; +unsigned int sz; +void *p; + + sz =kfifo_out (kfifo, (void *)&p,sizeof (p)); +if (sz !=sizeof (p)) +return NULL ; -kfifo_out (kfifo, (void *)&p,sizeof (p));return p; }
drivers/usb/host/xhci-hcd.c +46 -8
84 lines not on this page · raw message
drivers/usb/host/xhci-pci.c +1 -1
@@ -54,7 +54,7 @@ static int xhci_pci_setup(struct usb_hcd *hcd)struct pci_dev *pdev =to_pci_dev (hcd->self.controller);int retval; - hcd->self.sg_tablesize =TRBS_PER_SEGMENT -1 ; + hcd->self.sg_tablesize =TRBS_PER_SEGMENT -2 ; xhci->cap_regs = hcd->regs; xhci->op_regs = hcd->regs +
drivers/usb/host/xhci-ring.c +32 -5
@@ -241,10 +241,27 @@ static int room_on_ring(struct xhci_hcd *xhci, struct xhci_ring *ring,int i;union xhci_trb *enq = ring->enqueue;struct xhci_segment *enq_seg = ring->enq_seg; +struct xhci_segment *cur_seg; +unsigned int left_on_ring;/* Check if ring is empty */ -if (enq == ring->dequeue) +if (enq == ring->dequeue) { +/* Can't use link trbs */ + left_on_ring =TRBS_PER_SEGMENT -1 ; +for (cur_seg = enq_seg->next; cur_seg != enq_seg; + cur_seg = cur_seg->next) + left_on_ring +=TRBS_PER_SEGMENT -1 ; + +/* Always need one TRB free in the ring. */ + left_on_ring -=1 ; +if (num_trbs > left_on_ring) { +xhci_warn (xhci,"Not enough room on ring; " +"need %u TRBs, %u TRBs left\n" , + num_trbs, left_on_ring); +return 0 ; + }return 1 ; + }/* Make sure there's an extra empty TRB available */ for (i =0 ; i <= num_trbs; ++i) {if (enq == ring->dequeue)
@@ -333,7 +350,8 @@ static struct xhci_segment *find_trb_seg(while (cur_seg->trbs > trb || &cur_seg->trbs[TRBS_PER_SEGMENT -1 ] < trb) { generic_trb = &cur_seg->trbs[TRBS_PER_SEGMENT -1 ].generic; -if (TRB_TYPE (generic_trb->field[3 ]) ==TRB_LINK && +if ((generic_trb->field[3 ] &TRB_TYPE_BITMASK ) == +TRB_TYPE (TRB_LINK ) && (generic_trb->field[3 ] &LINK_TOGGLE )) *cycle_state = ~(*cycle_state) &0x1 ; cur_seg = cur_seg->next;
@@ -389,7 +407,7 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,BUG (); trb = &state->new_deq_ptr->generic; -if (TRB_TYPE (trb->field[3 ]) ==TRB_LINK && +if ((trb->field[3 ] &TRB_TYPE_BITMASK ) ==TRB_TYPE (TRB_LINK ) && (trb->field[3 ] &LINK_TOGGLE )) state->new_cycle_state = ~(state->new_cycle_state) &0x1 ;next_trb (xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
@@ -577,6 +595,8 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,/* Otherwise just ring the doorbell to restart the ring */ ring_ep_doorbell (xhci, slot_id, ep_index); } + ep->stopped_td =NULL ; + ep->stopped_trb =NULL ;/* * Drop the lock and complete the URBs in the cancelled TD list.
@@ -1049,8 +1069,13 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci, ep->ep_state |=EP_HALTED ; ep->stopped_td = td; ep->stopped_trb = event_trb; +xhci_queue_reset_ep (xhci, slot_id, ep_index);xhci_cleanup_stalled_ring (xhci, td->urb->dev, ep_index); + + ep->stopped_td =NULL ; + ep->stopped_trb =NULL ; +xhci_ring_cmd_db (xhci); }
@@ -1370,8 +1395,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,for (cur_trb = ep_ring->dequeue, cur_seg = ep_ring->deq_seg; cur_trb != event_trb;next_trb (xhci, ep_ring, &cur_seg, &cur_trb)) { -if (TRB_TYPE (cur_trb->generic.field[3 ]) !=TRB_TR_NOOP && -TRB_TYPE (cur_trb->generic.field[3 ]) !=TRB_LINK ) +if ((cur_trb->generic.field[3 ] & +TRB_TYPE_BITMASK ) !=TRB_TYPE (TRB_TR_NOOP ) && + (cur_trb->generic.field[3 ] & +TRB_TYPE_BITMASK ) !=TRB_TYPE (TRB_LINK )) td->urb->actual_length +=TRB_LEN (cur_trb->generic.field[2 ]); }
drivers/usb/serial/cp210x.c +11 -0
@@ -61,6 +61,8 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ + { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */ + { USB_DEVICE(0x0BED, 0x1101) }, /* MEI series 2000 Combo Acceptor */ { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */
@@ -72,9 +74,12 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x1601) }, /* Arkham Technology DS101 Adapter */ { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */ { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */ + { USB_DEVICE(0x10C4, 0x8044) }, /* Cygnal Debug Adapter */ + { USB_DEVICE(0x10C4, 0x804E) }, /* Software Bisque Paramount ME build-in converter */ { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ + { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */ { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
@@ -82,12 +87,15 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */ { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */ { USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */ + { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ + { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ + { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
@@ -105,6 +113,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ + { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */ { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ { USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */ { USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */
@@ -115,6 +124,8 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ + { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ + { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ { } /* Terminating Entry */
drivers/usb/serial/ftdi_sio.c +4 -0
@@ -2312,6 +2312,8 @@ static void ftdi_set_termios(struct tty_struct *tty, "urb failed to set to rts/cts flow control\n"); } +/* raise DTR/RTS */ +set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }else {/* * Xon/Xoff code
@@ -2359,6 +2361,8 @@ static void ftdi_set_termios(struct tty_struct *tty, } } +/* lower DTR/RTS */ +clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }return ; }
drivers/usb/serial/ir-usb.c +2 -0
@@ -312,6 +312,7 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)kfree (port->read_urb->transfer_buffer); port->read_urb->transfer_buffer = buffer; port->read_urb->transfer_buffer_length = buffer_size; + port->bulk_in_buffer = buffer; buffer =kmalloc (buffer_size,GFP_KERNEL );if (!buffer) {
@@ -321,6 +322,7 @@ static int ir_open(struct tty_struct *tty, struct usb_serial_port *port)kfree (port->write_urb->transfer_buffer); port->write_urb->transfer_buffer = buffer; port->write_urb->transfer_buffer_length = buffer_size; + port->bulk_out_buffer = buffer; port->bulk_out_size = buffer_size; }
drivers/usb/serial/kl5kusb105.c +1 -0
@@ -310,6 +310,7 @@ err_cleanup:usb_free_urb (priv->write_urb_pool[j]); } } +kfree (priv);usb_set_serial_port_data (serial->port[i],NULL ); }return -ENOMEM ;
drivers/usb/serial/kobil_sct.c +2 -1
@@ -345,7 +345,8 @@ static void kobil_close(struct usb_serial_port *port)/* FIXME: Add rts/dtr methods */ if (port->write_urb) { -usb_kill_urb (port->write_urb); +usb_poison_urb (port->write_urb); +kfree (port->write_urb->transfer_buffer);usb_free_urb (port->write_urb); port->write_urb =NULL ; }
drivers/usb/serial/mos7840.c +0 -1
@@ -717,7 +717,6 @@ static void mos7840_bulk_in_callback(struct urb *urb) mos7840_port = urb->context;if (!mos7840_port) {dbg ("%s" ,"NULL mos7840_port pointer" ); - mos7840_port->read_urb_busy = false;return ; }
drivers/usb/serial/option.c +226 -0
105 lines not on this page · raw message
kernel/perf_event.c +26 -19
45 lines not on this page · raw message
kernel/trace/trace.c +97 -39
136 lines not on this page · raw message
net/sctp/sm_make_chunk.c +57 -5
62 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.