This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, for-linus-merged has been created
at 92f1c008ae79e32b83c0607d184b194f302bb3ee (commit)
- Log -----------------------------------------------------------------
commit 92f1c008ae79e32b83c0607d184b194f302bb3ee
Merge: e54be894eae10eca9892e965cc9532f5d5a11767 d0eb2f38b250b7d6c993adf81b0e4ded0565497e
Author: Alex Elder <aelder@xxxxxxx>
Date: Mon Jan 10 21:35:55 2011 -0600
Merge branch 'master' into for-linus-merged
This merge pulls the XFS master branch into the latest Linus master.
This results in a merge conflict whose best fix is not obvious.
I manually fixed the conflict, in "fs/xfs/xfs_iget.c".
Dave Chinner had done work that resulted in RCU freeing of inodes
separate from what Nick Piggin had done, and their results differed
slightly in xfs_inode_free(). The fix updates Nick's call_rcu()
with the use of VFS_I(), while incorporating needed updates to some
XFS inode fields implemented in Dave's series. Dave's RCU callback
function has also been removed.
Signed-off-by: Alex Elder <aelder@xxxxxxx>
commit e54be894eae10eca9892e965cc9532f5d5a11767
Merge: 949f6711b83d2809d1ccb9d830155a65fdacdff9 c6c0ac664c86ff6408fadbed4913938c8a732e26
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 16:10:33 2011 -0800
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
driver core: Document that device_rename() is only for networking
sysfs: remove useless test from sysfs_merge_group
driver-core: merge private parts of class and bus
driver core: fix whitespace in class_attr_string
commit 949f6711b83d2809d1ccb9d830155a65fdacdff9
Merge: 443e6221e465efa8efb752a8405a759ef1161af9 7959d55679e4360205c9ebc89d40a5503c53bae2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 16:04:53 2011 -0800
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
staging: speakup: fix failure handling
staging: usbip: remove double giveback of URB
Staging: batman-adv: Remove batman-adv from staging
Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
staging: hv: remove unneeded osd_schedule_callback
staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
staging: brcm80211: Fix WL_<type> logging macros
Staging: IIO: DDS: AD9833 / AD9834 driver
Staging: IIO: dds.h convenience macros
Staging: IIO: Direct digital synthesis abi documentation
staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
staging: brcm80211: Remove unused ether_<foo> #defines and struct
staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
Staging: comedi: Fix checkpatch.pl issues in file s526.c
...
Fix up trivial conflict in drivers/video/udlfb.c
commit 443e6221e465efa8efb752a8405a759ef1161af9
Merge: 0caca697a2d173c6beff3c24e7d9481b732bd131 1a7d946993aaf2a79e9c65abbe169a108e351bcb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 15:39:48 2011 -0800
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (36 commits)
sony-laptop: support new hotkeys on the P, Z and EC series
platform/x86: Consistently select LEDS Kconfig options
sony-laptop: fix sparse non-ANSI function warning
intel_ips: fix sparse non-ANSI function warning
Support KHLB2 in the compal laptop driver
acer-wmi: Enabled Acer Launch Manager mode
[PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
acer-wmi: Detect the WiFi/Bluetooth/3G devices available
acer-wmi: Add 3G rfkill sysfs file
acer-wmi: Add acer wmi hotkey events support
platform/x86: Kconfig: Replace select by depends on ACPI_WMI
ideapad: pass ideapad_priv as argument (part 2)
ideapad: pass ideapad_priv as argument (part 1)
ideapad: add markups, unify comments and return result when init
ideapad: add hotkey support
ideapad: let camera power control entry under platform driver
ideapad: add platform driver for ideapad
fujitsu-laptop: fix compiler warning on pnp_ids
...
commit 0caca697a2d173c6beff3c24e7d9481b732bd131
Merge: ecacc6c70cf77a52a22af66c879873202522d6ce 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 15:39:23 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68knommu: Need to check __get_user()/__put_user() result
m68knommu: signal.c __user annotations
m68knommu: Equivalent of "m68k: handle new gcc's"
m68knommu: f_pcr has been gone since headers' merge
m68knommu: Don't lose state if sigframe setup fails
m68knommu: Handle multiple pending signals
m68knommu: Switch to saner sigsuspend
m68knommu: Don't bother with SA_ONESHOT
m68k: Check __get_user()/__put_user() return value
m68k: Missing syscall_trace() on sigreturn
m68k: Fix stack mangling logics in sigreturn
m68k: If we fail to set sigframe up, just leave regs alone...
m68k: Don't lose state if sigframe setup fails
m68k: Simplify the singlestepping handling in signals
m68k: Switch to saner sigsuspend()
m68k: Resetting sa_handler in local copy of k_sigaction is pointless
m68k/sun3: Kill pte_unmap() warnings
commit ecacc6c70cf77a52a22af66c879873202522d6ce
Merge: e773202e227c8ebbf369b9b924e15cca4d93824b 4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 14:52:44 2011 -0800
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Avoid array overflow if there are too many cpus in SRAT table
[IA64] Remove unlikely from cpu_is_offline
[IA64] irq_ia64, use set_irq_chip
[IA64] perfmon: Change vmalloc to vzalloc and drop memset.
[IA64] eliminate race condition in smp_flush_tlb_mm
commit e773202e227c8ebbf369b9b924e15cca4d93824b
Merge: abf8792d0e1b203e303ed1c02437e0e10a39dcda d2a40972ec70bd2060d3c46050a101a9678d2991
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 14:50:38 2011 -0800
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ux500: allow 5500 and 8500 to be built together
ux500: modem_irq is only for 5500
ux500: dynamic SOC detection
ux500: rename MOP board Kconfig
ux500: remove build-time changing macros
commit abf8792d0e1b203e303ed1c02437e0e10a39dcda
Merge: e0e736fc0d33861335e2a132e4f688f7fd380c61 e14411da420bad7bdaae65cccd8787674e6c565e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 14:50:08 2011 -0800
Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm
* 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
msm: add SMP support for msm
msm: hotplug: support cpu hotplug on msm
msm: timer: SMP timer support for msm
msm: scm-boot: Support for setting cold/warm boot addresses
msm: Secure Channel Manager (SCM) support
commit 7959d55679e4360205c9ebc89d40a5503c53bae2
Author: William Hubbs <w.d.hubbs@xxxxxxxxx>
Date: Thu Dec 16 13:26:58 2010 -0600
staging: speakup: fix failure handling
fix the failure handling in kobjects and the main function so that we
release the virtual keyboard if we exit due to another failure.
Signed-off-by: William Hubbs <w.d.hubbs@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7571f089d7522a95c103558faf313c7af8856ceb
Author: Márton Németh <nm127@xxxxxxxxxxx>
Date: Mon Dec 13 21:59:09 2010 +0100
staging: usbip: remove double giveback of URB
In the vhci_urb_dequeue() function the TCP connection is checked twice.
Each time when the TCP connection is closed the URB is unlinked and given
back. Remove the second attempt of unlinking and giving back of the URB completely.
This patch fixes the bug described at https://bugzilla.kernel.org/show_bug.cgi?id=24872 .
Signed-off-by: Márton Németh <nm127@xxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e0e736fc0d33861335e2a132e4f688f7fd380c61
Merge: a08948812b30653eb2c536ae613b635a989feb6f aeda4ac3efc29e4d55989abd0a73530453aa69ba
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 11:18:59 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits)
MAINTAINERS: Add tomoyo-dev-en ML.
SELinux: define permissions for DCB netlink messages
encrypted-keys: style and other cleanup
encrypted-keys: verify datablob size before converting to binary
trusted-keys: kzalloc and other cleanup
trusted-keys: additional TSS return code and other error handling
syslog: check cap_syslog when dmesg_restrict
Smack: Transmute labels on specified directories
selinux: cache sidtab_context_to_sid results
SELinux: do not compute transition labels on mountpoint labeled filesystems
This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running.
SELinux: merge policydb_index_classes and policydb_index_others
selinux: convert part of the sym_val_to_name array to use flex_array
selinux: convert type_val_to_struct to flex_array
flex_array: fix flex_array_put_ptr macro to be valid C
SELinux: do not set automatic i_ino in selinuxfs
selinux: rework security_netlbl_secattr_to_sid
SELinux: standardize return code handling in selinuxfs.c
SELinux: standardize return code handling in selinuxfs.c
SELinux: standardize return code handling in policydb.c
...
commit d2a40972ec70bd2060d3c46050a101a9678d2991
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:08:01 2010 +0530
ux500: allow 5500 and 8500 to be built together
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 5ec65521c99178a87f4c859101a92c36f4701fd7
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:08:00 2010 +0530
ux500: modem_irq is only for 5500
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
[Modified to hit the right file]
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit abf12d719a2c9e45f7f90c02a3a25107206ed57a
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:59 2010 +0530
ux500: dynamic SOC detection
Dynamically detect the DBx500 SOC an revision based on the ASIC ID.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 5dc55e0a39434ec8bec7978aef2dc00c91a530ba
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:58 2010 +0530
ux500: rename MOP board Kconfig
Rename the MOP board Kconfig entries to the same name as the machine
type, so that the machine_is_*() macros work correctly.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
[Updated to match changes in the tree]
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 92389ca8362c42952c7ebb8a0350ac522dcde0f4
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:57 2010 +0530
ux500: remove build-time changing macros
To allow the possiblity of building U8500 and U5500 support in the same
image.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
[Rebased to latest changes in Russells tree]
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 1a7d946993aaf2a79e9c65abbe169a108e351bcb
Author: Mattia Dongili <malattia@xxxxxxxx>
Date: Sat Jan 8 18:47:29 2011 +0900
sony-laptop: support new hotkeys on the P, Z and EC series
Add new mappings for assist, VAIO, zoom and eject buttons present on
refurbished P, Z and EC models.
Reported-by: Gyorgy Jeney <nog.lkml@xxxxxxxxx>
Reported-by: Stephan Mueller <smueller@xxxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Cc: Matthew Garrett <mjg@xxxxxxxxxx>
Signed-off-by: Mattia Dongili <malattia@xxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit a08948812b30653eb2c536ae613b635a989feb6f
Merge: 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281 6099469805c24af14250e182bb9ca082b8a6b716
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:57:46 2011 -0800
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
hwmon: Support for Dallas Semiconductor DS620
hwmon: driver for Sensirion SHT21 humidity and temperature sensor
hwmon: Add humidity attribute to sysfs ABI
hwmon: sysfs ABI updates
hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp
hwmon: (lm95241) Rewrite to avoid using macros
hwmon: (applesmc) Fix checkpatch errors and fix value range checks
hwmon: (applesmc) Update copyright information
hwmon: (applesmc) Silence driver
hwmon: (applesmc) Simplify feature sysfs handling
hwmon: (applesmc) Dynamic creation of fan files
hwmon: (applesmc) Extract all features generically
hwmon: (applesmc) Handle new temperature format
hwmon: (applesmc) Dynamic creation of temperature files
hwmon: (applesmc) Introduce a register lookup table
hwmon: (applesmc) Use pr_fmt and pr_<level>
hwmon: (applesmc) Relax the severity of device init failure
hwmon: (applesmc) Add MacBookAir3,1(3,2) support
hwmon: (w83627hf) Use pr_fmt and pr_<level>
hwmon: (w83627ehf) Use pr_fmt and pr_<level>
...
commit 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281
Merge: 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1 a081748735c5feb96b1365e78a5ff0fb6ca7e3a4
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:57:03 2011 -0800
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
of/flattree: forward declare struct device_node in of_fdt.h
ipmi: explicitly include of_address.h and of_irq.h
sparc: explicitly cast negative phandle checks to s32
powerpc/405: Fix missing #{address,size}-cells in i2c node
powerpc/5200: dts: refactor dts files
powerpc/5200: dts: Change combatible strings on localbus
powerpc/5200: dts: remove unused properties
powerpc/5200: dts: rename nodes to prepare for refactoring dts files
of/flattree: Update dtc to current mainline.
of/device: Don't register disabled devices
powerpc/dts: fix syntax bugs in bluestone.dts
of: Fixes for OF probing on little endian systems
of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
of/flattree: Add of_flat_dt_match() helper function
of_serial: explicitly include of_irq.h
of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
of/flattree: Reorder unflatten_dt_node
of/flattree: Refactor unflatten_dt_node
of/flattree: Add non-boottime device tree functions
of/flattree: Add Kconfig for EARLY_FLATTREE
...
Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
commit 0c51a4d8abd6ed5ba55f828840c6b78ab672644b
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 14:37:02 2011 +0000
platform/x86: Consistently select LEDS Kconfig options
Currently the x86 platform devices are not consistent about selecting
or depending on the LEDs Kconfig variables, and this inconsistency
leads to Kconfig getting upset and refusing to offer LEDs (even on
non-x86 platforms):
drivers/platform/x86/Kconfig:422:error: recursive dependency detected!
drivers/platform/x86/Kconfig:422: symbol EEEPC_WMI depends on ACPI_WMI
drivers/platform/x86/Kconfig:438: symbol ACPI_WMI is selected by ACER_WMI
drivers/platform/x86/Kconfig:18: symbol ACER_WMI depends on LEDS_CLASS
drivers/leds/Kconfig:10: symbol LEDS_CLASS is selected by EEEPC_WMI
Fix this by always selecting rather than depending on the symbols as
slightly more drivers use this approach already and it seems more
user friendly.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit a46a780835f394869e1fbbef8b528a1e02193e78
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Jan 8 19:56:44 2011 -0800
sony-laptop: fix sparse non-ANSI function warning
Fix sparse warning for non-ANSI function declaration:
drivers/platform/x86/sony-laptop.c:1134:35: warning: non-ANSI function declaration of function 'sony_nc_rfkill_update'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Matthew Garrett <mjg@xxxxxxxxxx>
Cc: Mattia Dongili <malattia@xxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 7027d8b570244f0fa3aaebccf0bcd8e95e172631
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Jan 8 19:55:40 2011 -0800
intel_ips: fix sparse non-ANSI function warning
Fix sparse warning for non-ANSI function declaration:
drivers/platform/x86/intel_ips.c:1477:25: warning: non-ANSI function declaration of function 'ips_link_to_i915_driver'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Matthew Garrett <mjg@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Mon Jan 10 08:18:25 2011 +0200
headers: kobject.h redux
Remove kobject.h from files which don't need it, notably,
sched.h and fs.h.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 37721e1b0cf98cb65895f234d8c500d270546529
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Mon Jan 10 08:17:10 2011 +0200
headers: path.h redux
Remove path.h from sched.h and other files.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 9f99a2f0e44663517b99b69a3e4a499d0ba877df
Merge: 8c8ae4e8cd5a67467192f3361eeec463694f8ed8 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:48:46 2011 -0800
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/event: validate irq before get evtchn by irq
xen/fb: fix potential memory leak
xen/fb: fix xenfb suspend/resume race.
xen: disable ACPI NUMA for PV guests
xen/irq: Cleanup the find_unbound_irq
commit 8c8ae4e8cd5a67467192f3361eeec463694f8ed8
Merge: a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:48:29 2011 -0800
Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: HVM X2APIC support
apic: Move hypervisor detection of x2apic to hypervisor.h
commit a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9
Merge: e3166331a3288dd7184548896a1c7ab682f0dbe8 a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:38:01 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix a crash during slabinfo -v
tracing/slab: Move kmalloc tracepoint out of inline code
slub: Fix slub_lock down/up imbalance
slub: Fix build breakage in Documentation/vm
slub tracing: move trace calls out of always inlined functions to reduce kernel code size
slub: move slabinfo.c to tools/slub/slabinfo.c
commit e3166331a3288dd7184548896a1c7ab682f0dbe8
Merge: 1693ed284f14a288c29f7265f9d71103e4c10821 0719e1d23aab3b445c823404fd1b8b027757bb0a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:29:25 2011 -0800
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
Documentation/kbuild: add info that 'choice' can have a symbol name
kbuild: add numeric --set-val option to scripts/config
headers_check: Fix warning text
headers_check: better search for functions in headers
scripts/coccinelle: update for compatability with Coccinelle 0.2.4
tags: put function prototypes back!
Kconfig: fix single letter command in scripts/config
gitignore: add scripts/recordmcount
commit 1693ed284f14a288c29f7265f9d71103e4c10821
Merge: f28b1c8aaa97a68028bb894bffb1690185c62b01 ee81b786a07f1d6062d6e14b6152f1f6cc4bc63b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:28:38 2011 -0800
Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
kbuild: create linux-headers package in deb-pkg
kbuild, deb-pkg: support overriding userland architecture
kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
kbuild, deb-pkg: Fix build with paranoid umask
commit f28b1c8aaa97a68028bb894bffb1690185c62b01
Merge: 0c05384a5a1af2352b8c244cf32f480ba6cbf024 39177ec36236fb71257e51d0d198437b84170911
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:28:17 2011 -0800
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
nconf: handle comment entries within choice/endchoice
kconfig: fix warning
kconfig: Make expr_copy() take a const argument
kconfig: simplify select-with-unmet-direct-dependency warning
kconfig: add more S_INT and S_HEX consistency checks
kconfig: fix `zconfdebug' extern declaration
kconfig/conf: merge duplicate switch's case
kconfig: fix typos
kbuild/gconf: add dummy inline for bind_textdomain_codeset()
kbuild/nconf: fix spaces damage
kconfig: nuke second argument of conf_write_symbol()
kconfig: do not define AUTOCONF_INCLUDED
kconfig: the day kconfig warns about "select"-abuse has come
commit 0c05384a5a1af2352b8c244cf32f480ba6cbf024
Merge: 1542dec1c9109fdcd1c53460f064096f24fc49d2 bc91c9f313309915f6ec767f56f78dcd0305b20f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:27:52 2011 -0800
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
mkuboot.sh: Fail if mkimage is missing
gen_init_cpio: checkpatch fixes
gen_init_cpio: Avoid race between call to stat() and call to open()
modpost: Fix address calculation in reloc_location()
Make fixdep error handling more explicit
checksyscalls: Fix stand-alone usage
modpost: Put .zdebug* section on white list
kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
kbuild: introduce HDR_ARCH_LIST for headers_install_all
headers_install: check exit status of unifdef
gen_init_cpio: remove leading `/' from file names
scripts/genksyms: fix header usage
fixdep: use hash table instead of a single array
commit 1542dec1c9109fdcd1c53460f064096f24fc49d2
Merge: facc7a96d443d84060a8679c3fcc51d20d4981c3 2ad2c320a107aceeba984f97ab2a60064101f5d5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:22:33 2011 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
pata_hpt37x: actually limit HPT370 to UltraDMA/66
pata_hpt3x2n: coding style cleanup
pata_hpt37x: coding style cleanup
pata_hpt366: coding style cleanup
pata_hpt3x2n: calculate average f_CNT
pata_hpt3x2n: clarify about HPT371N support
pata_hpt{37x|3x2n}: SATA mode filtering
[libata] avoid needlessly passing around ptr to SCSI completion func
[libata] new driver acard_ahci, for ATP8620 host controller
commit facc7a96d443d84060a8679c3fcc51d20d4981c3
Merge: c8940eca75e6d1ea57f6c491a30bd1023c64c9ad 4ead36407b41eae942c8c9f70ef963cd369c90e2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:15:37 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)
HID: roccat: Update sysfs attribute doc
HID: roccat: don't use #pragma pack
HID: roccat: Add support for Roccat Kone[+] v2
HID: roccat: reduce number of functions in kone and pyra drivers
HID: roccat: declare meaning of pack pragma usage in driver headers
HID: roccat: use class for char device for sysfs attribute creation
sysfs: Introducing binary attributes for struct class
HID: hidraw: add compatibility ioctl() for 32-bit applications.
HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
HID: picolcd: fix misuse of logical operation in place of bitop
HID: usbhid: base runtime PM on modern API
HID: replace offsets values with their corresponding BTN_* defines
HID: hid-mosart: support suspend/resume
HID: hid-mosart: ignore buttons report
HID: hid-picolcd: don't use flush_scheduled_work()
HID: simplify an index check in hid_lookup_collection
HID: Hoist assigns from ifs
HID: Remove superfluous __inline__
HID: Use vzalloc for vmalloc/memset(,0...)
HID: Add and use hid_<level>: dev_<level> equivalents
...
commit c8940eca75e6d1ea57f6c491a30bd1023c64c9ad
Merge: 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252 3ae22e8c8ac39daf88ae32f047fb23825be7c646
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:14:53 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
spi / PM: Support dev_pm_ops
PM: Prototype the pm_generic_ operations
PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
PM: Use dev_name() in core device suspend and resume routines
PM: Permit registration of parentless devices during system suspend
PM: Replace the device power.status field with a bit field
PM: Remove redundant checks from core device resume routines
PM: Use a different list of devices for each stage of device suspend
PM: Avoid compiler warning in pm_noirq_op()
PM: Use pm_wakeup_pending() in __device_suspend()
PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
PM: Prevent dpm_prepare() from returning errors unnecessarily
PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
PM / Hibernate: When failed, in_suspend should be reset
PM / Hibernate: hibernation_ops->leave should be checked too
Freezer: Fix a race during freezing of TASK_STOPPED tasks
PM: Use proper ccflag flag in kernel/power/Makefile
PM / Runtime: Fix comments to match runtime callback code
commit 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252
Merge: b65f0d673a0280a49b80f44c9a62e5dfc1ec203f 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 08:14:02 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: use split transaction timeout only for split transactions
firewire: ohci: consolidate context status flags
firewire: ohci: cache the context run bit
firewire: ohci: flush AT contexts after bus reset - addendum
firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
firewire: net: set carrier state at ifup
firewire: net: add carrier detection
firewire: net: ratelimit error messages
firewire: ohci: restart iso DMA contexts on resume from low power mode
firewire: ohci: restore GUID on resume.
firewire: ohci: use common buffer for self IDs and AR descriptors
firewire: ohci: optimize iso context checks in the interrupt handler
firewire: make PHY packet header format consistent
firewire: ohci: properly clear posted write errors
firewire: ohci: flush MMIO writes in the interrupt handler
firewire: ohci: fix AT context initialization error handling
firewire: ohci: Asynchronous Reception rewrite
firewire: core: Update WARN uses
firewire: nosy: char device is not seekable
commit b65f0d673a0280a49b80f44c9a62e5dfc1ec203f
Merge: f3ea597251ac859a1c0e7b9e266877f1ac828009 365e215ce1f154e288ff0f7c9acbdf5421f57949
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 07:50:40 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: unfold nilfs_dat_inode function
nilfs2: do not pass sbi to functions which can get it from inode
nilfs2: get rid of nilfs_mount_options structure
nilfs2: simplify nilfs_mdt_freeze_buffer
nilfs2: get rid of loaded flag from nilfs object
nilfs2: fix a checkpatch error in page.c
nilfs2: fiemap support
nilfs2: mark buffer heads as delayed until the data is written to disk
nilfs2: call nilfs_error inside bmap routines
fs/nilfs2/super.c: Use printf extension %pV
MAINTAINERS: add nilfs2 git tree entry
commit f3ea597251ac859a1c0e7b9e266877f1ac828009
Merge: f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a 20054bd65703f7504a9daceabc2a060828fde36c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 07:47:11 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: use CreationTime like an i_generation field
cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
cifs: show "acl" in DebugData Features when it's compiled in
cifs: move "ntlmssp" and "local_leases" options out of experimental code
cifs: replace some hardcoded values with preprocessor constants
cifs: remove unnecessary locking around sequence_number
[CIFS] Fix minor merge conflict in fs/cifs/dir.c
CIFS: Simplify cifs_open code
CIFS: Simplify non-posix open stuff (try #2)
CIFS: Add match_port check during looking for an existing connection (try #4)
CIFS: Simplify ipv*_connect functions into one (try #4)
cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
cifs: don't overwrite dentry name in d_revalidate
commit 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date: Fri Jan 7 14:50:12 2011 +0800
xen/event: validate irq before get evtchn by irq
When retrieving the event channel number from irq, the irq
number may not be valid under some conditions.
So far that can be when we suspend/resume and irq ends with -1.
Validate and return sanitized irq and provide diagnostics information.
[v3: added unlikely on the WARN path]
[v2: reworded the commit message]
Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Tested-by: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
commit fc550e95921e109f3778a6b2dc560d63388810ab
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date: Fri Jan 7 18:20:54 2011 +0800
xen/fb: fix potential memory leak
This patch fixes a potential memory leak when xenfb connect to
the backend fails.
Thanks for Ian's review and comments.
[v2: reworded the commit message a bit]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
Tested-by: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
commit 731f3ab66a23dab28a359e87364f53d221b3d366
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date: Fri Jan 7 18:17:17 2011 +0800
xen/fb: fix xenfb suspend/resume race.
When migrating guests over a long period we hit this:
<1>BUG: unable to handle kernel paging request at 0000000b819fdb98
<1>IP: [<ffffffff812a588f>] notify_remote_via_irq+0x13/0x34
<4>PGD 94b10067 PUD 0
<0>Oops: 0000 [#1] SMP
.. snip..
Call Trace:
[<ffffffff812712c9>] xenfb_send_event+0x5c/0x5e
[<ffffffff8100ea5f>] ? xen_restore_fl_direct_end+0x0/0x1
[<ffffffff81438d80>] ? _spin_unlock_irqrestore+0x16/0x18
[<ffffffff812714ee>] xenfb_refresh+0x1b1/0x1d7
[<ffffffff81270568>] ? sys_imageblit+0x1ac/0x458
[<ffffffff81271786>] xenfb_imageblit+0x2f/0x34
[<ffffffff8126a3e5>] soft_cursor+0x1b5/0x1c8
[<ffffffff8126a137>] bit_cursor+0x4b6/0x4d7
[<ffffffff8100ea5f>] ? xen_restore_fl_direct_end+0x0/0x1
[<ffffffff81438d80>] ? _spin_unlock_irqrestore+0x16/0x18
[<ffffffff81269c81>] ? bit_cursor+0x0/0x4d7
[<ffffffff812656b7>] fb_flashcursor+0xff/0x111
[<ffffffff812655b8>] ? fb_flashcursor+0x0/0x111
[<ffffffff81071812>] worker_thread+0x14d/0x1ed
[<ffffffff81075a8c>] ? autoremove_wake_function+0x0/0x3d
[<ffffffff81438d80>] ? _spin_unlock_irqrestore+0x16/0x18
[<ffffffff810716c5>] ? worker_thread+0x0/0x1ed
[<ffffffff810756e3>] kthread+0x6e/0x76
[<ffffffff81012dea>] child_rip+0xa/0x20
[<ffffffff81011fd1>] ? int_ret_from_sys_call+0x7/0x1b
[<ffffffff8101275d>] ? retint_restore_args+0x5/0x6
[<ffffffff81012de0>] ? child_rip+0x0/0x20
Code: 6b ff 0c 8b 87 a4 db 9f 81 66 85 c0 74 08 0f b7 f8 e8 3b ff ff ff c9
c3 55 48 89 e5 48 83 ec 10 0f 1f 44 00 00 89 ff 48 6b ff 0c <8b> 87 a4 db 9f
81 66 85 c0 74 14 48 8d 75 f0 0f b7 c0 bf 04 00
RIP [<ffffffff812a588f>] notify_remote_via_irq+0x13/0x34
RSP <ffff8800e7bf7bd0>
CR2: 0000000b819fdb98
---[ end trace 098b4b74827595d0 ]---
The root cause of the panic is the race between the resume and reconnect to the backend.
Clearing the 'update_wanted' flag of xenfb before disconnecting from the
backend fixes this issue.
Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Tested-by: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
commit c1f5db1a53a7286f6c818f71016ae6aced814d27
Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Fri Dec 3 09:54:03 2010 +0000
xen: disable ACPI NUMA for PV guests
Xen does not currently expose PV-NUMA information to PV
guests. Therefore disable NUMA for the time being to prevent the
kernel picking up on an host-level NUMA information which it might
come across in the firmware.
[ Added comment - Jeremy ]
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
commit f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a
Merge: 7d44b0440147d83a65270205b22e7d365de28948 b9d41052794385f9d47ebb7acf4a772f3ad02398
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 07:46:26 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: sanitize work_start() in lowcomms.c
dlm: reduce cond_resched during send
dlm: use TCP_NODELAY
dlm: Use cmwq for send and receive workqueues
dlm: Handle application limited situations properly.
commit 7d44b0440147d83a65270205b22e7d365de28948
Merge: 0dc1488527a3c01383a50e5df7187219567586a3 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 10 07:43:54 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix ioctl ABI
fuse: allow batching of FORGET requests
fuse: separate queue for FORGET requests
fuse: ioctl cleanup
Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done
the RCU-freeing of the inode in fuse_destroy_inode().
commit 0dc1488527a3c01383a50e5df7187219567586a3
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Jan 8 19:40:33 2011 -0800
pipe_fs_i.h: fix kernel-doc warning
Fix kernel-doc notation warnings in pipe_fs_i.h:
Warning(include/linux/pipe_fs_i.h:58): No description found for parameter 'buffers'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 175881db8916a5f5cdf920d32214caef588870fd
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Jan 8 19:38:02 2011 -0800
hrtimer.h: fix kernel-doc warning
Fix new kernel-doc notation warning in hrtimer.h:
Warning(include/linux/hrtimer.h:150): Excess struct/union/enum/typedef member 'first' description in 'hrtimer_clock_base'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 2a8c0c68487a68441e701f493f43fd547d87c8df
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Jan 8 19:37:20 2011 -0800
fs: fix dcache.h kernel-doc notation
Fix new kernel-doc notation warning in dcache.h:
Warning(include/linux/dcache.h:316): Excess function parameter 'Returns' description in '__d_rcu_to_refcount'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 39191628ed169510db2f3f472e1ec14e08f9690f
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Jan 8 19:36:21 2011 -0800
fs: fix namei.c kernel-doc notation
Fix new kernel-doc notation warnings in fs/namei.c and spell
ECHILD correctly.
Warning(fs/namei.c:218): No description found for parameter 'flags'
Warning(fs/namei.c:425): Excess function parameter 'Returns' description in 'nameidata_drop_rcu'
Warning(fs/namei.c:478): Excess function parameter 'Returns' description in 'nameidata_dentry_drop_rcu'
Warning(fs/namei.c:540): Excess function parameter 'Returns' description in 'nameidata_drop_rcu_last'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 365e215ce1f154e288ff0f7c9acbdf5421f57949
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Mon Dec 27 00:07:30 2010 +0900
nilfs2: unfold nilfs_dat_inode function
nilfs_dat_inode function was a wrapper to switch between normal dat
inode and gcdat, a clone of the dat inode for garbage collection.
This function got obsolete when the gcdat inode was removed, and now
we can access the dat inode directly from a nilfs object. So, we will
unfold the wrapper and remove it.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit bcbc8c648d6cc88f771435d8031c1a13e00945ed
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Mon Dec 27 00:05:49 2010 +0900
nilfs2: do not pass sbi to functions which can get it from inode
This removes argument for passing nilfs_sb_info structure from
nilfs_set_file_dirty and nilfs_load_inode_block functions. We can get
a pointer to the structure from inodes.
[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>: fix conflict with commit
b74c79e99389cd79b31fcc08f82c24e492e63c7e]
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit 06df0f999247a3153c3ec284c7ada36ef785eb97
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Mon Dec 27 00:04:06 2010 +0900
nilfs2: get rid of nilfs_mount_options structure
Only mount_opt member is used in the nilfs_mount_options structure,
and we can simplify it.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit a7a8447edef2cfa9b28cc3892993d9fafb362671
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Mon Dec 27 00:03:02 2010 +0900
nilfs2: simplify nilfs_mdt_freeze_buffer
nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer()
always returns a valid buffer head, so its validity check can be
removed.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit 888da23c2f70ca2e9897b725322a6456285ee9c4
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Mon Dec 27 00:01:28 2010 +0900
nilfs2: get rid of loaded flag from nilfs object
NILFS_LOADED flag of the nilfs object is not used now, so this will
remove it.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit ae53a0a2ce2a89f1aa824a5fc6d2099907cfb409
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Sun Dec 26 23:30:02 2010 +0900
nilfs2: fix a checkpatch error in page.c
Will correct the following checkpatch error:
ERROR: trailing whitespace
#494: FILE: page.c:494:
+ $
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit 622daaff0a8975fb5c5b95f24f3234550ba32e92
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Sun Dec 26 16:38:43 2010 +0900
nilfs2: fiemap support
This adds fiemap to nilfs. Two new functions, nilfs_fiemap and
nilfs_find_uncommitted_extent are added.
nilfs_fiemap() implements the fiemap inode operation, and
nilfs_find_uncommitted_extent() helps to get a range of data blocks
whose physical location has not been determined.
nilfs_fiemap() collects extent information by looping through
nilfs_bmap_lookup_contig and nilfs_find_uncommitted_extent routines.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit 27e6c7a3ce29ae5fa5bec4ed5917f8508bfac120
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Sun Dec 26 16:28:28 2010 +0900
nilfs2: mark buffer heads as delayed until the data is written to disk
Nilfs does not allocate new blocks on disk until they are actually
written to. To implement fiemap, we need to deal with such blocks.
To allow successive fiemap patch to distinguish mapped but unallocated
regions, this marks buffer heads of those new blocks as delayed and
clears the flag after the blocks are written to disk.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit e828949e5b42bfd234ee537cdb7c5e3a577958a3
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Fri Nov 19 15:26:20 2010 +0900
nilfs2: call nilfs_error inside bmap routines
Some functions using nilfs bmap routines can wrongly return invalid
argument error (i.e. -EINVAL) that bmap returns as an internal code
for btree corruption.
This fixes the issue by catching and converting the internal EINVAL to
EIO and calling nilfs_error function inside bmap routines.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit b004a5eb0babec7ef91558f73315ef49e5a1f285
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 16:35:21 2010 -0800
fs/nilfs2/super.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit af1761f268ff2a58f2ea22e9b9de6359f7b2048e
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Tue Nov 23 23:37:23 2010 +0900
MAINTAINERS: add nilfs2 git tree entry
NILFS2 filesystem section of the MAINTAINERS file lacks an entry of
scm tree. This adds it.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit 20054bd65703f7504a9daceabc2a060828fde36c
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Jan 7 11:30:27 2011 -0500
cifs: use CreationTime like an i_generation field
Reduce false inode collisions by using the CreationTime like an
i_generation field. This way, even if the server ends up reusing
a uniqueid after a delete/create cycle, we can avoid matching
the inode incorrectly.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit aeda4ac3efc29e4d55989abd0a73530453aa69ba
Merge: d2e7ad19229f982fc1eb731827d82ceac90abfb3 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8
Author: James Morris <jmorris@xxxxxxxxx>
Date: Mon Jan 10 10:40:42 2011 +1100
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
commit d44a9fe2c8af3fee8edb203e9b11e507851c50fa
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Jan 7 11:30:29 2011 -0500
cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
We call CIFSSMBUnixSetPathInfo in these functions, but we have a
filehandle since an open was just done. Switch these functions to
use CIFSSMBUnixSetFileInfo instead.
In practice, these codepaths are only used if posix opens are broken.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit ca40b714b8f9f20118b7071cb7cf49954166dbdf
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Jan 7 11:30:29 2011 -0500
cifs: show "acl" in DebugData Features when it's compiled in
...and while we're at it, reduce the number of calls into the seq_*
functions by prepending spaces to strings.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit b4d6fcf13f417464c13c6fde46e87c495ba6b6ee
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Jan 7 11:30:28 2011 -0500
cifs: move "ntlmssp" and "local_leases" options out of experimental code
I see no real need to leave these sorts of options under an
EXPERIMENTAL ifdef. Since you need a mount option to turn this code
on, that only blows out the testing matrix.
local_leases has been under the EXPERIMENTAL tag for some time, but
it's only the mount option that's under this label. Move it out
from under this tag.
The NTLMSSP code is also under EXPERIMENTAL, but it needs a mount
option to turn it on, and in the future any distro will reasonably
want this enabled. Go ahead and move it out from under the
EXPERIMENTAL tag.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Acked-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 1397f2ee4be65542fdc3460c7e8b6317779ea680
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Jan 7 11:30:28 2011 -0500
cifs: replace some hardcoded values with preprocessor constants
A number of places that deal with RFC1001/1002 negotiations have bare
"15" or "16" values. Replace them with RFC_1001_NAME_LEN and
RFC_1001_NAME_LEN_WITH_NULL.
The patch also cleans up some checkpatch warnings for code surrounding
the changes. This should apply cleanly on top of the patch to remove
Local_System_Name.
Reported-and-Reviwed-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit a0f8b4fb4cab4bc32caaf34fc0a0c9d5dd369186
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Jan 7 11:30:28 2011 -0500
cifs: remove unnecessary locking around sequence_number
The server->sequence_number is already protected by the srv_mutex. The
GlobalMid_lock is unneeded here.
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 197a1eeb7f89c1d2ba93713398e9655899aa973e
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Sun Jan 9 23:26:56 2011 +0000
[CIFS] Fix minor merge conflict in fs/cifs/dir.c
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3
Merge: 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 0c21e3aaf6ae85bee804a325aa29c325209180fd
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Sun Jan 9 23:18:16 2011 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/dir.c
commit d2e7ad19229f982fc1eb731827d82ceac90abfb3
Merge: d03a5d888fb688c832d470b749acc5ed38e0bc1d 0c21e3aaf6ae85bee804a325aa29c325209180fd
Author: James Morris <jmorris@xxxxxxxxx>
Date: Mon Jan 10 09:46:24 2011 +1100
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Ok'd by Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 6099469805c24af14250e182bb9ca082b8a6b716
Author: Roland Stigge <stigge@xxxxxxxxx>
Date: Sun Jan 9 09:31:39 2011 -0500
hwmon: Support for Dallas Semiconductor DS620
Driver for Dallas Semiconductor DS620 temperature sensor and thermostat
Signed-off-by: Roland Stigge <stigge@xxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3
Merge: 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 8165984acf825917437debae519209073c32a5a7
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Jan 9 11:05:53 2011 +0200
Merge branch 'slab/next' into for-linus
commit a081748735c5feb96b1365e78a5ff0fb6ca7e3a4
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sat Jan 8 21:42:42 2011 -0700
of/flattree: forward declare struct device_node in of_fdt.h
This patch forward declares struct device_node to fix a compile error
when of_fdt.h is included, but of.h is not. Alternately, including
linux/of.h could have been added to of_fdt.h, but that pulls in a lot
of unnecessary declarations when only working with the flattened
form.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 430400b86304ea729ba10f2966a8af67da60a37f
Author: Urs Fleisch <urs.fleisch@xxxxxxxxx>
Date: Fri Jan 7 07:15:39 2011 +0000
hwmon: driver for Sensirion SHT21 humidity and temperature sensor
Signed-off-by: Urs Fleisch <urs.fleisch@xxxxxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit c6c2c1636e30bcd26c6b0d208324055a03c5ab9c
Author: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Date: Thu Jan 6 07:52:03 2011 -0800
hwmon: Add humidity attribute to sysfs ABI
The humidity attribute is already supported by the sht15 driver, and another
driver supporting it is about to be added. Make it official.
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Acked-by: Jean Delvare <khali@xxxxxxxxxxxx>
commit 581693b51e44bb2c0cca16ab0c8d3cb535fd2ac8
Author: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Date: Mon Jun 28 13:22:27 2010 -0700
hwmon: sysfs ABI updates
Add attributes supported by various PMBus devices to hwmon sysfs ABI.
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit ae9e0ce73e9fc55a620e0b3bd4a154330a7e64cc
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date: Mon Dec 6 11:48:35 2010 -0500
hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 0f1deb4b820cfacf22492abd7b17e891dafc51ae
Author: Davide Rizzo <elpa.rizzo@xxxxxxxxx>
Date: Thu Nov 18 07:23:00 2010 -0800
hwmon: (lm95241) Rewrite to avoid using macros
Signed-off-by: Davide Rizzo <elpa.rizzo@xxxxxxxxx>
[guenter.roeck@xxxxxxxxxxxx: Formatting changes]
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 2bfe814826b7266a489895f731a777f8cbe37963
Author: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Date: Wed Nov 10 10:42:21 2010 -0800
hwmon: (applesmc) Fix checkpatch errors and fix value range checks
This patch fixes all checkpatch errors and most of the checkpatch warnings.
It also fixes the range check in applesmc_store_fan_speed().
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Acked-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 41e71f97174ba08fcca7f31bf448de92abc8862e
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:11 2010 +0000
hwmon: (applesmc) Update copyright information
With the preceding patches, git blame assigns about half of
the file to the present author. Add a line to the copyright
to reflect this.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 0b8ad5a57b75322e4b671ef420b5fe90e5154912
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:10 2010 +0000
hwmon: (applesmc) Silence driver
Make the driver report a single line on success.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 0b0b5dff8967a4468f05174d0d74e1ed6e369776
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:09 2010 +0000
hwmon: (applesmc) Simplify feature sysfs handling
Given the dynamic node construction method, the setup of the
accelerometer, light sensor and keyboard backlight sysfs nodes
can be simplified. This patch does not contain any logic changes.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 3eba2bf7c5fb7863412554cd73646cb80ac293ff
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:08 2010 +0000
hwmon: (applesmc) Dynamic creation of fan files
With the dynamic temperature group in place, the setup of fans
can be simplified. This patch sets up the fans dynamically, removing
a hundred lines of code.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 40ef06f1120bcc0a2ad483b5cd42f58c4df78a5b
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Wed Nov 10 10:58:05 2010 +0000
hwmon: (applesmc) Extract all features generically
With temperature keys being determined automatically, the dmi match
data is only used to assign features that can easily be detected from
the smc. This patch removes the dmi match data altogether, and reduces
the match table to the main machine models.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit dcdea2614ab9b7864a3ae620419d04e0cc4a65cc
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:06 2010 +0000
hwmon: (applesmc) Handle new temperature format
The recent Macbooks have temperature registers of a new type.
This patch adds the logic to handle them.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 9792dadfce22ae1518c88577ac743a3077a85084
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Wed Nov 10 10:58:04 2010 +0000
hwmon: (applesmc) Dynamic creation of temperature files
The current driver creates temperature files based on a list
of temperature keys given per device. Apart from slow adaption
to new machine models, the number of sensors also depends on
the number of processors. This patch looks up the temperature
keys dynamically, thereby supporting all models.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 5874583d5662de5550b0ed1c54a9dea70bcdcba4
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Wed Nov 10 10:58:03 2010 +0000
hwmon: (applesmc) Introduce a register lookup table
One main problem with the current driver is the inability to quickly
search for supported keys, resulting in detailed feature maps per
machine model which are cumbersome to maintain.
This patch adds a register lookup table, which enables binary search
for supported keys. The lookup also reduces the io frequency, so the
original mutex is replaced by locks around the actual io.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
[guenter.roeck@xxxxxxxxxxxx: Added value range check to key_at_index_store()]
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 1ee7c71bd1aa9758f14e1be92310215a5bd0abe7
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:03 2010 +0000
hwmon: (applesmc) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 2344cd0c2e9ea8f3037be11fb997ddbeda0237ca
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Nov 9 15:15:02 2010 +0000
hwmon: (applesmc) Relax the severity of device init failure
The device init is used to reset the accelerometer. Failure to reset
is not severe enough to stop loading the module or to resume from
hibernation. This patch relaxes failure to a warning and drops
output in case of success.
Cc: stable@xxxxxxxxxx
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 132af03233b493101a53010383b5abb5b9ff1e51
Author: Edgar Hucek <gimli@xxxxxxxxxxxxxx>
Date: Tue Nov 9 15:15:01 2010 +0000
hwmon: (applesmc) Add MacBookAir3,1(3,2) support
This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
applesmc driver.
[rydberg@xxxxxxxxxxx: minor cleanup]
Cc: stable@xxxxxxxxxx
Signed-off-by: Edgar Hucek <gimli@xxxxxxxxxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 18de030f1dbaef0c13cf393899a298d978aa200f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:55 2010 +0000
hwmon: (w83627hf) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit abdc6fd189405a83ebd20aa9facfbdf3c179d48a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:54 2010 +0000
hwmon: (w83627ehf) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 9d72be0da16da10e27f6a8c01f877db6c513413d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:53 2010 +0000
hwmon: (vt8231) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 5ed9ba6b87545d21b48e50a028bfb79f9812f89f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:52 2010 +0000
hwmon: (vt1211) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 774f7827e13cfae720306ca44b83b93ab2a6b9be
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:51 2010 +0000
hwmon: (via686a) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit edb8d53c684da4062ac8c461727ddc1839336aa5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:50 2010 +0000
hwmon: (via-cputemp) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 512504e9f5489dbe85c80fd2c1b44ab5a8e0d5fa
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:49 2010 +0000
hwmon: (smsc47m1) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit bf1a85eff87eeb0651b1c5b348d51206ec7c0ef5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:48 2010 +0000
hwmon: (smsc47b397) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 4b2515dbb94341db01db3208f9f40658c5e2a251
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:47 2010 +0000
hwmon: (sis5595) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 14a613cc23869d0ca69154bbc5816004fe201b17
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:46 2010 +0000
hwmon: (pkgtemp) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 2caec1343e0cfe59bacf3d4f67d69ab6283cc75b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:45 2010 +0000
hwmon: (pcf8591) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 5713017ec5e1a437ae4d0d196bce46d572eb7e1a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:41 2010 +0000
hwmon: (lm70) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 63366d37ad5dbb4f208b517c88ea4bd41738dbf7
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:40 2010 +0000
hwmon: (lis3lv02d) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 55d705cce829c37999f26a8d4f1dd701013e7920
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:38 2010 +0000
hwmon: (ibmaem) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit c95df1ae69b85d5f306d86164e245aae614b852a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:37 2010 +0000
hwmon: (core) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 1f923c7a6726b224b6b1b059da5a7f8e3dff1196
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:36 2010 +0000
hwmon: (hwmon-vid) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 53ab0e6888925ae3ebe931c060120b0f11c1923c
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:35 2010 +0000
hwmon: (hp_accel) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 22d3b41281b4c1a55086fa4dff7abb4f0c36403e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:34 2010 +0000
hwmon: (f71882fg) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit e54c5ad61f4e2c4fdfbdb8dff31fc604073d3550
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:33 2010 +0000
hwmon: (f71805f) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:32 2010 +0000
hwmon: (dme1737) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit f8bb8925682f355dc20f721bda7021ef13e5869f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:31 2010 +0000
hwmon: (coretemp) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit ac561494d48b92a41424cc87e2a02b545424643c
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:30 2010 +0000
hwmon: (asus_atk0110) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 4d630e2ba59a231c8e5031cc55e16737aa59af97
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:29 2010 +0000
hwmon: (asb1000) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 2e991201e4ebffb1fb32873d72e2ee4b499269c3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:27 2010 +0000
hwmon: (adt7470) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit fe826749aec090c6f9ab48502bb9a7777572b85b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:26 2010 +0000
hwmon: (abituguru3) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Added a few static strings to standardize logging messages.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 28ebfa13f97265e415fbe19795500a6d922a6c86
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 06:51:25 2010 +0000
hwmon: (abituguru) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Added a few static strings to standardize logging messages.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 2ad2c320a107aceeba984f97ab2a60064101f5d5
Author: Nick Bowler <nbowler@xxxxxxxxxxxxxxxx>
Date: Fri Jan 7 21:32:02 2011 -0500
pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
CONFIG_HAVE_PATA_PLATFORM, by virtue of where its defined, has a
dependency on CONFG_ATA and CONFIG_ATA_SFF. This causes Kconfig
warnings when it is selected by various architectures, such as
warning: (ARCH_VEXPRESS && <choice> || ARCH_RPC && <choice> || MACH_VPAC270 && ARCH_PXA || MACH_REALVIEW_PB11MP && ARCH_REALVIEW || MACH_REALVIEW_PBA8 && ARCH_REALVIEW || MACH_REALVIEW_PBX && ARCH_REALVIEW || MACH_BAST_IDE && ARCH_S3C2410 || MACH_ANUBIS && ARCH_S3C2410) selects HAVE_PATA_PLATFORM which has unmet direct dependencies (ATA && ATA_SFF)
Since this option is only used to control visibility of the
CONFIG_PATA_PLATFORM option and isn't itself visible in the menu,
it is straightforward to simply remove these dependencies rather
than adjust all the architectures.
Signed-off-by: Nick Bowler <nbowler@xxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit fc2698d5ec7e96ba2c94a942329cfa4c5d6085f7
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Wed Jan 5 21:59:49 2011 +0300
pata_hpt37x: actually limit HPT370 to UltraDMA/66
The driver clearly tries to limit HPT370[A] to UltraDMA/66 if the PCI clock is
less than 50 MHz but due to cut&paste type mistake this code has no effect...
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit b197f13b53681c606e59d7d9a8a1d2d54fd363fe
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Tue Dec 28 23:11:36 2010 +0300
pata_hpt3x2n: coding style cleanup
Fix 8 errors and 3 warnings given by checkpatch.pl:
- *switch* and *case* not on the same indentation level;
- no space between *for*/*switch*/*while* and open parenthesis;
- space between an unary operator and its operand;
- spaces before tabs;
- lines over 80 characters.
In addition to these changes, also do the following:
- add new line after variable definitions;
- fix the style of some multi-line comments.
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 49bfbd38bfc997e9081beabd758b2bd655d26a9c
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Tue Dec 28 23:09:27 2010 +0300
pata_hpt37x: coding style cleanup
Fix 12 errors and 15 warnings given by checkpatch.pl:
- *switch* and *case* not on the same indentation level;
- no space between *for*/*switch*/*while* and open parenthesis;
- space between an unary operator and its operand;
- drive blacklist arrays not being *const*;
- spaces before tabs;
- lines over 80 characters.
In addition to these changes, also do the following:
- add new line after variable definitions;
- fix the style of some multi-line comments.
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 28cd4b6b4850d7588f1033c3808314b6bc2150d5
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Tue Dec 28 23:06:38 2010 +0300
pata_hpt366: coding style cleanup
Fix 2 errors and 11 warnings given by checkpatch.pl:
- *switch* and *case* not on the same indentation level;
- no space between *switch* and open parenthesis;
- drive blacklist arrays not being *const*;
- spaces before tabs;
- lines over 80 characters.
In addition to these changes, also add new line after variable definition in
hpt36x_init_chipset()...
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit dfc7e3e37d4a22ed5fd3f6e8c9842cb1246fee4f
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Tue Dec 28 22:54:54 2010 +0300
pata_hpt3x2n: calculate average f_CNT
Allow hpt3x2n_pci_clock() to calculate the average f_CNT register value iff
HighPoint BIOS hasn't saved one, just like the 'pata_hpt37x' driver (reading
the full 16-bit register, unlike what that driver does), so that this driver
would work correctly on e.g. non-x86 machine with 66 MHz PCI.
I'm not sure why Alan has only done this in one driver and not the other...
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 0ca646db68d1bd7184dfc41362d0dd9d56c0e57e
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Tue Dec 28 21:46:40 2010 +0300
pata_hpt3x2n: clarify about HPT371N support
Commit 28e21c8c0d44cd63bad4c62f94ef0c5a1cb8402c (pata_hpt3x2n: Add HPT371N
support and other bits) forgot to update the driver's Kconfig entry, heading
comment, and module description (that also wrongly claims support of HPT302)
which may confuse users...
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 8e834c2e6d51e053c6bd23fec1d95529f618f760
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Sat Dec 25 22:44:01 2010 +0300
pata_hpt{37x|3x2n}: SATA mode filtering
The Marvell bridge chips used on HighPoint SATA cards do not seem to support
the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes; these cards are
based on HPT372/372A/372N/374 chips (judging from the vendor drivers), so
the Linux drivers need to have a mode_filter() method for these chips...
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 0c21e3aaf6ae85bee804a325aa29c325209180fd
Merge: 021db8e2bde53024a163fb4417a185de46fe77aa b2837fcf4994e699a4def002e26f274d95b387c1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 17:16:27 2011 -0800
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
hfsplus: spaces/indentation clean-up
hfsplus: C99 comments clean-up
hfsplus: over 80 character lines clean-up
hfsplus: fix an artifact in ioctl flag checking
hfsplus: flush disk caches in sync and fsync
hfsplus: optimize fsync
hfsplus: split up inode flags
hfsplus: write up fsync for directories
hfsplus: simplify fsync
hfsplus: avoid useless work in hfsplus_sync_fs
hfsplus: make sure sync writes out all metadata
hfsplus: use raw bio access for partition tables
hfsplus: use raw bio access for the volume headers
hfsplus: always use hfsplus_sync_fs to write the volume header
hfsplus: silence a few debug printks
hfsplus: fix option parsing during remount
Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}
commit 021db8e2bde53024a163fb4417a185de46fe77aa
Merge: 72eb6a791459c87a0340318840bb3bd9252b627b 07fe0351702b6f0c9749e80cdbcb758686b0fe9b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 17:08:46 2011 -0800
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
spi/omap: Fix DMA API usage in OMAP MCSPI driver
spi/imx: correct the test on platform_get_irq() return value
spi/topcliff: Typo fix threhold to threshold
spi/dw_spi Typo change diable to disable.
spi/fsl_espi: change the read behaviour of the SPIRF
spi/mpc52xx-psc-spi: move probe/remove to proper sections
spi/dw_spi: add DMA support
spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
spi/dw_spi: Fix too short timeout in spi polling loop
spi/pl022: convert running variable
spi/pl022: convert busy flag to a bool
spi/pl022: pass the returned sglen to the DMA engine
spi/pl022: map the buffers on the DMA engine
spi/topcliff_pch: Fix data transfer issue
spi/imx: remove autodetection
spi/pxa2xx: pass of_node to spi device and set a parent device
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
spi/pxa2xx: Add chipselect support for Sodaville
spi/pxa2xx: Consider CE4100's FIFO depth
spi/pxa2xx: Add CE4100 support
...
commit 72eb6a791459c87a0340318840bb3bd9252b627b
Merge: 23d69b09b78c4876e134f104a3814c30747c53f1 55ee4ef30241a62b700f79517e6d5ef2ddbefa67
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 17:02:58 2011 -0800
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits)
gameport: use this_cpu_read instead of lookup
x86: udelay: Use this_cpu_read to avoid address calculation
x86: Use this_cpu_inc_return for nmi counter
x86: Replace uses of current_cpu_data with this_cpu ops
x86: Use this_cpu_ops to optimize code
vmstat: User per cpu atomics to avoid interrupt disable / enable
irq_work: Use per cpu atomics instead of regular atomics
cpuops: Use cmpxchg for xchg to avoid lock semantics
x86: this_cpu_cmpxchg and this_cpu_xchg operations
percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
percpu,x86: relocate this_cpu_add_return() and friends
connector: Use this_cpu operations
xen: Use this_cpu_inc_return
taskstats: Use this_cpu_ops
random: Use this_cpu_inc_return
fs: Use this_cpu_inc_return in buffer.c
highmem: Use this_cpu_xx_return() operations
vmstat: Use this_cpu_inc_return for vm statistics
x86: Support for this_cpu_add, sub, dec, inc_return
percpu: Generic support for this_cpu_add, sub, dec, inc_return
...
Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c}
as per Tejun.
commit 23d69b09b78c4876e134f104a3814c30747c53f1
Merge: e744070fd4ff9d3114277e52d77afa21579adce2 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 16:58:04 2011 -0800
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
usb: don't use flush_scheduled_work()
speedtch: don't abuse struct delayed_work
media/video: don't use flush_scheduled_work()
media/video: explicitly flush request_module work
ioc4: use static work_struct for ioc4_load_modules()
init: don't call flush_scheduled_work() from do_initcalls()
s390: don't use flush_scheduled_work()
rtc: don't use flush_scheduled_work()
mmc: update workqueue usages
mfd: update workqueue usages
dvb: don't use flush_scheduled_work()
leds-wm8350: don't use flush_scheduled_work()
mISDN: don't use flush_scheduled_work()
macintosh/ams: don't use flush_scheduled_work()
vmwgfx: don't use flush_scheduled_work()
tpm: don't use flush_scheduled_work()
sonypi: don't use flush_scheduled_work()
hvsi: don't use flush_scheduled_work()
xen: don't use flush_scheduled_work()
gdrom: don't use flush_scheduled_work()
...
Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
commit 4ead36407b41eae942c8c9f70ef963cd369c90e2
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 10 19:43:34 2010 +0100
HID: roccat: Update sysfs attribute doc
Updated sysfs attribute documentation to reflect recent changes
in driver design. The device specific attributes moved from the
driver to the respective roccat char device.
Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 4d043101897768dfde30a6f2674fc7cec403d6b0
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Thu Dec 9 14:29:34 2010 +0100
HID: roccat: don't use #pragma pack
Replace #pragma pack ocurences with __atribute__((__packed__));
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 47dbdbffe15b9582a41727766d43f1d4208e977e
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 26 19:57:42 2010 +0000
HID: roccat: Add support for Roccat Kone[+] v2
This patch adds support for Roccat Kone[+] gaming mouse. Kone[+] is an enhanced version
of the old Kone with more memory for macros, a better sensor and more functionality.
This driver is conceptual similar to the existing Kone and Pyra drivers.
Userland tools can soon be found at http://sourceforge.net/projects/roccat
Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 14a057f80f0c4d45a9e68009f8bcb6b246e87ca0
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 26 19:57:38 2010 +0000
HID: roccat: reduce number of functions in kone and pyra drivers
The profile number is now passed via bin_attribute->private instead
of function parameter to reduce number of functions.
Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit bd3a2b96631dd86b06dca96aef00790084a11e15
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 26 19:57:36 2010 +0000
HID: roccat: declare meaning of pack pragma usage in driver headers
Using pack pragma to prevent padding bytes in binary data structures
used for hardware communication. Explanation of these pragmas was requested.
Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 5012aada506cb8b570e46579077c0ec5b82ebd5d
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 26 19:57:33 2010 +0000
HID: roccat: use class for char device for sysfs attribute creation
Adding sysfs attributes to an already created device raises no userland
notification. Now the device drivers associate the devices attributes
with a class and use this for roccat event char device creation.
Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit c97415a72521071c235e0879f9a600014afd87b1
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 26 19:57:29 2010 +0000
sysfs: Introducing binary attributes for struct class
Added dev_bin_attrs to struct class similar to existing dev_attrs.
Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit a7153258b70ccbe3922fcee9ca4271d4f4c2bc55
Merge: ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Sat Jan 8 01:08:19 2011 +0100
Merge branches 'upstream' and 'upstream-fixes' into for-linus
commit e14411da420bad7bdaae65cccd8787674e6c565e
Author: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Date: Tue Nov 30 13:06:36 2010 -0800
msm: add SMP support for msm
Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 9f1890a5de2a5fcf4fd9ffa3115047eed834349c
Author: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Date: Thu Dec 2 12:11:27 2010 -0800
msm: hotplug: support cpu hotplug on msm
Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 94790ec25fdd51dc4126cc176f2e104f80f87fcb
Author: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Date: Thu Dec 2 12:05:12 2010 -0800
msm: timer: SMP timer support for msm
The msm provides timer hardware that is private to each core. Each
timer has separate counter and match registers, so we create separate
clock_event_devices for each core. For the global clocksource, use
cpu 0's counter.
Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 7b181446c68768e2f3231a0885095ee41261dcde
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Thu Oct 14 19:19:21 2010 -0700
msm: scm-boot: Support for setting cold/warm boot addresses
Add support for setting the cold boot address of core 1 and
the warm boot addresses of cores 0 and 1 using a secure
domain call.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 2a1eb58a86514037c8b59eb13a14b0e2a9cc0fb3
Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Date: Fri Aug 27 10:01:23 2010 -0700
msm: Secure Channel Manager (SCM) support
SCM is the protocol used to communicate between the secure and
non-secure code executing on the applications processor. The
non-secure side uses a physically contiguous buffer to pass
information to the secure side; where the buffer conforms to a
format that is agreed upon by both sides. The use of a buffer
allows multiple pending requests to be in flight on the secure
side. It also benefits use cases where the command or response
buffer contains large chunks of data.
Reviewed-by: Saravana Kannan <skannan@xxxxxxxxxxxxxx>
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit e744070fd4ff9d3114277e52d77afa21579adce2
Merge: d004e4d3322340b6433caaef4a47ab8c933afb70 c9b5f501ef1580faa30c40c644b7691870462201
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:55:48 2011 -0800
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Constify function scope static struct sched_param usage
sched: Fix strncmp operation
sched: Move sched_autogroup_exit() to free_signal_struct()
sched: Fix struct autogroup memory leak
sched: Mark autogroup_init() __init
sched: Consolidate the name of root_task_group and init_task_group
commit d004e4d3322340b6433caaef4a47ab8c933afb70
Merge: 128283a47e7cc6754db3d2704004c1ed728d26db 1c2a48cf65580a276552151eb8f78d78c55b828e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:55:31 2011 -0800
Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: apic: Cleanup and simplify setup_local_APIC()
x86: Further simplify mp_irq info handling
x86: Unify 3 similar ways of saving mp_irqs info
x86, ioapic: Avoid writing io_apic id if already correct
x86, x2apic: Don't map lapic addr for preenabled x2apic systems
x86, sfi: Use register_lapic_address()
x86, apic: Use register_lapic_address() in init_apic_mapping()
x86, apic: Remove early_init_lapic_mapping()
x86, apic: Unify identical register_lapic_address() functions
commit 128283a47e7cc6754db3d2704004c1ed728d26db
Merge: 442d1ba237c81304ccfa33887094e843183645f7 6d5db4668796d903dc3bad2852c82073509c37d2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:54:03 2011 -0800
Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC, MCE: Fix NB error formatting
EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
EDAC, MCE: Enable MCE decoding on F15h
EDAC, MCE: Allow F15h bank 6 MCE injection
EDAC, MCE: Shorten error report formatting
EDAC, MCE: Overhaul error fields extraction macros
EDAC, MCE: Add F15h FP MCE decoder
EDAC, MCE: Add F15 EX MCE decoder
EDAC, MCE: Add an F15h NB MCE decoder
EDAC, MCE: No F15h LS MCE decoder
EDAC, MCE: Add F15h CU MCE decoder
EDAC, MCE: Add F15h IC MCE decoder
EDAC, MCE: Add F15h DC MCE decoder
EDAC, MCE: Select extended error code mask
commit 442d1ba237c81304ccfa33887094e843183645f7
Merge: fb5131e1880ea1ba3ba7197cd5cc66c9c288f715 a135cef79a2927ecff800492a26cd314e9cba996
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:53:42 2011 -0800
Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Disable DRAM ECC injection on K8
EDAC: Fixup scrubrate manipulation
amd64_edac: Remove two-stage initialization
amd64_edac: Check ECC capabilities initially
amd64_edac: Carve out ECC-related hw settings
amd64_edac: Remove PCI ECS enabling functions
amd64_edac: Remove explicit Kconfig PCI dependency
amd64_edac: Allocate driver instances dynamically
amd64_edac: Rework printk macros
amd64_edac: Rename CPU PCI devices
amd64_edac: Concentrate per-family init even more
amd64_edac: Cleanup the CPU PCI device reservation
amd64_edac: Simplify CPU family detection
amd64_edac: Add per-family init function
amd64_edac: Use cached extended CPU model
amd64_edac: Remove F11h support
commit fb5131e1880ea1ba3ba7197cd5cc66c9c288f715
Merge: d074b104cefcb6e8ded55a53e62fed59a246f55d 8e1023016cf17152972b98bce6c144834a4916d5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:50:50 2011 -0800
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits)
[S390] prevent unneccesary loops_per_jiffy recalculation
[S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
[S390] smp: remove cpu hotplug messages
[S390] mutex: enable spinning mutex on s390
[S390] mutex: Introduce arch_mutex_cpu_relax()
[S390] cio: fix ccwgroup unregistration race condition
[S390] perf: add DWARF register lookup for s390
[S390] cleanup ftrace backend functions
[S390] ptrace cleanup
[S390] smp/idle: call init_idle() before starting a new cpu
[S390] smp: delay idle task creation
[S390] dasd: Correct retry counter for terminated I/O.
[S390] dasd: Add support for raw ECKD access.
[S390] dasd: Prevent deadlock during suspend/resume.
[S390] dasd: Improve handling of stolen DASD reservation
[S390] dasd: do path verification for paths added at runtime
[S390] dasd: add High Performance FICON multitrack support
[S390] cio: reduce memory consumption of itcw structures
[S390] nmi: enable machine checks early
[S390] qeth: buffer count imbalance
...
commit d074b104cefcb6e8ded55a53e62fed59a246f55d
Merge: 31b6ca0af758a88e5e769b48cc6dde037ee37b96 c413521eb4e2d7ffd5ce432a144708d479054bd3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:50:14 2011 -0800
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits)
ARM: mach-shmobile: update for SMP changes.
ARM: mach-shmobile: update for GIC changes.
ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
dma: shdma: don't register the global die notifier multiple times
ARM: mach-shmobile: Rely on run-time IRQ handlers
ARM: mach-shmobile: Run-time IRQ handler for GIC
ARM: mach-shmobile: Run-time IRQ handler for INTCA
ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
ARM: mach-shmobile: Use shared GIC entry macros
ARM: mach-shmobile: mackerel: Add zboot support
ARM: mach-shmobile: mackerel: Add HDMI sound support
ARM: mach-shmobile: mackerel: add HDMI video support
ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
ARM: mach-shmobile: sh73a0: fix div4 table
ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
ARM: mach-shmobile: Mackerel VGA camera support
mmc: sh_mmcif: make DMA support by the driver unconditional
ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
ARM: mach-shmobile: sh73a0 GPIO pullup improvement
...
commit 31b6ca0af758a88e5e769b48cc6dde037ee37b96
Merge: 56b85f32d530d09d6805488ad00775d4e0e3baab 554738da71004d96e06fb75f4772dfc3b0f47810
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:45:47 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)
Input: wacom_w8001 - support pen or touch only devices
Input: wacom_w8001 - use __set_bit to set keybits
Input: bu21013_ts - fix misuse of logical operation in place of bitop
Input: i8042 - add Acer Aspire 5100 to the Dritek list
Input: wacom - add support for digitizer in Lenovo W700
Input: psmouse - disable the synaptics extension on OLPC machines
Input: psmouse - fix up Synaptics comment
Input: synaptics - ignore bogus mt packet
Input: synaptics - add multi-finger and semi-mt support
Input: synaptics - report clickpad property
input: mt: Document interface updates
Input: fix double equality sign in uevent
Input: introduce device properties
hid: egalax: Add support for Wetab (726b)
Input: include MT library as source for kerneldoc
MAINTAINERS: Update input-mt entry
hid: egalax: Add support for Samsung NB30 netbook
hid: egalax: Document the new devices in Kconfig
hid: egalax: Add support for Wetab
hid: egalax: Convert to MT slots
...
Fixed up trivial conflict in drivers/input/keyboard/Kconfig
commit 56b85f32d530d09d6805488ad00775d4e0e3baab
Merge: 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 568389c257fa7d74ce36c2f78bad31965fded4cf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 14:39:20 2011 -0800
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
serial: apbuart: Fixup apbuart_console_init()
TTY: Add tty ioctl to figure device node of the system console.
tty: add 'active' sysfs attribute to tty0 and console device
drivers: serial: apbuart: Handle OF failures gracefully
Serial: Avoid unbalanced IRQ wake disable during resume
tty: fix typos/errors in tty_driver.h comments
pch_uart : fix warnings for 64bit compile
8250: fix uninitialized FIFOs
ip2: fix compiler warning on ip2main_pci_tbl
specialix: fix compiler warning on specialix_pci_tbl
rocket: fix compiler warning on rocket_pci_ids
8250: add a UPIO_DWAPB32 for 32 bit accesses
8250: use container_of() instead of casting
serial: omap-serial: Add support for kernel debugger
serial: fix pch_uart kconfig & build
drivers: char: hvc: add arm JTAG DCC console support
RS485 documentation: add 16C950 UART description
serial: ifx6x60: fix memory leak
serial: ifx6x60: free IRQ on error
Serial: EG20T: add PCH_UART driver
...
Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).
commit 4a198be7f072190a44033b7de6084b090b9885ee
Author: Albert Astals Cid <aacid@xxxxxxx>
Date: Fri Jan 7 17:29:44 2011 -0500
Support KHLB2 in the compal laptop driver
Add the KHLB2 model identifier to the list of supported models
Signed-off-by: Albert Astals Cid <aacid@xxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 59ccf2f3d55c06fd34613f1f78de0279436a7b35
Author: From: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Date: Fri Jan 7 17:25:14 2011 -0500
acer-wmi: Enabled Acer Launch Manager mode
Enabled Acer Launch Manager mode to disable the EC raw behavior for
communication devices when WMID3 method available. And, we also add a
ec_raw_mode kernel module option for enable The EC raw behavior mode
when anyone what reset it back.
When Acer Launch Manager mode enabled, EC will stop to touch any
communication devices' RF state or power state that causes conflict
with rfkill_input or any userland daemon to charge the rfkill rules.
Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Acked-by: Thomas Renninger <trenn@xxxxxxx>
Acked-by: Jiri Benc <jbenc@xxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
Cc: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 456dc301cc3b547b2a674de3028f53fb1453e532
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Dec 31 09:48:20 2010 +0800
[PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
Latest kernel has many changes in IRQ subsystem and its interfaces, like adding
"irq_eoi" for struct irq_chip, this patch will make it support both the new
and old interface.
Cc: Alek Du <alek.du@xxxxxxxxx>
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 213658516fd5e125eb7a97995f6cae8996f8015b
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Fri Dec 24 19:56:28 2010 +0100
ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
Hi,
In drivers/platform/x86/thinkpad_acpi.c::acpi_evalf() we don't always call
va_end() after va_start(). This patch corrects that.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 466449cfe797b8a5d82d25d0e0e08426d8dfba19
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date: Mon Dec 13 10:02:41 2010 +0800
acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
Initial wlan/bluetooth/wwan rfkill software block state when acer-wmi driver
probe. Acer notebook can save the devices state and this patch can use it to
initial the devices' rfkill state.
Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Acked-by: Thomas Renninger <trenn@xxxxxxx>
Cc: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 6c3df88f19375217f0dbfc6160e8c2a635f56c53
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date: Tue Dec 7 10:29:23 2010 +0800
acer-wmi: Detect the WiFi/Bluetooth/3G devices available
Check the Acer OEM-specific Type AA to detect the WiFi/Bluetooth/3G
devices available or not, and set the devices capability flag.
Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Reviewed-by: Jean Delvare <jdelvare@xxxxxxx>
Reviewed-by: Dmitry Torokhov <dtor@xxxxxxx>
Acked-by: Thomas Renninger <trenn@xxxxxxx>
Acked-by: Jiri Benc <jbenc@xxxxxxx>
Cc: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
Cc: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit b3c9092b2fed427d45117d23ceb577ad8dc46a9a
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date: Tue Dec 7 10:29:22 2010 +0800
acer-wmi: Add 3G rfkill sysfs file
Add 3G rfkill sysfs file for provide userland to control 3G device
on/off by using WMI method.
Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Acked-by: Thomas Renninger <trenn@xxxxxxx>
Acked-by: Jiri Benc <jbenc@xxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Carlos Corbaho <carlos@xxxxxxxxxxxxxxxxxxx>
Cc: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 3fdca87d10f1d45b1c034da343e68beb082f9b84
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date: Tue Dec 7 10:29:20 2010 +0800
acer-wmi: Add acer wmi hotkey events support
Add acer wmi hotkey event support. Install a wmi notify handler to
transfer wmi event key to key code, then send out keycode through acer
wmi input device to userland.
Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Acked-by: Thomas Renninger <trenn@xxxxxxx>
Acked-by: Jiri Benc <jbenc@xxxxxxx>
Signed-off-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
Cc: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit e98062ed6dc46ed3270350e1040e19d44150d1d1
Author: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Wed Dec 8 11:20:26 2010 +0100
platform/x86: Kconfig: Replace select by depends on ACPI_WMI
With 'make oldnoconfig' I see these warnings in linux-next (next-20101208):
drivers/platform/x86/Kconfig:422:error: recursive dependency detected!
drivers/platform/x86/Kconfig:422: symbol EEEPC_WMI depends on ACPI_WMI
drivers/platform/x86/Kconfig:438: symbol ACPI_WMI is selected by ACER_WMI
drivers/platform/x86/Kconfig:18: symbol ACER_WMI depends on LEDS_CLASS
drivers/leds/Kconfig:10: symbol LEDS_CLASS is selected by EEEPC_WMI
This patch replaces all "select on ACPI_WMI" by "depends on ACPI_WMI".
Quote from David Woodhouse:
"A better policy is: "NEVER USE SELECT"."
Reported-and-tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit c1f73658edc8ac6f624968b47a276361ce032ca9
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date: Mon Dec 13 18:01:12 2010 +0800
ideapad: pass ideapad_priv as argument (part 2)
Passing ideapad_priv as argument and try not to using too much global variable.
This is part 2 for rfkill.
Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 8693ae846cad00e6c2c40e116ec1fc50c145b559
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date: Mon Dec 13 18:01:01 2010 +0800
ideapad: pass ideapad_priv as argument (part 1)
Passing ideapad_priv as argument and try not to using too much global variable.
This is part 1 for platform driver and input device.
Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit a4b5a2794a27da870c2e16db390778a4683f95f8
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date: Mon Dec 13 18:00:48 2010 +0800
ideapad: add markups, unify comments and return result when init
1. Add markups on init and exit functions
2. Unify the comments in the same style
3. Return result when module initial
Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit f63409ae91ff94e2192dafbeb00c278ba299f80e
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date: Mon Dec 13 18:00:38 2010 +0800
ideapad: add hotkey support
Hotkey enabled by this patch:
Fn+F3: Video mode switch
Fn+F5: software rfkill for wifi
For some ideapad when push Fn+F3, hardware generates Super-P keys, those key
will not be enabled by this patch.
Thanks for Dave Hansen report the problem. If CONFIG_INPUT_SPARSEKMAP is not
set, when building, you will have error message:
ERROR: "sparse_keymap_setup" [drivers/platform/x86/ideapad-laptop.ko] undefined!
ERROR: "sparse_keymap_free" [drivers/platform/x86/ideapad-laptop.ko] undefined!
ERROR: "sparse_keymap_report_event" [drivers/platform/x86/ideapad-laptop.ko] undefined!
To select INPUT_SPARSEKMAP solve this issue.
Ref: http://lkml.org/lkml/2010/12/2/340
Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit c9f718d0c6b4cf8033aa0f5ac892d68ddfb865aa
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date: Mon Dec 13 18:00:27 2010 +0800
ideapad: let camera power control entry under platform driver
The entry was at /sys/devices/LNXSYSTM:00/../VPC2004:00/camera_power
move to /sys/devices/platform/ideapad/camera_power
Add document about usage of ideapad node in sysfs.
Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 98ee69191d3af68e2292528cbb16dcba3d8e2b81
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date: Mon Dec 13 18:00:15 2010 +0800
ideapad: add platform driver for ideapad
Create /sys/devices/platform/ideapad for nodes of ideapad landing.
Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 9c23225006b695ceba31c035b287f5a7a0b0304e
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Wed Dec 8 00:04:14 2010 +0900
fujitsu-laptop: fix compiler warning on pnp_ids
Annotate pnp_ids as '__used' to fix following warning:
CC drivers/platform/x86/fujitsu-laptop.o
drivers/platform/x86/fujitsu-laptop.c:1243: warning: â??pnp_idsâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit e1e0dacba5af2b0cd8f9043d0b937296c90bc990
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 16:44:23 2010 -0500
WMI: return error if wmi_create_device() fails
The break resets the retval to 0 but we want to return an error code.
This was introduced in c64eefd48c4 "WMI: embed struct device directly
into wmi_block"
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
commit d358cb55a4cc83c37fbaebc0e4401a573777c6ac
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:14 2010 +0100
eeepc-wmi: never load if legacy device is enabled
If legacy device (SB.ATKD - ASUS010) used by eeepc-laptop
is enabled, don't allow eeepc-wmi to load because:
- eeepc-laptop may be loaded, and can conflict with
eeepc-wmi (they both try to register eeepc::touchpad
led for example).
- the WMI interface is inteded to be used when the OS is
not detected as Win 7. And when this is the case, the
ASUS010 device is disabled.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 62a75d83131c8887237d26a36ffeabd53c3640fd
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:13 2010 +0100
eeepc-laptop: add a getter for touchpad led
Allow te get the current led state in a more accurate way.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit dfed65d56f9a94466bb4afd44ec8e900a6709cda
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:12 2010 +0100
eeepc-wmi: remove unneeded static
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 4c4edfa3d375109c1360ce786b9df984ca65d727
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:11 2010 +0100
eeepc-wmi: claim eeepc-wmi maintainership
Since eeepc-wmi has currently no official maintainer, I claim
maintainership of this driver, and add it to the acpi4asus project.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 2a3f0064f2a06d5a31cddb0e452681d9f884bd8c
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:10 2010 +0100
eeepc-wmi: fix confusion between ctrl_param and retval
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 8c1b2d83e82e11b9447d7fb3715d6c9764f6f28d
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:09 2010 +0100
eeepc-wmi: add debugfs entries
eeepc-wmi/ - debugfs root directory
dev_id - current dev_id
ctrl_param - current ctrl_param
devs - call DEVS(dev_id, ctrl_param) and print result
dsts - call DSTS(dev_id) and print result
DEVS and DSTS are the main functions used in eeepc-wmi, this
will allow to test new features without patching the drivers.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 4e37b42d5ac0d3f505bcdc09028f3fde82031593
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:08 2010 +0100
eeepc-wmi: use attribute group to manage attributes
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit ba48fdb969d0404d54f6fa0266373afecbbd19d7
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:07 2010 +0100
eeepc-wmi: add rfkill support for wlan, bluetooth and 3g
wimax support is missing because I don't have any DSDT
with WMI and wimax support.
Most of the code comes from eeepc-laptop.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 084fca63128849c0961b3cfdb0cd0345e8f51ad8
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:06 2010 +0100
eeepc-wmi: add touchpad led support
Most of the code comes from eeepc-laptop.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 27c136c8738f6bec10c26aaf0a486f19edef7bf7
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Mon Nov 29 08:14:05 2010 +0100
eeepc-wmi: rework eeepc_wmi_init and eeepc_wmi_exit
The old code was using platform_driver.probe to initialize
eeepc_wmi context. That's a mistake because if probe fail,
eeepc_platform_register() won't tell anyone, and chaos will happen.
Wrap add and remove code inside eeepc_wmi_add() / eeepc_wmi_remove(),
and try to use the static platform_device only in eeepc_wmi_init()
and eeepc_wmi_exit()
The code is now very similar to eeepc-laptop, except eeepc_laptop_add
and eeepc_laptop_remove are called from acpi_driver, not module
init/exit functions, but WMI doesn't provide such functionalities (yet ?).
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 72135d21b587debcbcc57e0dbcc8bcfa4dacb661
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Dec 6 16:46:19 2010 -0500
classmate-laptop: add missing input_sync call
Add missing input_sync call in cmpc_keys_handler function.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
commit 698e1641a37f833dd26ee2fde5eed426cd97880b
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Tue Nov 30 16:30:43 2010 -0200
classmate-laptop: little optimization for cmpc_rfkill_block
We don't need to call bios/acpi (cmpc_set_rfkill_wlan) if the blocked
state is already set to the same value (little optimization). This can
happen for example if we initialize the module with same initial
hardware state (rfkill core always call cmpc_rfkill_block on
initialization here).
Also GWRI method only accepts 0 or 1 for setting rfkill block, as can be
seen on AML code from acpidump->DSDT from a classmate sample I have, so
should be fine setting state only to 0 or 1 directly.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
commit 58f6425eb92f54943878b0b3f9c1e51f99c2cb72
Author: Colin King <colin.king@xxxxxxxxxxxxx>
Date: Fri Nov 19 15:40:02 2010 +0000
WMI: Cater for multiple events with same GUID
WMI data blocks can contain WMI events with the same GUID but with
different notifiy_ids, for example volume up/down hotkeys.
This patch enables a single event handler to be registered and
unregistered against all events with same GUID but different
notify_ids. Since an event handler is passed the notify_id of
an event it can can differentiate between the different events.
The patch also ensures we only register and unregister a device per
unique GUID.
Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 3098064d3b4a9bf9d2855b2a89599ad77695e324
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 19:04:38 2010 -0800
drivers/platform/x86: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 5369c02d951afc72d68f5f85089160a63d31ca37
Author: Sreedhara DS <sreedhara.ds@xxxxxxxxx>
Date: Fri Oct 22 15:43:55 2010 +0100
intel_scu_ipc: Utility driver for intel scu ipc
This driver implements ioctl and interfaces with intel scu ipc driver. It
is used to access pmic/msic registers from user space and firmware update
utility.
Signed-off-by: Sreedhara DS <sreedhara.ds@xxxxxxxxx>
[Extensive clean up and debug]
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit ee81b786a07f1d6062d6e14b6152f1f6cc4bc63b
Author: maximilian attems <max@xxxxxxx>
Date: Fri Jan 7 16:13:06 2011 +0100
deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
hdrpackage and headerpackage are not intuitive names,
use proposed alternatives by Michel Marek.
While touching them move the mkdir of the kernel_headers dir up
and fix it for paranoid umask.
CC: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: maximilian attems <max@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 3e5b08cbbf78bedd316904ab0cf3b27119433ee5
Merge: da40d036fd716f0efb2917076220814b1e927ae1 2af10844eb6ed104f9505bf3a7ba3ceb02264f31
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 13:16:28 2011 -0800
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
USB: serial: ftdi_sio: add support for TIOCSERGETLSR
USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
usb: ehci-omap: fix tll channel enable mask
usb: ohci-omap3: fix trivial typo
USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
USB: gadget: update ci13xxx to work with g_ether
USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
Revert "USB: musb: pm: don't rely fully on clock support"
Revert "USB: musb: blackfin: pm: make it work"
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
USB: uas: Ensure we only bind to a UAS interface
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
USB: uas: Use kzalloc instead of kmalloc
USB: uas: Fix up the Sense IU
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
usb: gadget: g_ncm added
...
Manually fix up trivial conflicts in USB Kconfig changes in:
arch/arm/mach-omap2/Kconfig
arch/sh/Kconfig
drivers/usb/Kconfig
drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
commit da40d036fd716f0efb2917076220814b1e927ae1
Merge: aa58abc20fa85328a9f048e2626c0893691ff284 c32e061fa19893ce4acf95d97d5613a161f0f1b7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 12:47:02 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (147 commits)
[SCSI] arcmsr: fix write to device check
[SCSI] lpfc: lower stack use in lpfc_fc_frame_check
[SCSI] eliminate an unnecessary local variable from scsi_remove_target()
[SCSI] libiscsi: use bh locking instead of irq with session lock
[SCSI] libiscsi: do not take host lock in queuecommand
[SCSI] be2iscsi: fix null ptr when accessing task hdr
[SCSI] be2iscsi: fix gfp use in alloc_pdu
[SCSI] libiscsi: add more informative failure message during iscsi scsi eh
[SCSI] gdth: Add missing call to gdth_ioctl_free
[SCSI] bfa: remove unused defintions and misc cleanups
[SCSI] bfa: remove inactive functions
[SCSI] bfa: replace bfa_assert with WARN_ON
[SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
[SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
[SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
[SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
[SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
[SCSI] qla2xxx: Remove redundant module parameter permission bits
[SCSI] qla2xxx: Add sysfs node for displaying board temperature.
[SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
...
commit aa58abc20fa85328a9f048e2626c0893691ff284
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Jan 7 20:47:37 2011 +0100
input/tc3589x: fix compile error
There was a semi-colon missing and it broke the compile.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 07fe0351702b6f0c9749e80cdbcb758686b0fe9b
Author: Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx>
Date: Fri Jan 7 15:49:20 2011 +0000
spi/omap: Fix DMA API usage in OMAP MCSPI driver
Running the latest kernel on the 4430SDP board with DMA API debugging
enabled results in this:
WARNING: at lib/dma-debug.c:803 check_unmap+0x19c/0x6f0()
NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated
[device address=0x000000008129901a] [size=260 bytes]
Modules linked in:
Backtrace:
[<c003cbe0>] (dump_backtrace+0x0/0x10c) from [<c0278da8>] (dump_stack+0x18/0x1c)
r7:c1839dc0 r6:c0198578 r5:c0304b17 r4:00000323
[<c0278d90>] (dump_stack+0x0/0x1c) from [<c005b158>] (warn_slowpath_common+0x58/0x70)
[<c005b100>] (warn_slowpath_common+0x0/0x70) from [<c005b214>] (warn_slowpath_fmt+0x38/0x40)
r8:c1839e40 r7:00000000 r6:00000104 r5:00000000 r4:8129901a
[<c005b1dc>] (warn_slowpath_fmt+0x0/0x40) from [<c0198578>] (check_unmap+0x19c/0x6f0)
r3:c03110de r2:c0304e6b
[<c01983dc>] (check_unmap+0x0/0x6f0) from [<c0198cd8>] (debug_dma_unmap_page+0x74/0x80)
[<c0198c64>] (debug_dma_unmap_page+0x0/0x80) from [<c01d5ad8>] (omap2_mcspi_work+0x514/0xbf0)
[<c01d55c4>] (omap2_mcspi_work+0x0/0xbf0) from [<c006dfb0>] (process_one_work+0x294/0x400)
[<c006dd1c>] (process_one_work+0x0/0x400) from [<c006e50c>] (worker_thread+0x220/0x3f8)
[<c006e2ec>] (worker_thread+0x0/0x3f8) from [<c00738d0>] (kthread+0x88/0x90)
[<c0073848>] (kthread+0x0/0x90) from [<c005e924>] (do_exit+0x0/0x5fc)
r7:00000013 r6:c005e924 r5:c0073848 r4:c1829ee0
---[ end trace 1b75b31a2719ed20 ]---
I've no idea why this driver uses NULL for dma_unmap_single instead of
the &spi->dev that is laying around just waiting to be used in that
function - but it's an easy fix.
Also replace this comment with a FIXME comment:
/* Do DMA mapping "early" for better error reporting and
* dcache use. Note that if dma_unmap_single() ever starts
* to do real work on ARM, we'd need to clean up mappings
* for previous transfers on *ALL* exits of this loop...
*/
as the comment is not true - we do work in dma_unmap() functions,
particularly on ARMv6 and above. I've corrected the existing unmap
functions but if any others are required they must be added ASAP.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d
Merge: 01539ba2a706ab7d35fc0667dff919ade7f87d63 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510
Author: Tony Luck <tony.luck@xxxxxxxxx>
Date: Fri Jan 7 09:17:33 2011 -0800
Pull misc2.6.38 into release branch
commit 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510
Author: Tony Luck <tony.luck@xxxxxxxxx>
Date: Fri Jan 7 09:11:55 2011 -0800
[IA64] Avoid array overflow if there are too many cpus in SRAT table
acpi_numa_init() has to parse the whole SRAT table, even if the
kernel wants to limit the number of cpus it will use (because the
ones it is going to use may be described by entries at the end of
the SRAT table). Avoid overflowing the node_cpuid array.
Reported-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
commit 735759389b7143f95ae7badc97511e7e4729e873
Author: Richard Genoud <richard.genoud@xxxxxxxxx>
Date: Fri Jan 7 15:26:01 2011 +0100
spi/imx: correct the test on platform_get_irq() return value
The test "if (spi_imx->irq <= 0)" is not testing the IRQ value, but
the return value of platform_get_irq(). As platform_get_irq() can
return an error (-ENXIO) or the IRQ value it found, the test should be
"if (spi_imx->irq < 0)"
[grant.likely: Note: In general, Linux irq number 0 should also mean
no irq, but arm still allows devices to be assigned 0, and the imx
platform uses 0 for one of the spi devices, so this patch is needed
for the device to work]
Signed-off-by: Richard Genoud <richard.genoud@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit b4a45f5fe8078bfc10837dbd5b98735058bc4698
Merge: 01539ba2a706ab7d35fc0667dff919ade7f87d63 b3e19d924b6eaf2ca7d22cba99a517c5171007b6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Jan 7 08:56:33 2011 -0800
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits)
fs: scale mntget/mntput
fs: rename vfsmount counter helpers
fs: implement faster dentry memcmp
fs: prefetch inode data in dcache lookup
fs: improve scalability of pseudo filesystems
fs: dcache per-inode inode alias locking
fs: dcache per-bucket dcache hash locking
bit_spinlock: add required includes
kernel: add bl_list
xfs: provide simple rcu-walk ACL implementation
btrfs: provide simple rcu-walk ACL implementation
ext2,3,4: provide simple rcu-walk ACL implementation
fs: provide simple rcu-walk generic_check_acl implementation
fs: provide rcu-walk aware permission i_ops
fs: rcu-walk aware d_revalidate method
fs: cache optimise dentry and inode for rcu-walk
fs: dcache reduce branches in lookup path
fs: dcache remove d_mounted
fs: fs_struct use seqlock
fs: rcu-walk for path lookup
...
commit e68077856e599cd33d8cd5db15762df60c29d361
Author: maximilian attems <max@xxxxxxx>
Date: Sat Jan 1 16:44:13 2011 +0100
deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
userland dev likes latest incarnation of that userland API.
make it easy to also build it on make deb-pkg invocation:
dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.
Last year patch rebased on top of latest deb-pkg changes.
Signed-off-by: maximilian attems <max@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067
Author: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Date: Tue Dec 21 14:18:49 2010 +0800
xen: HVM X2APIC support
This patch is similiar to Gleb Natapov's patch for KVM, which enable the
hypervisor to emulate x2apic feature for the guest. By this way, the emulation
of lapic would be simpler with x2apic interface(MSR), and faster.
[v2: Re-organized 'xen_hvm_need_lapic' per Ian Campbell suggestion]
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
commit 2904ed8dd5a748c52caf4d8b09d3d9834b5932fa
Author: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Date: Tue Dec 21 14:18:48 2010 +0800
apic: Move hypervisor detection of x2apic to hypervisor.h
Then we can reuse it for Xen later.
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Acked-by: Avi Kivity <avi@xxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
commit c9b5f501ef1580faa30c40c644b7691870462201
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Fri Jan 7 13:41:40 2011 +0100
sched: Constify function scope static struct sched_param usage
Function-scope statics are discouraged because they are
easily overlooked and can cause subtle bugs/races due to
their global (non-SMP safe) nature.
Linus noticed that we did this for sched_param - at minimum
make the const.
Suggested-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: Message-ID: <AANLkTinotRxScOHEb0HgFgSpGPkq_6jKTv5CfvnQM=ee@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 524429c31b486c05449666b94613f59f729c0a84
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Thu Jan 6 20:58:12 2011 +0800
sched: Fix strncmp operation
One of the operands, buf, is incorrect, since it is stripped and the
correct address for subsequent string comparing could change if
leading white spaces, if any, are removed from buf.
It is fixed by replacing buf with cmp.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <AANLkTinOPuYsVovrZpbuCCmG5deEyc8WgA_A1RJx_YK7@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 1c5354de90c900b369e2ebd36c3a065ede29eb93
Author: Mike Galbraith <efault@xxxxxx>
Date: Wed Jan 5 11:16:04 2011 +0100
sched: Move sched_autogroup_exit() to free_signal_struct()
Per Oleg's suggestion, undo fork failure free/put_signal_struct change,
and move sched_autogroup_exit() to free_signal_struct() instead.
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Reviewed-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1294222564.8369.6.camel@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e9aa1dd19fe49b5aed3ca94aab87576e534d2a39
Author: Mike Galbraith <efault@xxxxxx>
Date: Wed Jan 5 11:11:25 2011 +0100
sched: Fix struct autogroup memory leak
Seems I lost a change somewhere, leaking memory.
sched: fix struct autogroup memory leak
Add missing change to actually use autogroup_free().
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1294222285.8369.2.camel@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0ca0873555c0abe17b28c25b19f82857c0ddd2bc
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date: Fri Jan 7 12:43:45 2011 +0800
sched: Mark autogroup_init() __init
autogroup_init() is only called at boot time.
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1294375425-31065-1-git-send-email-yong.zhang0@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 07e06b011db2b3300f6c975ebf293fc4c8c59942
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date: Fri Jan 7 15:17:36 2011 +0800
sched: Consolidate the name of root_task_group and init_task_group
root_task_group is the leftover of USER_SCHED, now it's always
same to init_task_group.
But as Mike suggested, root_task_group is maybe the suitable name
to keep for a tree.
So in this patch:
init_task_group --> root_task_group
init_task_group_load --> root_task_group_load
INIT_TASK_GROUP_LOAD --> ROOT_TASK_GROUP_LOAD
Suggested-by: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20110107071736.GA32635@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 39177ec36236fb71257e51d0d198437b84170911
Author: Peter Korsgaard <jacmet@xxxxxxxxxx>
Date: Thu Jan 6 16:42:45 2011 +0100
nconf: handle comment entries within choice/endchoice
Equivalent to af6c1598 (kconfig: handle comment entries within
choice/endchoice), but for nconfig instead.
Implement support for comment entries within choice groups. Comment entries
are displayed visually distinct from normal configs, and selecting them is
a no-op.
Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit bc91c9f313309915f6ec767f56f78dcd0305b20f
Author: Roland Stigge <stigge@xxxxxxxxx>
Date: Fri Dec 17 17:19:17 2010 +0100
mkuboot.sh: Fail if mkimage is missing
on building an uImage, I get:
$ make uImage
CHK include/linux/version.h
CHK include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date.
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
Kernel: arch/arm/boot/Image is ready
SHIPPED arch/arm/boot/compressed/lib1funcs.S
AS arch/arm/boot/compressed/lib1funcs.o
LD arch/arm/boot/compressed/vmlinux
OBJCOPY arch/arm/boot/zImage
Kernel: arch/arm/boot/zImage is ready
UIMAGE arch/arm/boot/uImage
"mkimage" command not found - U-Boot images will not be built
Image arch/arm/boot/uImage is ready
$
I.e. it says: "uImage is ready" even though the uImage file doesn't
exist because mkimage is missing.
I propose the attached patch.
Signed-off-by: Roland Stigge <stigge@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 1c2a48cf65580a276552151eb8f78d78c55b828e
Merge: 0aa002fe602939370e9476e5ec32b562000a0425 cb600d2f83c854ec3d6660063e4466431999489b
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Jan 7 14:14:15 2011 +0100
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Thu Oct 14 13:34:03 2010 -0400
m68knommu: Need to check __get_user()/__put_user() result
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 8972be4d44fbec0b2e1d7b68874fb61c5bf7b06a
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Oct 12 22:38:04 2010 -0400
m68knommu: signal.c __user annotations
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit a19185c32dbe975ce1ee86f5fa457f69b1d7f53b
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Oct 12 22:26:22 2010 -0400
m68knommu: Equivalent of "m68k: handle new gcc's"
... from back in 2004; again, it's ifdefed out by CONFIG_FPU.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit e64f1b7520fa12c8e8e08161a2841ec5510774ac
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Oct 12 22:19:54 2010 -0400
m68knommu: f_pcr has been gone since headers' merge
sure, it's effectively ifdefed out, but still...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 089e449a82cd5ba8a858dfea88e754afb9341037
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 11 23:35:08 2010 -0400
m68knommu: Don't lose state if sigframe setup fails
exact parallel to m68k analog
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit d1574df7e01d427c2ed80ada11433a72907ca472
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 11 23:29:28 2010 -0400
m68knommu: Handle multiple pending signals
we shouldn't bugger off to userland when there still are
pending signals; among other things it makes e.g. SIGSEGV
triggered by failure to build a sigframe to be delivered
_now_ and not when we hit the next syscall or interrupt.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 710e91e455caf5cfec02892d667b41f312ec166c
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 11 17:09:20 2010 -0400
m68knommu: Switch to saner sigsuspend
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit bf814b45d560b22e8657ca44d0ae6941ab9d8d36
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 11 16:56:23 2010 -0400
m68knommu: Don't bother with SA_ONESHOT
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 8c18194f6c0a638565f2074d1dcabfbe590f396d
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Thu Oct 14 13:35:05 2010 -0400
m68k: Check __get_user()/__put_user() return value
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit bd6f56a75bb2a65b3a1b8d14a9787fdaadae71c1
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 11 23:13:51 2010 -0400
m68k: Missing syscall_trace() on sigreturn
If we leave sigreturn via ret_from_signal, we end up with syscall
trace only on entry, leading to very unhappy strace, among other
things. Note that this means different behaviours for signals
delivered while we were in pagefault and for ones delivered while
we were in interrupt...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit ea52b58ccbda49aeb23eb424ce05bba3cb0bc976
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Wed Oct 6 14:09:43 2010 -0400
m68k: Fix stack mangling logics in sigreturn
a) we should hold modifying regs->format until we know we *will* be
doing stack expansion; otherwise attacker can modify sigframe to
have wrong ->sc_formatvec and install SIGSEGV handler.
b) we should *not* mix copying saved extra stuff from userland with
expanding the stack; once we'd done that manual memmove, we'd better
not return to C, so cleanup is very hard to do. The easiest way
is to copy it on stack first, making sure we won't overwrite on stack
expansion. Fortunately that's easy to do...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 90731d7537317ad5d9672187f7a1dff90b29bb12
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Sun Oct 3 01:36:58 2010 -0400
m68k: If we fail to set sigframe up, just leave regs alone...
Same principle as with the previous patch - do not destroy the
state if sigframe setup fails. Incidentally, it's actually
_less_ work - we don't need to go through adjust_stack dance
on failure if we don't touch regs->stkadj until we know we'd
written sigframe out.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit f85741eb5fb2653fd9138b4bef68396615c720f7
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Sun Oct 3 01:15:49 2010 -0400
m68k: Don't lose state if sigframe setup fails
If we'd failed in setup_frame(), we've no place to store
the original sigmask. It's not an unrecoverable situation -
we raise SIGSEGV, but that SIGSEGV might be successfully
handled (e.g. on altstack). In that case we really don't
want sa_mask of original signal permanently slapped on
the set of blocked signals.
Standard solution: have setup_frame()/setup_rt_frame()
report failure and don't mess with the signal-related
state if that has happened...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 9e4930dbf17c1eba72631cd52a0c621da3d1a816
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Sat Oct 2 22:57:30 2010 -0400
m68k: Simplify the singlestepping handling in signals
Instead of checking the return value of do_signal() we can just do
the work (raise SIGTRAP and clear SR.T1) directly in handle_signal(),
when setting the sigframe up. Simplifies the assembler glue and is
closer to the way we do it on other targets.
Note that do_delayed_trace does *not* disappear; it's still needed
to deal with single-stepping through syscall, since 68040 doesn't
raise the trace exception at all if the trap exception is pending.
We hit it after returning from sys_...() if TIF_DELAYED_TRACE is
set; all that has changed is that we don't reuse it for "single-step
into the handler" codepath.
As the result, do_signal() doesn't need to return anything anymore.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit e68847fee706c6fe74c9afc3288c3adfc131b1fa
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Wed Sep 29 23:28:59 2010 -0400
m68k: Switch to saner sigsuspend()
and saner do_signal() arguments, while we are at it
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 35fc157baf56db846afaeb5c730fa47e351cf0d2
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Wed Sep 29 23:10:47 2010 -0400
m68k: Resetting sa_handler in local copy of k_sigaction is pointless
... and had been such since the introduction of get_signal_to_deliver()
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 6d5db4668796d903dc3bad2852c82073509c37d2
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Thu Nov 25 15:40:27 2010 +0100
EDAC, MCE: Fix NB error formatting
Minor formatting fixup since the information which core was associated
with the MCE is not always valid.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 50adbbd8a8e572ad2533eace228c841ec84028a3
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Nov 13 11:44:26 2010 -0500
EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
Building for X86_32 produces shift count warnings, so use BIT_64() to
eliminate the warnings.
drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Doug Thompson <dougthompson@xxxxxxxxxxxx>
Cc: bluesmoke-devel@xxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit bad11e031862294265145d87dd4be1ae4af0d57f
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 17:44:51 2010 +0200
EDAC, MCE: Enable MCE decoding on F15h
Now that everything is inplace, enable MCE decoding on F15h. Make
initcall routine a bit more readable.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Tue Nov 9 19:41:49 2010 +0100
EDAC, MCE: Allow F15h bank 6 MCE injection
F15h adds a sixth MCE bank: adjust bank number check in the injection
code.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit fa7ae8cc8c88c0679eab24c5a1b5d3b134a5f542
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 17:42:27 2010 +0200
EDAC, MCE: Shorten error report formatting
Shorten up MCi_STATUS flags and add BD's new deferred and poison types.
Also, simplify formatting.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 6245288232516aadf293f575d1812dafb4696aee
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 16:08:37 2010 +0200
EDAC, MCE: Overhaul error fields extraction macros
Make macro names shorter thus making code shorter and more clear.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit b8f85c477bdf1fec98ea7cbe952fdb5f40eb0aa7
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 15:37:58 2010 +0200
EDAC, MCE: Add F15h FP MCE decoder
Add decoder for FP MCEs.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 8259a7e5724c42c89d927b92cda3e0ab15b9ade9
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 15:28:59 2010 +0200
EDAC, MCE: Add F15 EX MCE decoder
Integrate the single FIROB signature into an expanded table along with
the new BD MCE types.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 05cd667d668eb08845dd49c02130e5223121b715
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 15:06:24 2010 +0200
EDAC, MCE: Add an F15h NB MCE decoder
by (almost) reusing the F10h one since the signatures are the same.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit b18434cad1740466f7a1c304ea4af0f4d3c874f1
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Sep 22 11:53:32 2010 +0200
EDAC, MCE: No F15h LS MCE decoder
F15h BD doesn't generate LS MCEs so warn about it.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 70fdb494aa8c82f76745d5a32b8abc505813557c
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Tue Sep 21 20:45:10 2010 +0200
EDAC, MCE: Add F15h CU MCE decoder
MCE bank 2 is redefined from a BU to a CU (Combined Unit) bank on F15h.
Add a decoder function for CU MCEs.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 86039cd401e1780573733870f9c0bd458fc96ea2
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Mon Nov 8 15:03:35 2010 +0100
EDAC, MCE: Add F15h IC MCE decoder
Add support for decoding F15h IC MCEs.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 25a4f8b05917f8137bfff8a3f8c6c8c1ac561208
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Sep 17 19:22:34 2010 +0200
EDAC, MCE: Add F15h DC MCE decoder
Add a decoder for F15h DC MCEs to support the new types of DC MCEs
introduced by the BD microarchitecture.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 2be64bfac71378e1aa8c20031a499bd55e391244
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Sep 17 19:11:47 2010 +0200
EDAC, MCE: Select extended error code mask
F15h enlarges the extended error code of an MCE to a 5-bit field
(MCi_STATUS[20:16]). Add a mask variable which default 0xf is overridden
on F15h.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit a135cef79a2927ecff800492a26cd314e9cba996
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Nov 26 19:24:44 2010 +0100
amd64_edac: Disable DRAM ECC injection on K8
K8 does not allow for an atomic RMW to a cacheline as F10h does so
disable the error injection interface for it.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 390944439f746824faec51b576f50cb5ef18745b
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Nov 24 19:52:09 2010 +0100
EDAC: Fixup scrubrate manipulation
Make the ->{get|set}_sdram_scrub_rate return the actual scrub rate
bandwidth it succeeded setting and remove superfluous arg pointer used
for that. A negative value returned still means that an error occurred
while setting the scrubrate. Document this for future reference.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 360b7f3c602ed80ce8c6b2585dcb76883a440c17
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 15 19:25:38 2010 +0200
amd64_edac: Remove two-stage initialization
Now that all prerequisites are in place, drop the two-stage driver
instances initialization in favor of the following simple init sequence:
1. Probe PCI device: we only test ECC capabilities here and if none exit
early.
2. If the hw supports ECC and it is/can be enabled, we init the per-node
instance.
Remove "amd64_" prefix from static functions touched, while at it.
There actually should be no visible functional change resulting from
this patch.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 2299ef7114000f8e403797b7f9a972f54bc05fad
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 15 17:44:04 2010 +0200
amd64_edac: Check ECC capabilities initially
Rework the code to check the hardware ECC capabilities at PCI probing
time. We do all further initialization only if we actually can/have ECC
enabled.
While at it:
0. Fix function naming.
1. Simplify/clarify debug output.
2. Remove amd64_ prefix from the static functions
3. Reorganize code.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit ae7bb7c679e7ddba6c52d1a78a30f9bc868d9738
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Thu Oct 14 16:01:30 2010 +0200
amd64_edac: Carve out ECC-related hw settings
This is in preparation for the init path reorganization where we want
only to
1) test whether a particular node supports ECC
2) can it be enabled
and only then do the necessary allocation/initialization. For that,
we need to decouple the ECC settings of the node from the instance's
descriptor.
The should be no functional change introduced by this patch.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit f1db274e1ba7004909de4a9cee62f631c030ba3e
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Thu Oct 14 14:37:13 2010 +0200
amd64_edac: Remove PCI ECS enabling functions
PCI ECS is being enabled by default since 2.6.26 on AMD so this code is
just superfluous now, remove it.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 027dbd6f5d419c25750d6a26c5c46f46f2093a11
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Oct 13 22:12:15 2010 +0200
amd64_edac: Remove explicit Kconfig PCI dependency
AMD_NB pulls in the dependency on PCI. Clarify/fix help text while at it.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit cc4d8860fc37dd315b16a43202400d822ab63221
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Wed Oct 13 16:11:59 2010 +0200
amd64_edac: Allocate driver instances dynamically
Remove static allocation in favor of dynamically allocating space for as
many driver instances as northbridges present on the system.
There should be no functional change resulting from this patch.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 24f9a7fe3f19f3fd310f556364d01a22911724b3
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Thu Oct 7 18:29:15 2010 +0200
amd64_edac: Rework printk macros
Add a macro per printk level, shorten up error messages. Add relevant
information to KERN_INFO level. No functional change.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 8d5b5d9c7b86e44fda29a367db3ccd2815a52f7c
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 20:11:07 2010 +0200
amd64_edac: Rename CPU PCI devices
Rename variables representing PCI devices to their BKDG names for faster
search and shorter, clearer code.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit b8cfa02f833a614e80f851747c4ce14989a4cfd0
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 19:35:38 2010 +0200
amd64_edac: Concentrate per-family init even more
Move the remaining per-family init code into the proper place and
simplify the rest of the initialization. Reorganize error handling in
amd64_init_one_instance().
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit bbd0c1f675d7d64fc02393d4985a069be5037b54
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 19:27:58 2010 +0200
amd64_edac: Cleanup the CPU PCI device reservation
Shorten code and clarify comments, return proper -E* values on error.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 0092b20d4cf3de243b5c82b410ee02644cec2707
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 19:20:05 2010 +0200
amd64_edac: Simplify CPU family detection
Concentrate CPU family detection in the per-family init function.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 395ae783b384e5243804b07fba3e3f8379ddf1d6
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 18:38:19 2010 +0200
amd64_edac: Add per-family init function
Run a per-family init function which does all the settings based on
the family this driver instance is running on. Move the scrubrate
calculation in it and simplify code.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 9f56da0e3c3269abe0b2745a54f1b082c3c14433
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 19:44:53 2010 +0200
amd64_edac: Use cached extended CPU model
... instead of computing it needlessly again.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 3ab0e7dc2e1d5598da609ec9a9bcd3b69b8fa654
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Fri Oct 1 18:19:06 2010 +0200
amd64_edac: Remove F11h support
F11h doesn't support DRAM ECC so whack it away.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit b3e19d924b6eaf2ca7d22cba99a517c5171007b6
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:11 2011 +1100
fs: scale mntget/mntput
The problem that this patch aims to fix is vfsmount refcounting scalability.
We need to take a reference on the vfsmount for every successful path lookup,
which often go to the same mount point.
The fundamental difficulty is that a "simple" reference count can never be made
scalable, because any time a reference is dropped, we must check whether that
was the last reference. To do that requires communication with all other CPUs
that may have taken a reference count.
We can make refcounts more scalable in a couple of ways, involving keeping
distributed counters, and checking for the global-zero condition less
frequently.
- check the global sum once every interval (this will delay zero detection
for some interval, so it's probably a showstopper for vfsmounts).
- keep a local count and only taking the global sum when local reaches 0 (this
is difficult for vfsmounts, because we can't hold preempt off for the life of
a reference, so a counter would need to be per-thread or tied strongly to a
particular CPU which requires more locking).
- keep a local difference of increments and decrements, which allows us to sum
the total difference and hence find the refcount when summing all CPUs. Then,
keep a single integer "long" refcount for slow and long lasting references,
and only take the global sum of local counters when the long refcount is 0.
This last scheme is what I implemented here. Attached mounts and process root
and working directory references are "long" references, and everything else is
a short reference.
This allows scalable vfsmount references during path walking over mounted
subtrees and unattached (lazy umounted) mounts with processes still running
in them.
This results in one fewer atomic op in the fastpath: mntget is now just a
per-CPU inc, rather than an atomic inc; and mntput just requires a spinlock
and non-atomic decrement in the common case. However code is otherwise bigger
and heavier, so single threaded performance is basically a wash.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit c6653a838b1b2738561aff0b8c0f62a9b714bdd9
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:10 2011 +1100
fs: rename vfsmount counter helpers
Suggested by Andreas, mnt_ prefix is clearer namespace, follows kernel
conventions better, and is easier for tab complete. I introduced these
names so I'll admit they were not good choices.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 9d55c369bb5e695e629bc35cba2ef607755b3bee
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:09 2011 +1100
fs: implement faster dentry memcmp
The standard memcmp function on a Westmere system shows up hot in
profiles in the `git diff` workload (both parallel and single threaded),
and it is likely due to the costs associated with trapping into
microcode, and little opportunity to improve memory access (dentry
name is not likely to take up more than a cacheline).
So replace it with an open-coded byte comparison. This increases code
size by 8 bytes in the critical __d_lookup_rcu function, but the
speedup is huge, averaging 10 runs of each:
git diff st user sys elapsed CPU
before 1.15 2.57 3.82 97.1
after 1.14 2.35 3.61 96.8
git diff mt user sys elapsed CPU
before 1.27 3.85 1.46 349
after 1.26 3.54 1.43 333
Elapsed time for single threaded git diff at 95.0% confidence:
-0.21 +/- 0.01
-5.45% +/- 0.24%
It's -0.66% +/- 0.06% elapsed time on my Opteron, so rep cmp costs on the
fam10h seem to be relatively smaller, but there is still a win.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit e1bb57826381199cc79fbf44e9dfeee58fc7b339
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:08 2011 +1100
fs: prefetch inode data in dcache lookup
This makes single threaded git diff -1.25% +/- 0.05% elapsed time on my
2s12c24t Westmere system, and -0.86% +/- 0.05% on my 2s8c Barcelona, by
prefetching the important first cacheline of the inode in while we do the
actual name compare and other operations on the dentry.
There was no measurable slowdown in the single file stat case, or the creat
case (where negative dentries would be common).
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 4b936885ab04dc6e0bb0ef35e0e23c1a7364d9e5
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:07 2011 +1100
fs: improve scalability of pseudo filesystems
Regardless of how much we possibly try to scale dcache, there is likely
always going to be some fundamental contention when adding or removing children
under the same parent. Pseudo filesystems do not seem need to have connected
dentries because by definition they are disconnected.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 873feea09ebc980cbd3631b767356ce1eee65ec1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:06 2011 +1100
fs: dcache per-inode inode alias locking
dcache_inode_lock can be replaced with per-inode locking. Use existing
inode->i_lock for this. This is slightly non-trivial because we sometimes
need to find the inode from the dentry, which requires d_inode to be
stabilised (either with refcount or d_lock).
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit ceb5bdc2d246f6d81cf61ed70f325308a11821d2
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:05 2011 +1100
fs: dcache per-bucket dcache hash locking
We can turn the dcache hash locking from a global dcache_hash_lock into
per-bucket locking.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 626d607435617cc0f033522083e2bb195b81813c
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:04 2011 +1100
bit_spinlock: add required includes
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 4e35e6070b1ceed89c3bba2af4216c286fb1dafd
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:03 2011 +1100
kernel: add bl_list
Introduce a type of hlist that can support the use of the lowest bit in the
hlist_head. This will be subsequently used to implement per-bucket bit spinlock
for inode and dentry hashes, and may be useful in other cases such as network
hashes.
Reviewed-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 880566e17c4fce0d998d92610d32fcb9506aa6dd
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:02 2011 +1100
xfs: provide simple rcu-walk ACL implementation
This simple implementation just checks for no ACLs on the inode, and
if so, then the rcu-walk may proceed, otherwise fail it.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 258a5aa8dfc6294f5f7df892023ee4d3e57c9841
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:01 2011 +1100
btrfs: provide simple rcu-walk ACL implementation
This simple implementation just checks for no ACLs on the inode, and
if so, then the rcu-walk may proceed, otherwise fail it.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 73598611ade7c85f0c3d52ba5130103f6709c6d3
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:50:00 2011 +1100
ext2,3,4: provide simple rcu-walk ACL implementation
This simple implementation just checks for no ACLs on the inode, and
if so, then the rcu-walk may proceed, otherwise fail it.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 1e1743ebe35ec7e3c1fa732408358fbc614cbbe5
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:59 2011 +1100
fs: provide simple rcu-walk generic_check_acl implementation
This simple implementation just checks for no ACLs on the inode, and
if so, then the rcu-walk may proceed, otherwise fail it.
This could easily be extended to put acls under RCU and check them
under seqlock, if need be. But this implementation is enough to show
the rcu-walk aware permissions code for path lookups is working, and
will handle cases where there are no ACLs or ACLs in just the final
element.
This patch implicity converts tmpfs to rcu-aware permission check.
Subsequent patches onvert ext*, xfs, and, btrfs. Each of these uses
acl/permission code in a different way, so convert them all to provide
templates and proof of concept.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit b74c79e99389cd79b31fcc08f82c24e492e63c7e
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:58 2011 +1100
fs: provide rcu-walk aware permission i_ops
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 34286d6662308d82aed891852d04c7c3a2649b16
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:57 2011 +1100
fs: rcu-walk aware d_revalidate method
Require filesystems be aware of .d_revalidate being called in rcu-walk
mode (nd->flags & LOOKUP_RCU). For now do a simple push down, returning
-ECHILD from all implementations.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 44a7d7a878c9cbb74f236ea755b25b6b2e26a9a9
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:56 2011 +1100
fs: cache optimise dentry and inode for rcu-walk
Put dentry and inode fields into top of data structure. This allows RCU path
traversal to perform an RCU dentry lookup in a path walk by touching only the
first 56 bytes of the dentry.
We also fit in 8 bytes of inline name in the first 64 bytes, so for short
names, only 64 bytes needs to be touched to perform the lookup. We should
get rid of the hash->prev pointer from the first 64 bytes, and fit 16 bytes
of name in there, which will take care of 81% rather than 32% of the kernel
tree.
inode is also rearranged so that RCU lookup will only touch a single cacheline
in the inode, plus one in the i_ops structure.
This is important for directory component lookups in RCU path walking. In the
kernel source, directory names average is around 6 chars, so this works.
When we reach the last element of the lookup, we need to lock it and take its
refcount which requires another cacheline access.
Align dentry and inode operations structs, so members will be at predictable
offsets and we can group common operations into head of structure.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit fb045adb99d9b7c562dc7fef834857f78249daa1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:55 2011 +1100
fs: dcache reduce branches in lookup path
Reduce some branches and memory accesses in dcache lookup by adding dentry
flags to indicate common d_ops are set, rather than having to check them.
This saves a pointer memory access (dentry->d_op) in common path lookup
situations, and saves another pointer load and branch in cases where we
have d_op but not the particular operation.
Patched with:
git grep -E '[.>]([[:space:]])*d_op([[:space:]])*=' | xargs sed -e 's/\([^\t ]*\)->d_op = \(.*\);/d_set_d_op(\1, \2);/' -e 's/\([^\t ]*\)\.d_op = \(.*\);/d_set_d_op(\&\1, \2);/' -i
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:54 2011 +1100
fs: dcache remove d_mounted
Rather than keep a d_mounted count in the dentry, set a dentry flag instead.
The flag can be cleared by checking the hash table to see if there are any
mounts left, which is not time critical because it is performed at detach time.
The mounted state of a dentry is only used to speculatively take a look in the
mount hash table if it is set -- before following the mount, vfsmount lock is
taken and mount re-checked without races.
This saves 4 bytes on 32-bit, nothing on 64-bit but it does provide a hole I
might use later (and some configs have larger than 32-bit spinlocks which might
make use of the hole).
Autofs4 conversion and changelog by Ian Kent <raven@xxxxxxxxxx>:
In autofs4, when expring direct (or offset) mounts we need to ensure that we
block user path walks into the autofs mount, which is covered by another mount.
To do this we clear the mounted status so that follows stop before walking into
the mount and are essentially blocked until the expire is completed. The
automount daemon still finds the correct dentry for the umount due to the
follow mount logic in fs/autofs4/root.c:autofs4_follow_link(), which is set as
an inode operation for direct and offset mounts only and is called following
the lookup that stopped at the covered mount.
At the end of the expire the covering mount probably has gone away so the
mounted status need not be restored. But we need to check this and only restore
the mounted status if the expire failed.
XXX: autofs may not work right if we have other mounts go over the top of it?
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit c28cc36469554dc55540f059fbdc7fa22a2c31fc
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:53 2011 +1100
fs: fs_struct use seqlock
Use a seqlock in the fs_struct to enable us to take an atomic copy of the
complete cwd and root paths. Use this in the RCU lookup path to avoid a
thread-shared spinlock in RCU lookup operations.
Multi-threaded apps may now perform path lookups with scalability matching
multi-process apps. Operations such as stat(2) become very scalable for
multi-threaded workload.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 31e6b01f4183ff419a6d1f86177cbf4662347cec
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:52 2011 +1100
fs: rcu-walk for path lookup
Perform common cases of path lookups without any stores or locking in the
ancestor dentry elements. This is called rcu-walk, as opposed to the current
algorithm which is a refcount based walk, or ref-walk.
This results in far fewer atomic operations on every path element,
significantly improving path lookup performance. It also avoids cacheline
bouncing on common dentries, significantly improving scalability.
The overall design is like this:
* LOOKUP_RCU is set in nd->flags, which distinguishes rcu-walk from ref-walk.
* Take the RCU lock for the entire path walk, starting with the acquiring
of the starting path (eg. root/cwd/fd-path). So now dentry refcounts are
not required for dentry persistence.
* synchronize_rcu is called when unregistering a filesystem, so we can
access d_ops and i_ops during rcu-walk.
* Similarly take the vfsmount lock for the entire path walk. So now mnt
refcounts are not required for persistence. Also we are free to perform mount
lookups, and to assume dentry mount points and mount roots are stable up and
down the path.
* Have a per-dentry seqlock to protect the dentry name, parent, and inode,
so we can load this tuple atomically, and also check whether any of its
members have changed.
* Dentry lookups (based on parent, candidate string tuple) recheck the parent
sequence after the child is found in case anything changed in the parent
during the path walk.
* inode is also RCU protected so we can load d_inode and use the inode for
limited things.
* i_mode, i_uid, i_gid can be tested for exec permissions during path walk.
* i_op can be loaded.
When we reach the destination dentry, we lock it, recheck lookup sequence,
and increment its refcount and mountpoint refcount. RCU and vfsmount locks
are dropped. This is termed "dropping rcu-walk". If the dentry refcount does
not match, we can not drop rcu-walk gracefully at the current point in the
lokup, so instead return -ECHILD (for want of a better errno). This signals the
path walking code to re-do the entire lookup with a ref-walk.
Aside from the final dentry, there are other situations that may be encounted
where we cannot continue rcu-walk. In that case, we drop rcu-walk (ie. take
a reference on the last good dentry) and continue with a ref-walk. Again, if
we can drop rcu-walk gracefully, we return -ECHILD and do the whole lookup
using ref-walk. But it is very important that we can continue with ref-walk
for most cases, particularly to avoid the overhead of double lookups, and to
gain the scalability advantages on common path elements (like cwd and root).
The cases where rcu-walk cannot continue are:
* NULL dentry (ie. any uncached path element)
* parent with d_inode->i_op->permission or ACLs
* dentries with d_revalidate
* Following links
In future patches, permission checks and d_revalidate become rcu-walk aware. It
may be possible eventually to make following links rcu-walk aware.
Uncached path elements will always require dropping to ref-walk mode, at the
very least because i_mutex needs to be grabbed, and objects allocated.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 3c22cd5709e8143444a6d08682a87f4c57902df3
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:51 2011 +1100
kernel: optimise seqlock
Add branch annotations for seqlock read fastpath, and introduce
__read_seqcount_begin and __read_seqcount_end functions, that can avoid the
smp_rmb() if used carefully. These will be used by store-free path walking
algorithm performance is critical and seqlocks are in use.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit ff0c7d15f9787b7e8c601533c015295cc68329f8
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:50 2011 +1100
fs: avoid inode RCU freeing for pseudo fs
Pseudo filesystems that don't put inode on RCU list or reachable by
rcu-walk dentries do not need to RCU free their inodes.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:49 2011 +1100
fs: icache RCU free inodes
RCU free the struct inode. This will allow:
- Subsequent store-free path walking patch. The inode must be consulted for
permissions when walking, so an RCU inode reference is a must.
- sb_inode_list_lock to be moved inside i_lock because sb list walkers who want
to take i_lock no longer need to take sb_inode_list_lock to walk the list in
the first place. This will simplify and optimize locking.
- Could remove some nested trylock loops in dcache code
- Could potentially simplify things a bit in VM land. Do not need to take the
page lock to follow page->mapping.
The downsides of this is the performance cost of using RCU. In a simple
creat/unlink microbenchmark, performance drops by about 10% due to inability to
reuse cache-hot slab objects. As iterations increase and RCU freeing starts
kicking over, this increases to about 20%.
In cases where inode lifetimes are longer (ie. many inodes may be allocated
during the average life span of a single inode), a lot of this cache reuse is
not applicable, so the regression caused by this patch is smaller.
The cache-hot regression could largely be avoided by using SLAB_DESTROY_BY_RCU,
however this adds some complexity to list walking and store-free path walking,
so I prefer to implement this at a later date, if it is shown to be a win in
real situations. I haven't found a regression in any non-micro benchmark so I
doubt it will be a problem.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 77812a1ef139d84270d27faacc0630c887411013
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:48 2011 +1100
fs: consolidate dentry kill sequence
The tricky locking for disposing of a dentry is duplicated 3 times in the
dcache (dput, pruning a dentry from the LRU, and pruning its ancestors).
Consolidate them all into a single function dentry_kill.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit ec33679d78f9d653a44ddba10b5fb824c06330a1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:47 2011 +1100
fs: use RCU in shrink_dentry_list to reduce lock nesting
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit be182bff72fae6a3eb25624b39170c40b72f0909
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:46 2011 +1100
fs: reduce dcache_inode_lock width in lru scanning
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 89e6054836a7b1e7500cd70a14b5579e752c9250
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:45 2011 +1100
fs: dcache reduce prune_one_dentry locking
prune_one_dentry can avoid quite a bit of locking in the common case where
ancestors have an elevated refcount. Alternatively, we could have gone the
other way and made fewer trylocks in the case where d_count goes to zero, but
is probably less common.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit a734eb458ab2bd11479a27dd54f48e1b26a55845
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:44 2011 +1100
fs: dcache reduce d_parent locking
Use RCU to simplify locking in dget_parent.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit dc0474be3e27463d4d4a2793f82366eed906f223
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:43 2011 +1100
fs: dcache rationalise dget variants
dget_locked was a shortcut to avoid the lazy lru manipulation when we already
held dcache_lock (lru manipulation was relatively cheap at that point).
However, how that the lru lock is an innermost one, we never hold it at any
caller, so the lock cost can now be avoided. We already have well working lazy
dcache LRU, so it should be fine to defer LRU manipulations to scan time.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 357f8e658bba8a085c4a5d4331e30894be8096b8
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:42 2011 +1100
fs: dcache reduce dcache_inode_lock
dcache_inode_lock can be avoided in d_delete() and d_materialise_unique()
in cases where it is not required.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 89ad485f01fd83c47f17a128db3bd7b89c0f244f
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:41 2011 +1100
fs: dcache reduce locking in d_alloc
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 61f3dee4af09528997a970280da240577bf60721
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:40 2011 +1100
fs: dcache reduce dput locking
It is possible to run dput without taking data structure locks up-front. In
many cases where we don't kill the dentry anyway, these locks are not required.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 58db63d086790eec2ed433f9d8c4962239809cf8
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:39 2011 +1100
fs: dcache avoid starvation in dcache multi-step operations
Long lived dcache "multi-step" operations which retry on rename seq can
be starved with a lot of rename activity. If they fail after the 1st pass,
take the rename_lock for writing to avoid further starvation.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit b5c84bf6f6fa3a7dfdcb556023a62953574b60ee
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:38 2011 +1100
fs: dcache remove dcache_lock
dcache_lock no longer protects anything. remove it.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 949854d02455080d20cd3e1db28a3a18daf7599d
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:37 2011 +1100
fs: Use rename lock and RCU for multi-step operations
The remaining usages for dcache_lock is to allow atomic, multi-step read-side
operations over the directory tree by excluding modifications to the tree.
Also, to walk in the leaf->root direction in the tree where we don't have
a natural d_lock ordering.
This could be accomplished by taking every d_lock, but this would mean a
huge number of locks and actually gets very tricky.
Solve this instead by using the rename seqlock for multi-step read-side
operations, retry in case of a rename so we don't walk up the wrong parent.
Concurrent dentry insertions are not serialised against. Concurrent deletes
are tricky when walking up the directory: our parent might have been deleted
when dropping locks so also need to check and retry for that.
We can also use the rename lock in cases where livelock is a worry (and it
is introduced in subsequent patch).
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 9abca36087288fe28de4749c71ca003d4b9e3ed0
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:36 2011 +1100
fs: increase d_name lock coverage
Cover d_name with d_lock in more cases, where there may be concurrent
modification to it.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit b23fb0a60379a95e10c671f646b259ea2558421e
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:35 2011 +1100
fs: scale inode alias list
Add a new lock, dcache_inode_lock, to protect the inode's i_dentry list
from concurrent modification. d_alias is also protected by d_lock.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 2fd6b7f50797f2e993eea59e0a0b8c6399c811dc
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:34 2011 +1100
fs: dcache scale subdirs
Protect d_subdirs and d_child with d_lock, except in filesystems that aren't
using dcache_lock for these anyway (eg. using i_mutex).
Note: if we change the locking rule in future so that ->d_child protection is
provided only with ->d_parent->d_lock, it may allow us to reduce some locking.
But it would be an exception to an otherwise regular locking scheme, so we'd
have to see some good results. Probably not worthwhile.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit da5029563a0a026c64821b09e8e7b4fd81d3fe1b
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:33 2011 +1100
fs: dcache scale d_unhashed
Protect d_unhashed(dentry) condition with d_lock. This means keeping
DCACHE_UNHASHED bit in synch with hash manipulations.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit b7ab39f631f505edc2bbdb86620d5493f995c9da
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:32 2011 +1100
fs: dcache scale dentry refcount
Make d_count non-atomic and protect it with d_lock. This allows us to ensure a
0 refcount dentry remains 0 without dcache_lock. It is also fairly natural when
we start protecting many other dentry members with d_lock.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 2304450783dfde7b0b94ae234edd0dbffa865073
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:31 2011 +1100
fs: dcache scale lru
Add a new lock, dcache_lru_lock, to protect the dcache LRU list from concurrent
modification. d_lru is also protected by d_lock, which allows LRU lists to be
accessed without the lru lock, using RCU in future patches.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 789680d1ee9311cdf095241dc02bd9784d799cd1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:30 2011 +1100
fs: dcache scale hash
Add a new lock, dcache_hash_lock, to protect the dcache hash table from
concurrent modification. d_hash is also protected by d_lock.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit ec2447c278ee973d35f38e53ca16ba7f965ae33d
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:29 2011 +1100
hostfs: simplify locking
Remove dcache_lock locking from hostfs filesystem, and move it into dcache
helpers. All that is required is a coherent path name. Protection from
concurrent modification of the namespace after path name generation is not
provided in current code, because dcache_lock is dropped before the path is
used.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit b1e6a015a580ad145689ad1d6b4aa0e03e6c868b
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:28 2011 +1100
fs: change d_hash for rcu-walk
Change d_hash so it may be called from lock-free RCU lookups. See similar
patch for d_compare for details.
For in-tree filesystems, this is just a mechanical change.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 621e155a3591962420eacdd39f6f0aa29ceb221e
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:27 2011 +1100
fs: change d_compare for rcu-walk
Change d_compare so it may be called from lock-free RCU lookups. This
does put significant restrictions on what may be done from the callback,
however there don't seem to have been any problems with in-tree fses.
If some strange use case pops up that _really_ cannot cope with the
rcu-walk rules, we can just add new rcu-unaware callbacks, which would
cause name lookup to drop out of rcu-walk mode.
For in-tree filesystems, this is just a mechanical change.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit fb2d5b86aff355a27ebfc132d3c99f4a940cc3fe
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:26 2011 +1100
fs: name case update method
smpfs and ncpfs want to update a live dentry name in-place. Rather than
have them open code the locking, provide a documented dcache API.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 2bc334dcc7c77be3700dd443d92a78603f76976b
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:25 2011 +1100
jfs: dont overwrite dentry name in d_revalidate
Use vfat's method for dealing with negative dentries to preserve case,
rather than overwrite dentry name in d_revalidate, which is a bit ugly
and also gets in the way of doing lock-free path walking.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 79eb4dde742fe2e9c9e301432b894a7410261ce7
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:24 2011 +1100
cifs: dont overwrite dentry name in d_revalidate
Use vfat's method for dealing with negative dentries to preserve case,
rather than overwrite dentry name in d_revalidate, which is a bit ugly
and also gets in the way of doing lock-free path walking.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit fe15ce446beb3a33583af81ffe6c9d01a75314ed
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:23 2011 +1100
fs: change d_delete semantics
Change d_delete from a dentry deletion notification to a dentry caching
advise, more like ->drop_inode. Require it to be constant and idempotent,
and not take d_lock. This is how all existing filesystems use the callback
anyway.
This makes fine grained dentry locking of dput and dentry lru scanning
much simpler.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 5eef7fa905c814826f518aca2d414ca77508ce30
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:22 2011 +1100
fs: dcache documentation cleanup
Remove redundant (and incorrect, since dcache RCU lookup) dentry locking
documentation and point to the canonical document.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit fbc8d4c04626e015b18cc61199f505920abb48f0
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:21 2011 +1100
config fs: avoid switching ->d_op on live dentry
Switching d_op on a live dentry is racy in general, so avoid it. In this case
it is a negative dentry, which is safer, but there are still concurrent ops
which may be called on d_op in that case (eg. d_revalidate). So in general
a filesystem may not do this. Fix configfs so as not to do this.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 5adcee1d8d32d7f305f6f5aaefdbf8f35adca177
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:20 2011 +1100
cgroup fs: avoid switching ->d_op on live dentry
Switching d_op on a live dentry is racy in general, so avoid it. In this case
it is a negative dentry, which is safer, but there are still concurrent ops
which may be called on d_op in that case (eg. d_revalidate). So in general
a filesystem may not do this. Fix cgroupfs so as not to do this.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 3e880fb5e4bb6a012035e3edd0586ee2817c2e24
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:19 2011 +1100
fs: use fast counters for vfs caches
percpu_counter library generates quite nasty code, so unless you need
to dynamically allocate counters or take fast approximate value, a
simple per cpu set of counters is much better.
The percpu_counter can never be made to work as well, because it has an
indirection from pointer to percpu memory, and it can't use direct
this_cpu_inc interfaces because it doesn't use static PER_CPU data, so
code will always be worse.
In the fastpath, it is the difference between this:
incl %gs:nr_dentry # nr_dentry
and this:
movl percpu_counter_batch(%rip), %edx # percpu_counter_batch,
movl $1, %esi #,
movq $nr_dentry, %rdi #,
call __percpu_counter_add # (plus I clobber registers)
__percpu_counter_add:
pushq %rbp #
movq %rsp, %rbp #,
subq $32, %rsp #,
movq %rbx, -24(%rbp) #,
movq %r12, -16(%rbp) #,
movq %r13, -8(%rbp) #,
movq %rdi, %rbx # fbc, fbc
#APP
# 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1
movq %gs:kernel_stack,%rax #, pfo_ret__
# 0 "" 2
#NO_APP
incl -8124(%rax) # <variable>.preempt_count
movq 32(%rdi), %r12 # <variable>.counters, tcp_ptr__
#APP
# 78 "lib/percpu_counter.c" 1
add %gs:this_cpu_off, %r12 # this_cpu_off, tcp_ptr__
# 0 "" 2
#NO_APP
movslq (%r12),%r13 #* tcp_ptr__, tmp73
movslq %edx,%rax # batch, batch
addq %rsi, %r13 # amount, count
cmpq %rax, %r13 # batch, count
jge .L27 #,
negl %edx # tmp76
movslq %edx,%rdx # tmp76, tmp77
cmpq %rdx, %r13 # tmp77, count
jg .L28 #,
.L27:
movq %rbx, %rdi # fbc,
call _raw_spin_lock #
addq %r13, 8(%rbx) # count, <variable>.count
movq %rbx, %rdi # fbc,
movl $0, (%r12) #,* tcp_ptr__
call _raw_spin_unlock #
.L29:
#APP
# 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1
movq %gs:kernel_stack,%rax #, pfo_ret__
# 0 "" 2
#NO_APP
decl -8124(%rax) # <variable>.preempt_count
movq -8136(%rax), %rax #, D.14625
testb $8, %al #, D.14625
jne .L32 #,
.L31:
movq -24(%rbp), %rbx #,
movq -16(%rbp), %r12 #,
movq -8(%rbp), %r13 #,
leave
ret
.p2align 4,,10
.p2align 3
.L28:
movl %r13d, (%r12) # count,*
jmp .L29 #
.L32:
call preempt_schedule #
.p2align 4,,6
jmp .L31 #
.size __percpu_counter_add, .-__percpu_counter_add
.p2align 4,,15
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 86c8749ede0c59e590de9267066932a26f1ce796
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:18 2011 +1100
vfs: revert per-cpu nr_unused counters for dentry and inodes
The nr_unused counters count the number of objects on an LRU, and as such they
are synchronized with LRU object insertion and removal and scanning, and
protected under the LRU lock.
Making it per-cpu does not actually get any concurrency improvements because of
this lock, and summing the counter is much slower, and
incrementing/decrementing it costs more code size and is slower too.
These counters should stay per-LRU, which currently means global.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit ccd35fb9f4da856b105ea0f1e0cab3702e8ae6ba
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:17 2011 +1100
kernel: kmem_ptr_validate considered harmful
This is a nasty and error prone API. It is no longer used, remove it.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 786a5e15b613a9cee4fc9139fc3113a5ab0fde79
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Fri Jan 7 17:49:16 2011 +1100
fs: d_validate fixes
d_validate has been broken for a long time.
kmem_ptr_validate does not guarantee that a pointer can be dereferenced
if it can go away at any time. Even rcu_read_lock doesn't help, because
the pointer might be queued in RCU callbacks but not executed yet.
So the parent cannot be checked, nor the name hashed. The dentry pointer
can not be touched until it can be verified under lock. Hashing simply
cannot be used.
Instead, verify the parent/child relationship by traversing parent's
d_child list. It's slow, but only ncpfs and the destaged smbfs care
about it, at this point.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 554738da71004d96e06fb75f4772dfc3b0f47810
Merge: 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 a6d38f889750ed6290728a19d9dad577b147c6d0
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Jan 6 22:34:59 2011 -0800
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
commit 01539ba2a706ab7d35fc0667dff919ade7f87d63
Merge: 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153 dc69d1af9e8d9cbbabff88bb35a6782187a22229
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 19:13:58 2011 -0800
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
omap2: Make OMAP2PLUS select OMAP_DM_TIMER
OMAP4: hwmod data: Fix alignment and end of line in structurefields
OMAP4: hwmod data: Move the DMA structures
OMAP4: hwmod data: Move the smartreflex structures
OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
arm: omap: tusb6010: add name for MUSB IRQ
arm: omap: craneboard: Add USB EHCI support
omap2+: Initialize serial port for dynamic remuxing for n8x0
omap2+: Add struct omap_board_data and use it for platform level serial init
omap2+: Allow hwmod state changes to mux pads based on the state changes
omap2+: Add support for hwmod specific muxing of devices
omap2+: Add omap_mux_get_by_name
OMAP2: PM: fix compile error when !CONFIG_SUSPEND
MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
OMAP4: Smartreflex framework extensions
OMAP4: hwmod: Add inital data for smartreflex modules.
OMAP4: PM: Program correct init voltages for scalable VDDs
OMAP4: Adding voltage driver support
OMAP4: Register voltage PMIC parameters with the voltage layer
OMAP3: PM: Program correct init voltages for VDD1 and VDD2
...
Fix up trivial conflict in arch/arm/plat-omap/Kconfig
commit c413521eb4e2d7ffd5ce432a144708d479054bd3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Jan 7 12:03:22 2011 +0900
ARM: mach-shmobile: update for SMP changes.
There have likewise been some API updates, so we refactor to use the
consolidated smp_prepare_cpus().
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c0312b33daa721a92633181fd4fe508484c81a2d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Jan 7 12:02:11 2011 +0900
ARM: mach-shmobile: update for GIC changes.
This fixes up the SMP support to use the refactored GIC APIs.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6ef9f6fd8eb22f4838e9b0006d16936511e3f7f8
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Jan 7 11:49:49 2011 +0900
ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
Use the new linux/clkdev.h to get it building again.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153
Merge: 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 e3c92215198cb6aa00ad38db2780faa6b72e0a3f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 18:32:12 2011 -0800
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
[media] radio-aimslab.c: Fix gcc 4.5+ bug
[media] cx25821: Fix compilation breakage due to BKL dependency
[media] v4l2-compat-ioctl32: fix compile warning
[media] zoran: fix compiler warning
[media] tda18218: fix compile warning
[media] ngene: fix compile warning
[media] DVB: IR support for TechnoTrend CT-3650
[media] cx23885, cimax2.c: Fix case of two CAM insertion irq
[media] ir-nec-decoder: fix repeat key issue
[media] staging: se401 depends on USB
[media] staging: usbvideo/vicam depends on USB
[media] soc_camera: Add the ability to bind regulators to soc_camedra devices
[media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
[media] v4l: soc-camera: switch to .unlocked_ioctl
[media] v4l: ov772x: simplify pointer dereference
[media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
[media] ov9640: use macro to request OmniVision OV9640 sensor private data
[media] ivtv-i2c: Fix two warnings
[media] staging/lirc: Update lirc TODO files
[media] cx88: Remove the obsolete i2c_adapter.id field
...
commit 04a186bd2c4d3fd7efdeb91d2e92f4624be3a764
Merge: e9d728f528f9548c8dd013899b23e662fa7b6bca 661382fe190475c17d0b3a6b5f0350b4f82f5939
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Jan 7 11:03:37 2011 +0900
Merge branch 'common/dma' into rmobile-latest
commit 661382fe190475c17d0b3a6b5f0350b4f82f5939
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Jan 6 17:04:50 2011 +0000
dma: shdma: don't register the global die notifier multiple times
A recent patch has added a die notifier to the shdma driver, however,
it registers a static die-notifier object in the probe routine, i.e.,
for each device instance. This is wrong and leads to a system lockup.
This patch moves the die notifier registration to module init and
exit routines respectively.
Reported-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e9d728f528f9548c8dd013899b23e662fa7b6bca
Merge: 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1 6155f77d09b968f591876f368d4843168910449e
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Jan 7 10:51:35 2011 +0900
Merge branch 'rmobile/smp' into rmobile-latest
Conflicts:
arch/arm/Kconfig
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 28 08:27:19 2010 +0000
ARM: mach-shmobile: Rely on run-time IRQ handlers
Remove now unused IRQ demux code. All R-Mobile and
SH-Mobile processors should register IRQ demux
handlers during run-time.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e74a9625f8dcf1a924345b24cec8476c52593df8
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 28 08:27:10 2010 +0000
ARM: mach-shmobile: Run-time IRQ handler for GIC
Break-out GIC specific IRQ demux code from the file
entry-macro-intc.S and register during run-time.
Covers sh73a0.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 863b171952dba1a3ce9d345cfe4e93c9fdd42f49
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 28 08:27:01 2010 +0000
ARM: mach-shmobile: Run-time IRQ handler for INTCA
Break-out INTC specific IRQ demux code from the file
entry-macro-intc.S and register during run-time.
Covers sh7367, sh7377 and sh7372.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 60f1435c3bab8b88712a4f96806e5ac9396aa49c
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 28 08:26:52 2010 +0000
ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
Always enable MULTI_IRQ_HANDLER on SH-Mobile.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3dff8804fc087d55c593dda0ff78f475088ec57d
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Dec 22 12:17:09 2010 +0000
ARM: mach-shmobile: Use shared GIC entry macros
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the R-Mobile / SH-Mobile processors.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit eb6908a279dfbe2e1c1714c185e0f523a9749607
Author: Simon Horman <horms@xxxxxxxxxxxx>
Date: Thu Dec 9 00:47:15 2010 +0000
ARM: mach-shmobile: mackerel: Add zboot support
When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small
boot loader and may be burned to rom or flash.
Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee
Merge: 98d27b8abf413a310df6676f7d2128ada1cccc08 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Jan 7 10:29:26 2011 +0900
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4
Merge: f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 16:50:35 2011 -0800
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
ARM: DMA: add support for DMA debugging
ARM: PL011: add DMA burst threshold support for ST variants
ARM: PL011: Add support for transmit DMA
ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
ARM: PL011: Separate hardware FIFO size from TTY FIFO size
ARM: PL011: Allow better handling of vendor data
ARM: PL011: Ensure error flags are clear at startup
ARM: PL011: include revision number in boot-time port printk
ARM: vexpress: add sched_clock() for Versatile Express
ARM i.MX53: Make MX53 EVK bootable
ARM i.MX53: Some bug fix about MX53 MSL code
ARM: 6607/1: sa1100: Update platform device registration
ARM: 6606/1: sa1100: Fix platform device registration
ARM i.MX51: rename IPU irqs
ARM i.MX51: Add ipu clock support
ARM: imx/mx27_3ds: Add PMIC support
ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
mx51: fix usb clock support
MX51: Add support for usb host 2
arch/arm/plat-mxc/ehci.c: fix errors/typos
...
commit f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234
Merge: b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d 09798eb9479da3413bdf96e7d22a84d8b21e05e1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 15:30:54 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (25 commits)
atyfb: Fix bootup hangs on sparc64.
sparc: update copyright in piggyback.c
sparc: unify strip command in boot/Makefile
sparc: rename piggyback_32 to piggyback
sparc: fix tftpboot.img for sparc64 on little-endian host
sparc: add $BITS to piggyback arguments
sparc: remove obsolete ELF support in piggyback_32.c
sparc: additional comments to piggyback_32.c
sparc: use _start for the start entry (like 64 bit does)
sparc: use trapbase in setup_arch
sparc: refactor piggy_32.c
Added support for ampopts in APBUART driver. Used in AMP systems.
APBUART: added raw AMBA vendor/device number to match against.
SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing
SPARC/LEON: added support for selecting Timer Core and Timer within core
LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL
SPARC/LEON: added support for IRQAMP IRQ Controller
SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded.
sparc: fix sparse warnings in arch/sparc/prom for 32 bit build
sparc: remove unused prom tree functions
...
commit 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
Merge: 28cdac6690cb113856293bf79b40de33dbd8f974 1051b9f0f9eab8091fe3bf98320741adf36b4cfa
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Jan 6 22:33:32 2011 +0000
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
commit 28cdac6690cb113856293bf79b40de33dbd8f974
Merge: 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 36bb94ba36f332de767cfaa3af6a5136435a3a9c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Jan 6 22:33:19 2011 +0000
Merge branch 'pgt' (early part) into devel
commit 4073723acb9cdcdbe4df9c0e0c376c65d1697e43
Merge: 58daf18cdcab550262a5f4681e1f1e073e21965a 4ec3eb13634529c0bc7466658d84d0bbe3244aea
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Jan 6 22:32:52 2011 +0000
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
commit 4ec3eb13634529c0bc7466658d84d0bbe3244aea
Merge: 24056f525051a9e186af28904b396320e18bf9a0 15095bb0fe779c0403091bda7adce5fb3bb9ca35
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Jan 6 22:31:35 2011 +0000
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
commit 24056f525051a9e186af28904b396320e18bf9a0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Jan 3 11:29:28 2011 +0000
ARM: DMA: add support for DMA debugging
Add ARM support for the DMA debug infrastructure, which allows the
DMA API usage to be debugged.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d
Merge: 84b7290cca16c61a167c7e1912cd84a479852165 c6d92e9b84da2002ee7a75b784834970ddfd3bfd
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 13:36:30 2011 -0800
Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm
* 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (35 commits)
mmc: msm_sdcc: Check for only DATA_END interrupt to end a request
mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned
mmc: msm_sdcc: Reset SDCC in case of data transfer errors
mmc: msm_sdcc: Add prog done interrupt support
mmc: msm_sdcc: Fix possible circular locking dependency warning
MSM: Add USB support for MSM7x30
MSM: Add USB suport for QSD8x50
msm: initial framebuffer support
msm: add handling for clocks tagged as CLK_MINMAX
msm: trout: change name of pmdh_clk to mddi_clk
msm: add CLK_MINMAX to pmdh_clk
msm: trout: add gpio_to_irq
msm: iommu: Use the correct memory allocation flag
msm_serial: Remove redundant unlikely()
msm: iommu: Miscellaneous code cleanup
msm: iommu: Support cache-coherent memory access
msm: iommu: Definitions for extended memory attributes
msm: iommu: Kconfig dependency for the IOMMU API
msm: iommu: Check if device is already attached
msm: iommu: Kconfig item for cacheable page tables
...
commit 84b7290cca16c61a167c7e1912cd84a479852165
Merge: 9858a38ea3a940762ae3028cce88f686d0e0c28b 1928e87bcf185f56008d0746f887b691c1cb8c4a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 13:35:12 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (55 commits)
video: udlfb: Kill off special printk wrappers, use pr_fmt().
video: udlfb: Kill off some magic constants for EDID sizing.
video: udlfb: deifdefify (yes, that's a word).
fbdev: modedb: Add a new mode for 864x480 TAAL panels.
drivers/video/i810/i810-i2c.c: fix i2c bus handling
video: Fix the HGA framebuffer driver
drivers/video/carminefb.c: improve error handling
video: imxfb: Fix the maximum value for yres
fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support
fbdev: sh_mipi_dsi: use platform provided register layout and values
ARM: mach-shmobile: specify sh7372 MIPI DSI register layout
fbdev: sh_mipi_dsi: support different register layouts
ARM: mach-shmobile: improve MIPI DSI clock configuration
fbdev: sh-mobile: implement MIPI DSI runtime PM support
sisfb: eliminate compiler warnings
sisfb: delete unused register I/O macros
sisfb: replace setSISIDXREG with SiS_SetRegANDOR
sisfb: replace andSISIDXREG with SiS_SetRegAND
sisfb: replace orSISIDXREG with SiS_SetRegOR
sisfb: replace outSISIDXREG with SiS_SetReg
...
commit 9858a38ea3a940762ae3028cce88f686d0e0c28b
Merge: abb359450f20c32ae03039d8736f12b1d561caf5 f862f904d357dc0d3612347a8dbabe6fae037fbb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 13:34:45 2011 -0800
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: include Migo-R TS driver in Migo-R defconfig
sh: correct definitions to access stack pointers
sh: Tidy up SH-4A unaligned load support.
dma: shdma: NMI support.
sh: mach-sdk7786: Handle baseboard NMI source selection.
sh: mach-rsk: Add polled GPIO buttons support for RSK+7203.
sh: Break out cpuinfo_op procfs bits.
sh: Enable optional gpiolib for all CPUs with pinmux tables.
sh: migrate SH_CLK_MD to mode pin API.
sh: machvec IO death.
commit abb359450f20c32ae03039d8736f12b1d561caf5
Merge: cb600d2f83c854ec3d6660063e4466431999489b 4e3dbdb1392a83bd21a6ff8f6bc785495058d37c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 12:30:19 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1436 commits)
cassini: Use local-mac-address prom property for Cassini MAC address
net: remove the duplicate #ifdef __KERNEL__
net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
netconsole: clarify stopping message
netconsole: don't announce stopping if nothing happened
cnic: Fix the type field in SPQ messages
netfilter: fix export secctx error handling
netfilter: fix the race when initializing nf_ct_expect_hash_rnd
ipv4: IP defragmentation must be ECN aware
net: r6040: Return proper error for r6040_init_one
dcb: use after free in dcb_flushapp()
dcb: unlock on error in dcbnl_ieee_get()
net: ixp4xx_eth: Return proper error for eth_init_one
include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
net: add POLLPRI to sock_def_readable()
af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
net_sched: pfifo_head_drop problem
mac80211: remove stray extern
mac80211: implement off-channel TX using hw r-o-c offload
mac80211: implement hardware offload for remain-on-channel
...
commit 4e3dbdb1392a83bd21a6ff8f6bc785495058d37c
Author: Richard Mortimer <richm@xxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:50:30 2011 -0800
cassini: Use local-mac-address prom property for Cassini MAC address
Fallback on the local-mac-address prom property if the Cassini device
does not have an address programmed in the VPD ROM. This uses the same
technique as implemented by the sungem driver.
The problem was reported by Frans van Berckel using Debian kernel 2.6.34-7
on Sun Fire V440. udev was assigning a new eth<n> device name on each reboot
because the cassini driver was using a random MAC address.
Fix tested on 2.6.34-7 and 2.6.37 Sun Fire V440. Compile tested against
2.6.36 davem/sparc-2.6.git
Reported-by: Frans van Berckel <fberckel@xxxxxxxxx>
Tested-by: Frans van Berckel <fberckel@xxxxxxxxx>
Reviewed-by: Julian Calaby <julian.calaby@xxxxxxxxx>
Reviewed-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Richard Mortimer <richm@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2ad0d9d413abc3380fc1d89a9da7f8db59d9746b
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Thu Jan 6 11:41:42 2011 -0800
net: remove the duplicate #ifdef __KERNEL__
Since we are already in #ifdef __KERNEL__, we don't need to check it
again.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 09798eb9479da3413bdf96e7d22a84d8b21e05e1
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Jan 5 13:08:06 2011 -0800
atyfb: Fix bootup hangs on sparc64.
After commit 25edd6946a1d74e5e77813c2324a0908c68bcf9e ("sparc64: Get
rid of indirect p1275 PROM call buffer.") we can't pass virtual
addresses >4GB to PROM calls.
Largely this is never necessary in drivers because we have a copy of
the entire PROM device tree in the kernel and a set of of_*()
interfaces to access it.
Unfortunately there were some lingering prom calls in the atyfb
driver, in particular prom_finddevice() was being called with an
on-stack address which could be anywhere.
This code is actually probing for information we already have, the
PROM choosen console output device is stored in of_console_device so
all of this nasty code consolidates into a one-line comparison.
Next we have some prom_getintdefault() calls which are trivially
transformed into the equivalent of_getintprop_default().
Special thanks to Fabio, who figured out exactly where the bootup
was hanging. That made this bug trivial to fix.
Reported-by: Fabio M. Di NItto <fabbione@xxxxxxxxxxxx>
Reported-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Reported-by: Frans van Berckel <fberckel@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Fabio M. Di NItto <fabbione@xxxxxxxxxxxx>
commit f88de8de5a8c8a8a73960d4432ceef2d38b7f86f
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Sat Dec 25 03:41:30 2010 +0000
net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
Since nf_bridge_maybe_copy_header() may change the length of skb,
we should check the length of skb after it to handle the ppoe skbs.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 38cfb907a55f3223445151b517b6e4678b8c9d66
Author: Ferenc Wagner <wferi@xxxxxxx>
Date: Thu Jan 6 05:11:20 2011 +0000
netconsole: clarify stopping message
Signed-off-by: Ferenc Wagner <wferi@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 141dfba342b672588799432d74a3b6be88b5d713
Author: Ferenc Wagner <wferi@xxxxxxx>
Date: Thu Jan 6 05:11:19 2011 +0000
netconsole: don't announce stopping if nothing happened
Signed-off-by: Ferenc Wagner <wferi@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 68d7c1aa2fee6acb11fcb826a207e4b81d8a1f57
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Wed Jan 5 15:14:13 2011 +0000
cnic: Fix the type field in SPQ messages
The new firmware interface requires each Slow Path Queue (SPQ) message's
type field to include the function number. The existing code does not
do this consistently. We fix this by OR'ing in the function number
into the type field centrally in cnic_submit_kwqe_16().
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cba85b532e4aabdb97f44c18987d45141fd93faa
Author: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date: Thu Jan 6 11:25:00 2011 -0800
netfilter: fix export secctx error handling
In 1ae4de0cdf855305765592647025bde55e85e451, the secctx was exported
via the /proc/net/netfilter/nf_conntrack and ctnetlink interfaces
instead of the secmark.
That patch introduced the use of security_secid_to_secctx() which may
return a non-zero value on error.
In one of my setups, I have NF_CONNTRACK_SECMARK enabled but no
security modules. Thus, security_secid_to_secctx() returns a negative
value that results in the breakage of the /proc and `conntrack -L'
outputs. To fix this, we skip the inclusion of secctx if the
aforementioned function fails.
This patch also fixes the dynamic netlink message size calculation
if security_secid_to_secctx() returns an error, since its logic is
also wrong.
This problem exists in Linux kernel >= 2.6.37.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f682cefa5ad204d3bfaa54a58046c66d2d035ac1
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Wed Jan 5 04:23:23 2011 +0000
netfilter: fix the race when initializing nf_ct_expect_hash_rnd
Since nf_ct_expect_dst_hash() may be called without nf_conntrack_lock
locked, nf_ct_expect_hash_rnd should be initialized in the atomic way.
In this patch, we use nf_conntrack_hash_rnd instead of
nf_ct_expect_hash_rnd.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6623e3b24a5ebb07e81648c478d286a1329ab891
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Jan 5 07:52:55 2011 +0000
ipv4: IP defragmentation must be ECN aware
RFC3168 (The Addition of Explicit Congestion Notification to IP)
states :
5.3. Fragmentation
ECN-capable packets MAY have the DF (Don't Fragment) bit set.
Reassembly of a fragmented packet MUST NOT lose indications of
congestion. In other words, if any fragment of an IP packet to be
reassembled has the CE codepoint set, then one of two actions MUST be
taken:
* Set the CE codepoint on the reassembled packet. However, this
MUST NOT occur if any of the other fragments contributing to
this reassembly carries the Not-ECT codepoint.
* The packet is dropped, instead of being reassembled, for any
other reason.
This patch implements this requirement for IPv4, choosing the first
action :
If one fragment had NO-ECT codepoint
reassembled frame has NO-ECT
ElIf one fragment had CE codepoint
reassembled frame has CE
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9c86c0f4ba49b39f909d7f18731b91e563e07065
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Tue Jan 4 22:40:04 2011 +0000
net: r6040: Return proper error for r6040_init_one
Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc failure.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2a8fe003741aa90b6b9453e90af4bbb7bc42918c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Tue Jan 4 21:03:44 2011 +0000
dcb: use after free in dcb_flushapp()
The original code has a use after free bug because it's not using the
_safe() version of the list_for_each_entry() macro.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 70bfa2d2e1bfd90ef26758b5e2749f043a940037
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Tue Jan 4 21:03:12 2011 +0000
dcb: unlock on error in dcbnl_ieee_get()
There is a "goto nla_put_failure" hidden inside the NLA_PUT() macro, but
we're holding the dcb_lock so we need to unlock first.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cb600d2f83c854ec3d6660063e4466431999489b
Merge: 47935a731b7b850a4c6c0e55ed0741e3dd25d889 d50d8fe192428090790e7178e9507e981e0b005b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:12:17 2011 -0800
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mm: Initialize initial_page_table before paravirt jumps
commit 0c6610017459ed9642548694fe88971d3f4206aa
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Tue Jan 4 19:24:06 2011 +0000
net: ixp4xx_eth: Return proper error for eth_init_one
Return PTR_ERR(port->phydev) instead of 1 if phy_connect failed.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Krzysztof Halasa <khc@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 47935a731b7b850a4c6c0e55ed0741e3dd25d889
Merge: 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 3fb82d56ad003e804923185316236f26b30dfdd5 fd35fbcdd1b2579a6e00a1545f7124e4005d0474 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 c8217b8305e5e75c23617f2f4cd262527d952c0a 3cf9b85b474e656a0856b88290c7a289ac5ea247 f6cd24777513fcc673d432cc29ef59881d3e4df1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:11:50 2011 -0800
Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for-linus', 'x86-paravirt-for-linus', 'core-locking-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, asm: Use fxsaveq/fxrestorq in more places
* 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hwmon: Add core threshold notification to therm_throt.c
* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, paravirt: Use native_halt on a halt, not native_safe_halt
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
locking, lockdep: Convert sprintf_symbol to %pS
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
irq: Better struct irqaction layout
commit 238c855805c853eaec95b0bc3065effb64f955a0
Author: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Date: Tue Jan 4 16:07:14 2011 +0000
include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
Ethertype used by HPNA control protocols (LARQ, rate, link, etc) and by
Broadcom wlan drivers for local signalling.
Signed-off-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2
Merge: d7a5a18190d6f523b5d795bfd73f83cf13a3a383 cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:09:57 2011 -0800
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV, BAU: Extend for more than 16 cpus per socket
x86, UV: Fix the effect of extra bits in the hub nodeid register
x86, UV: Add common uv_early_read_mmr() function for reading MMRs
commit d7a5a18190d6f523b5d795bfd73f83cf13a3a383
Merge: 4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e a8760eca6cf60ed303ad494ef45901f63165d2c8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:08:14 2011 -0800
Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Check tsc available/disabled in the delayed init function
x86: Improve TSC calibration using a delayed workqueue
x86: Make tsc=reliable override boot time stability checks
commit 7e12eddb73d4f288b0339ee13832a34d6bc4fd90
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date: Thu Nov 25 17:20:20 2010 +0300
CIFS: Simplify cifs_open code
Make the code more general for use in posix and non-posix open.
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit eeb910a6d46103594eb63e6eba1aeb02022368a4
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date: Thu Nov 25 15:12:39 2010 +0300
CIFS: Simplify non-posix open stuff (try #2)
Delete cifs_open_inode_helper and move non-posix open related things
to cifs_nt_open function.
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 4b886136df2b923b6fc6b2d83faa9554e84e05ab
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date: Mon Dec 13 22:18:07 2010 +0300
CIFS: Add match_port check during looking for an existing connection (try #4)
If we have a share mounted by non-standard port and try to mount another share
on the same host with standard port, we connect to the first share again -
that's wrong. This patch fixes this bug.
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit a9f1b85e5ba80519dea6974e3574fa7a30cc5e29
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date: Mon Dec 13 19:08:35 2010 +0300
CIFS: Simplify ipv*_connect functions into one (try #4)
Make connect logic more ip-protocol independent and move RFC1001 stuff into
a separate function. Also replace union addr in TCP_Server_Info structure
with sockaddr_storage.
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Reviewed-and-Tested-by: Jeff Layton <jlayton@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit df8fbc241aa3c451248b1f19fff3a3f604b107f9
Author: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Date: Sat Dec 11 14:19:22 2010 -0600
cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
Indicate to the server a capability of NTLM2 session security (NTLM2 Key)
during ntlmssp protocol exchange in one of the bits of the flags field.
If server supports this capability, send NTLM2 key even if signing is not
required on the server.
If the server requires signing, the session keys exchanged for NTLMv2
and NTLM2 session security in auth packet of the nlmssp exchange are same.
Send the same flags in authenticate message (type 3) that client sent in
negotiate message (type 1).
Remove function setup_ntlmssp_neg_req
Make sure ntlmssp negotiate and authenticate messages are zero'ed
before they are built.
Reported-and-Tested-by: Robbert Kouprie <robbert@xxxxxx>
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 262f86adcc0665872812a7458a5d03e19e0efe33
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Thu Nov 11 18:42:16 2010 +1100
cifs: don't overwrite dentry name in d_revalidate
Instead, use fatfs's method for dealing with negative dentries to
preserve case, rather than overwrite dentry name in d_revalidate, which
is a bit ugly and also gets in the way of doing lock-free path walking.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e
Merge: b4c6e2ea5e46b03c764a918f4999a77a3149979f 94462ad3b14739d158a1ab87bb30008c1e5a6bc1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:07:33 2011 -0800
Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
module: Move RO/NX module protection to after ftrace module update
x86: Resume trampoline must be executable
x86: Add RO/NX protection for loadable kernel modules
x86: Add NX protection for kernel data
x86: Fix improper large page preservation
commit b4c6e2ea5e46b03c764a918f4999a77a3149979f
Merge: 6f46b120a96212b85cbdcb84a64c854dfd791ede 991cfffa7c19aa648546aff666595af896e568ba
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:06:31 2011 -0800
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, earlyprintk: Move mrst early console to platform/ and fix a typo
x86, apbt: Setup affinity for apb timers acting as per-cpu timer
ce4100: Add errata fixes for UART on CE4100
x86: platform: Move iris to x86/platform where it belongs
x86, mrst: Check platform_device_register() return code
x86/platform: Add Eurobraille/Iris power off support
x86, mrst: Add explanation for using 1960 as the year offset for vrtc
x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"
x86, mrst: The shutdown for MRST requires the SCU IPC mechanism
x86: Ce4100: Add reboot_fixup() for CE4100
ce4100: Add PCI register emulation for CE4100
x86: Add CE4100 platform support
x86: mrst: Set vRTC's IRQ to level trigger type
x86: mrst: Add audio driver bindings
rtc: Add drivers/rtc/rtc-mrst.c
x86: mrst: Add vrtc driver which serves as a wall clock device
x86: mrst: Add Moorestown specific reboot/shutdown support
x86: mrst: Parse SFI timer table for all timer configs
x86/mrst: Add SFI platform device parsing code
commit 6f46b120a96212b85cbdcb84a64c854dfd791ede
Merge: 4e1db5e58af8bc6ab4a651df279add41c48d3fc2 c7657ac0c3e4d4ab569296911164b7a2b0ff871a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:06:09 2011 -0800
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, microcode, AMD: Cleanup code a bit
x86, microcode, AMD: Replace vmalloc+memset with vzalloc
commit 4e1db5e58af8bc6ab4a651df279add41c48d3fc2
Merge: 37d9a8c5ea8fc063841c133fc53cc168ee620762 eb48c9cb2053e7bb5f7f8f0371cb578a0d439450
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 11:05:21 2011 -0800
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
apic, amd: Make firmware bug messages more meaningful
mce, amd: Remove goto in threshold_create_device()
mce, amd: Add helper functions to setup APIC
mce, amd: Shorten local variables mci_misc_{hi,lo}
mce, amd: Implement mce_threshold_block_init() helper function
commit 37d9a8c5ea8fc063841c133fc53cc168ee620762
Merge: 017892c341033b3e961e695bc0bf1a815efcf92e 79250af2d5953b69380a6319b493862bf4ece972
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:56:02 2011 -0800
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix included-by file reference comments
x86, cpu: Only CPU features determine NX capabilities
x86, cpu: Call verify_cpu during 32bit CPU startup
x86, cpu: Clear XD_DISABLED flag on Intel to regain NX
x86, cpu: Rename verify_cpu_64.S to verify_cpu.S
commit 5f9251cb93237c9578160df9acc6ce9948ad8c52
Merge: 2c6607c611cb7bf0a6750bcea34a258144e302c5 06778b1c383afbdb88ffd837e117bec06a76f450
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Jan 6 10:55:42 2011 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 2c6607c611cb7bf0a6750bcea34a258144e302c5
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Jan 6 10:54:29 2011 -0800
net: add POLLPRI to sock_def_readable()
Leonardo Chiquitto found poll() could block forever on tcp sockets and
Urgent data was received, if the event flag only contains POLLPRI.
He did a bisection and found commit 4938d7e0233 (poll: avoid extra
wakeups in select/poll) was the source of the problem.
Problem is TCP sockets use standard sock_def_readable() function for
their sk_data_ready() handler, and sock_def_readable() doesnt signal
POLLPRI.
Only TCP is affected by the problem. Adding POLLPRI to the list of flags
might trigger unnecessary schedules, but URGENT handling is such a
seldom used feature this seems a good compromise.
Thanks a lot to Leonardo for providing the bisection result and a test
program as well.
Reference : http://www.spinics.net/lists/netdev/msg151793.html
Reported-and-bisected-by: Leonardo Chiquitto <leonardo.lists@xxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Tested-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 017892c341033b3e961e695bc0bf1a815efcf92e
Merge: 42cbd8efb0746b55112de45173219f76c54390da cb2ded37fd2e1039f96c8c892da024a8f033add5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:51:36 2011 -0800
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion
x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation
x86, acpi: Add MAX_LOCAL_APIC for 32bit
x86: io_apic: Split setup_ioapic_ids_from_mpc()
x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage
x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
x86: Allow platforms to force enable apic
commit 42cbd8efb0746b55112de45173219f76c54390da
Merge: dda5f0a372873bca5f0b1d1866d7784dffd8b675 f658bcfb2607bf0808966a69cf74135ce98e5c2d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:50:28 2011 -0800
Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cacheinfo: Cleanup L3 cache index disable support
x86, amd-nb: Cleanup AMD northbridge caching code
x86, amd-nb: Complete the rename of AMD NB and related code
commit 568389c257fa7d74ce36c2f78bad31965fded4cf
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Fri Dec 17 11:16:17 2010 +0100
serial: apbuart: Fixup apbuart_console_init()
commit 35c64e5d (drivers: serial: apbuart: Handle OF failures
gracefully) missed that the modified grlib_apbuart_configure()
function is called from apbuart_console_init() as well.
Fix the fallout.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dda5f0a372873bca5f0b1d1866d7784dffd8b675
Merge: 65b2074f84be2287e020839e93b4cdaaf60eb37c 88606e80da0e8d862a42ee19e5bb60b01b940ea7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:42:43 2011 -0800
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
MAINTAINERS: Update timer related entries
timers: Use this_cpu_read
timerqueue: Make timerqueue_getnext() static inline
hrtimer: fix timerqueue conversion flub
hrtimers: Convert hrtimers to use timerlist infrastructure
timers: Fixup allmodconfig build issue
timers: Rename timerlist infrastructure to timerqueue
timers: Introduce timerlist infrastructure.
hrtimer: Remove stale comment on curr_timer
timer: Warn when del_timer_sync() is called in hardirq context
timer: Del_timer_sync() can be used in softirq context
timer: Make try_to_del_timer_sync() the same on SMP and UP
posix-timers: Annotate lock_timer()
timer: Permit statically-declared work with deferrable timers
time: Use ARRAY_SIZE macro in timecompare.c
timer: Initialize the field slack of timer_list
timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS
time: Compensate for rounding on odd-frequency clocksources
Fix up trivial conflict in MAINTAINERS
commit 65b2074f84be2287e020839e93b4cdaaf60eb37c
Merge: 28d9bfc37c861aa9c8386dff1ac7e9a10e5c5162 6bf4123760a5aece6e4829ce90b70b6ffd751d65
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:23:33 2011 -0800
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
sched: Change wait_for_completion_*_timeout() to return a signed long
sched, autogroup: Fix reference leak
sched, autogroup: Fix potential access to freed memory
sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight
sched: Move periodic share updates to entity_tick()
printk: Use this_cpu_{read|write} api on printk_pending
sched: Make pushable_tasks CONFIG_SMP dependant
sched: Add 'autogroup' scheduling feature: automated per session task groups
sched: Fix unregister_fair_sched_group()
sched: Remove unused argument dest_cpu to migrate_task()
mutexes, sched: Introduce arch_mutex_cpu_relax()
sched: Add some clock info to sched_debug
cpu: Remove incorrect BUG_ON
cpu: Remove unused variable
sched: Fix UP build breakage
sched: Make task dump print all 15 chars of proc comm
sched: Update tg->shares after cpu.shares write
sched: Allow update_cfs_load() to update global load
sched: Implement demand based update_cfs_load()
...
commit 28d9bfc37c861aa9c8386dff1ac7e9a10e5c5162
Merge: f3b0cfa9b017a9d4686c9b14b908a1685f97a077 4b95f135f606c87e4056b6d7fd3c5781c818858b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:17:26 2011 -0800
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (146 commits)
tools, perf: Documentation for the power events API
perf: Add calls to suspend trace point
perf script: Make some lists static
perf script: Use the default lost event handler
perf session: Warn about errors when processing pipe events too
perf tools: Fix perf_event.h header usage
perf test: Clarify some error reports in the open syscall test
x86, NMI: Add touch_nmi_watchdog to io_check_error delay
x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time
x86: Only call smp_processor_id in non-preempt cases
perf timechart: Adjust perf timechart to the new power events
perf: Clean up power events by introducing new, more generic ones
perf: Do not export power_frequency, but power_start event
perf test: Add test for counting open syscalls
perf evsel: Auto allocate resources needed for some methods
perf evsel: Use {cpu,thread}_map to shorten list of parameters
perf tools: Refactor all_tids to hold nr and the map
perf tools: Refactor cpumap to hold nr and the map
perf evsel: Introduce per cpu and per thread open helpers
perf evsel: Steal the counter reading routines from stat
...
commit f3b0cfa9b017a9d4686c9b14b908a1685f97a077
Merge: 2af49b6058d857fa5b476db642d4452bf5833ecd 5bdb05f91b27b9361c4f348a4e05999f597df72e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:07:05 2011 -0800
Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futex: Add futex_q static initializer
futex: Replace fshared and clockrt with combined flags
futex: Cleanup stale fshared flag interfaces
commit 2af49b6058d857fa5b476db642d4452bf5833ecd
Merge: b08b27213384d1bd6eda04a2b6f788b4cdee0f34 394f4528c523d88daabd50f883a8d6b164075555
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:06:26 2011 -0800
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: remove unused __list_for_each_rcu() macro
rculist: fix borked __list_for_each_rcu() macro
rcu: reduce __call_rcu()-induced contention on rcu_node structures
rcu: limit rcu_node leaf-level fanout
rcu: fine-tune grace-period begin/end checks
rcu: Keep gpnum and completed fields synchronized
rcu: Stop chasing QS if another CPU did it for us
rcu: increase synchronize_sched_expedited() batching
rcu: Make synchronize_srcu_expedited() fast if running readers
rcu: fix race condition in synchronize_sched_expedited()
rcu: update documentation/comments for Lai's adoption patch
rcu,cleanup: simplify the code when cpu is dying
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
rcu: get rid of obsolete "classic" names in TREE_RCU tracing
rcu: Distinguish between boosting and boosted
rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing.
rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU
rcu: priority boosting for TINY_PREEMPT_RCU
rcu: move TINY_RCU from softirq to kthread
rcu: add priority-inversion testing to rcutorture
commit b08b27213384d1bd6eda04a2b6f788b4cdee0f34
Merge: 8484baaa5065b460e5eb18ee721d8417251f7897 846f40455276617275284a4b76b89311b4aed0b9
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 6 10:01:23 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: Don't flush delete workqueue when releasing the transaction lock
GFS2: fsck.gfs2 reported statfs error after gfs2_grow
GFS2: Merge glock state fields into a bitfield
GFS2: Fix uninitialised error value in previous patch
GFS2: fix recursive locking during rindex truncates
GFS2: reread rindex when necessary to grow rindex
GFS2: Remove duplicate #defines from glock.h
GFS2: Clean up of gdlm_lock function
GFS2: Allow gfs2 to update quota usage values through the quotactl interface
GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg
GFS2: fs/gfs2/glock.c: Use printf extension %pV
GFS2: Clean up duplicated setattr code
GFS2: Remove unreachable calls to vmtruncate
GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS
GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM
commit 8484baaa5065b460e5eb18ee721d8417251f7897
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Wed Jan 5 16:28:43 2011 -0800
kernel-doc: code reorganization
Move 'main' code vs. subroutines around so that they are not so
intermixed, for better readability/understanding (relative to Perl).
It was messy to follow the primary flow of code execution with the
code being mixed. Now the code begins with data initialization,
followed by all subroutines, then ends with the main code execution.
This is almost totally source code movement, with a few changes as
needed for forward declarations.
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit d5ba92b7958e3ff2f0878e45b9b42cb6976853dd
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Wed Jan 5 16:27:53 2011 -0800
Documentation: update kernel-docs.txt
Fixed typos, and removed duplicated entries.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit a40649781b9c10e192fad9f00a60c6d946da553f
Author: Michael Prokop <mika@xxxxxxxx>
Date: Wed Jan 5 16:27:15 2011 -0800
Documentation/dontdiff: add further autogenerated files to ignore list
Mainly resulting from (but not limited to) autogenerated files of
lib/raid6 and drivers/gpu/drm/radeon. List generated as result of
a diff of a clean 2.6.36 tree against a built one.
Signed-off-by: Michael Prokop <mika@xxxxxxxx>
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Jan 6 08:16:04 2011 -0200
[media] radio-aimslab.c: Fix gcc 4.5+ bug
gcc 4.5+ doesn't properly evaluate some inlined expressions.
A previous patch were proposed by Andrew Morton using noinline.
However, the entire inlined function is bogus, so let's just
remove it and be happy.
Reported-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1928e87bcf185f56008d0746f887b691c1cb8c4a
Merge: ca9c20ce2b383032b71bdae9ec0b468d428ca8d4 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Jan 6 18:27:34 2011 +0900
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/video/sh_mobile_lcdcfb.c
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f862f904d357dc0d3612347a8dbabe6fae037fbb
Merge: 6f09e41d704fe0bc9157a5357480751d39361d01 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Jan 6 18:24:07 2011 +0900
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Conflicts:
arch/sh/kernel/cpu/sh2a/clock-sh7201.c
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ca9c20ce2b383032b71bdae9ec0b468d428ca8d4
Merge: 17ca20cb7d04a259c9194879f77466bde606dda5 81f6f3c1047392a22b9a20bbecf98c7f2d6f922a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Jan 6 18:10:09 2011 +0900
Merge branch 'fbdev/udlfb'
commit 81f6f3c1047392a22b9a20bbecf98c7f2d6f922a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Jan 6 18:07:54 2011 +0900
video: udlfb: Kill off special printk wrappers, use pr_fmt().
This kills off all of the dl_xxx() printk wrappers and simply stubs in a
pr_fmt() definition to accomplish the same thing.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b9f03a3cd06c6f8bbecfe08eae2a69cc0a13c690
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Jan 6 18:04:02 2011 +0900
video: udlfb: Kill off some magic constants for EDID sizing.
The edid length is fixed, so use the standard definition consistently.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1a3e528cfc00a9d08114c5fa9e486a77633a425d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Jan 6 17:29:24 2011 +0900
video: udlfb: deifdefify (yes, that's a word).
udlfb selects all of the options it presently ifdef conditionalizes, so
none of the statements have any effect outside of aggravating eye strain.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6f09e41d704fe0bc9157a5357480751d39361d01
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Thu Jan 6 05:33:15 2011 +0000
sh: include Migo-R TS driver in Migo-R defconfig
This patch enables the Migo-R specific touch screen
driver in the Migo-R defconfig.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 17ca20cb7d04a259c9194879f77466bde606dda5
Author: Mayuresh Janorkar <mayur@xxxxxx>
Date: Thu Jan 6 16:02:42 2011 +0900
fbdev: modedb: Add a new mode for 864x480 TAAL panels.
This adds a new entry to the modedb for 864x480 TAAL panels, the default
configuration for many OMAP boards. This enables omapfb to make use of
the standard mode parsing.
Signed-off-by: Mayuresh Janorkar <mayur@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 748103e7235892bf9a3ee568d7d4dd7e5a3beece
Author: Stefani Seibold <stefani@xxxxxxxxxxx>
Date: Mon Jan 3 09:28:59 2011 +0000
drivers/video/i810/i810-i2c.c: fix i2c bus handling
These patch fix a longstanding bug in the i810 frame buffer driver.
The handling of the i2c bus is wrong: A 1 bit should not written to the
i2c, these will be done by switch the i2c to input. Driving an 1 bit
active is against the i2c spec.
An active driven of a 1 bit will result in very strange error, depending
which side is the more powerful one. In my case it depends on the
temperature of the Display-Controller-EEprom: With an cold eprom a got
the correct EDID datas, with a warm one some of the 1 bits was 0 :-(
The same bug is also in the intelfb driver in the file
drivers/video/intelfb/intelfb_i2c.c. The functions intelfb_gpio_setscl()
and intelfb_gpio_setsda() do drive the 1 bit active to the i2c bus. But
since i have no card which is used by the intelfb driver i cannot fix
it.
Signed-off-by: Stefani Seibold <stefani@xxxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 529ed806d4540d23ca2f68b28c3715d1566fc3ac
Author: Brent Cook <busterb@xxxxxxxxx>
Date: Fri Dec 31 05:56:50 2010 +0000
video: Fix the HGA framebuffer driver
Resurrected some old hardware and fixed up the hgafb driver to work
again. Only tested with fbcon, since most fbdev-based software appears
to only support 12bpp and up. It does not appear that this driver has
worked for at least the entire 2.6.x series, perhaps since 2002.
Hercules graphics hardware uses packed pixels horizontally, but rows are
not linear. In other words, the pixels are not packed vertically. This
means that custom imageblit, fillrect and copyarea need to be written
specific to the hardware.
* Removed the experimental acceleration option, since it is required
for the hardware to work.
* Fixed imageblit to work with fb_image's wider than 8 pixels.
* Updated configuration text (HGA hardware is from 1984)
Signed-off-by: Brent Cook <busterb@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e045da7d835a28950543f5f10f0cb1905ca9bbaf
Author: Julia Lawall <julia@xxxxxxx>
Date: Sun Jan 2 14:27:42 2011 +0000
drivers/video/carminefb.c: improve error handling
This code had an error handling goto to the wrong place, a misplaced
release_mem_region, and a duplicated release_mem_region.
The semantic match that finds the double release_mem_region is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r@
expression e1,e2,e3;
position p1,p2,p3;
@@
release_mem_region@p1(e1, e2)@p3;
... when != request_mem_region(e1,e2,e3)
release_mem_region(e1, e2)@p2;
@@
expression e <= r.e1,e3;
expression r.e1,e2;
position r.p1,r.p2,r.p3,p!=r.p1;
@@
*release_mem_region(e1, e2)@p3;
... when != e = e3
*release_mem_region@p(e1, e2)@p2;// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7ee04fd5d5ff74f81d8eee128bc9346ab87c56b8
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Fri Dec 24 12:28:24 2010 +0000
video: imxfb: Fix the maximum value for yres
MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register.
Fix the maximum value for yres.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 417d48274e755e537bae60461558c1f63a4e14de
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Jan 5 10:21:00 2011 +0000
fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support
This patch extends the LCDC driver with 24 bpp
and 32 bpp support.
These modes have been kept disabled earlier due
to dependencies between the potential two LCDC
channels that are exported as two separate
framebuffer devices. The dependency boils down
to a byte swap register that is shared between
multiple channels.
With this patch applied all single channel LCDC
hardware can chose freely from 16, 24 and 32 bpp.
Dual channel LCDC must stick to the same setup
for both channels.
Without this patch only 16 bpp is fully supported.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 98d27b8abf413a310df6676f7d2128ada1cccc08
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Thu Jan 6 02:44:15 2011 +0000
ARM: mach-shmobile: mackerel: Add HDMI sound support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 12c4309b78854ba117ea38a9178018591abd16ab
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Thu Jan 6 02:44:09 2011 +0000
ARM: mach-shmobile: mackerel: add HDMI video support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 73674648e9bf3b0a75000b7e97edaac255cd73f7
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Thu Jan 6 02:43:00 2011 +0000
ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
fsib_clk will be used when fdiv_clk failed on fsi_hdmi_set_rate.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b27dcfb0670ea7352a67137f4ff7947c2a9f6892
Author: Jeff Garzik <jeff@xxxxxxxxxx>
Date: Wed Nov 17 22:56:48 2010 -0500
[libata] avoid needlessly passing around ptr to SCSI completion func
It's stored in struct scsi_cmnd->scsi_done, making several 'done'
parameters to functions redundant.
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 02cdfcf043c5c6ebcbbaba1c35130b5fbcb10867
Author: David Milburn <dmilburn@xxxxxxxxxx>
Date: Fri Nov 12 15:38:21 2010 -0600
[libata] new driver acard_ahci, for ATP8620 host controller
Add support for Acard ATP8620 host controller.
Based upon initial version by Jeff Garzik.
Signed-off-by: David Milburn <dmilburn@xxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 3610cda53f247e176bcbb7a7cca64bc53b12acdb
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Jan 5 15:38:53 2011 -0800
af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
unix_release() can asynchornously set socket->sk to NULL, and
it does so without holding the unix_state_lock() on "other"
during stream connects.
However, the reverse mapping, sk->sk_socket, is only transitioned
to NULL under the unix_state_lock().
Therefore make the security hooks follow the reverse mapping instead
of the forward mapping.
Reported-by: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a3c888fcda911fcb6e3c071aecf49ccb6effe79d
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 23:49:53 2011 +0100
gen_init_cpio: checkpatch fixes
Cc: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 44b8288308ac9da27eab7d7bdbf1375a568805c3
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Jan 5 10:35:02 2011 +0000
net_sched: pfifo_head_drop problem
commit 57dbb2d83d100ea (sched: add head drop fifo queue)
introduced pfifo_head_drop, and broke the invariant that
sch->bstats.bytes and sch->bstats.packets are COUNTER (increasing
counters only)
This can break estimators because est_timer() handles unsigned deltas
only. A decreasing counter can then give a huge unsigned delta.
My mid term suggestion would be to change things so that
sch->bstats.bytes and sch->bstats.packets are incremented in dequeue()
only, not at enqueue() time. We also could add drop_bytes/drop_packets
and provide estimations of drop rates.
It would be more sensible anyway for very low speeds, and big bursts.
Right now, if we drop packets, they still are accounted in byte/packets
abolute counters and rate estimators.
Before this mid term change, this patch makes pfifo_head_drop behavior
similar to other qdiscs in case of drops :
Dont decrement sch->bstats.bytes and sch->bstats.packets
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Hagen Paul Pfeifer <hagen@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 06778b1c383afbdb88ffd837e117bec06a76f450
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 22 10:15:52 2010 +0100
mac80211: remove stray extern
Somehow this snuck into my earlier patch, and
only now did I see a compiler warning:
net/mac80211/led.c:218:13: warning: function '__ieee80211_create_tpt_led_trigger' with external linkage has definition
Remove the stray extern.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 90fc4b3a5ba24f09af2a8c4a723651a328949460
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Dec 18 17:20:48 2010 +0100
mac80211: implement off-channel TX using hw r-o-c offload
When the driver has remain-on-channel offload,
implement off-channel transmission using that
primitive.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 21f83589644bb2ed98079bf1e2154c8e70ca6a6c
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Dec 18 17:20:47 2010 +0100
mac80211: implement hardware offload for remain-on-channel
This allows drivers to support remain-on-channel
offload if they implement smarter timing or need
to use a device implementation like iwlwifi.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c96e96354a6c9456cdf1f150eca504e2ea35301e
Merge: dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a 33af88138b859f515b365a074e0a014d7cdbf846
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Jan 5 16:06:25 2011 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/Makefile
commit 4b95f135f606c87e4056b6d7fd3c5781c818858b
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Wed Jan 5 19:49:02 2011 +0100
tools, perf: Documentation for the power events API
Provides documentation for the following:
- the new power trace API,
- the old (legacy) power trace API,
- the DEPRECATED Kconfig option usage.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: trenn@xxxxxxx
Cc: Len Brown <len.brown@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
LKML-Reference: <1294253342-29056-3-git-send-email-j-pihet@xxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 938cfed18bec2c7361f37efc954712a7cc42c353
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Wed Jan 5 19:49:01 2011 +0100
perf: Add calls to suspend trace point
Uses the machine_suspend trace point, called from the
generic kernel suspend_devices_and_enter function.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
CC: Thomas Renninger <trenn@xxxxxxx>
Cc: Len Brown <len.brown@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
LKML-Reference: <1294253342-29056-2-git-send-email-j-pihet@xxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0eefed84fe9e1eb90f4b089ead95904306b23233
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Sun Oct 31 21:23:55 2010 +0100
m68k/sun3: Kill pte_unmap() warnings
Since commit 31c911329e048b715a1dfeaaf617be9430fd7f4e ("mm: check the argument
of kunmap on architectures without highmem"), we get lots of warnings like
arch/m68k/kernel/sys_m68k.c:508: warning: passing argument 1 of â??kunmapâ?? from incompatible pointer type
As m68k doesn't support highmem anyway, open code the calls to kmap() and
kunmap() (the latter is a no-op) to kill the warnings, like is done on most
other architectures without CONFIG_HIGHPTE.
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Sam Creasey <sammy@xxxxxxxxx>
commit 33af88138b859f515b365a074e0a014d7cdbf846
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Jan 5 14:05:00 2011 -0500
ath9k: correct MODULE_PARM_DESC parameters for force_new_ani
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 18cb6e32e7aeea9c92af5793bee2b32536615502
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Jan 5 09:39:59 2011 -0500
ath5k: qualify global modparam_nohwcrypt variable
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3e6109c57468ed320beefd2861fe2cc418cccfc2
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Jan 5 09:39:17 2011 -0500
ath9k: qualify global modparam_nohwcrypt variable
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6303710d7aa62bfb154cd13ab5ab12cfa8baaf91
Merge: db98a6cfcc9ac951067c9a2cb60459b618fd7b10 d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Jan 5 14:35:41 2011 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 58daf18cdcab550262a5f4681e1f1e073e21965a
Merge: aa312be1987d43216e72ffce42bccf6bf81f62ed 0af85dda39d9b673aca8c0ebae004ea70f3efc93
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Jan 5 18:09:03 2011 +0000
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
commit aa312be1987d43216e72ffce42bccf6bf81f62ed
Merge: 31edf274f9aff1ccd39934a0b2fce38f4405c656 8c11a94d86eb5489dc665bc566bf624e329d89fa 38d624361b2a82d6317c379aebf81b1b28210bb0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Jan 5 18:08:31 2011 +0000
Merge branches 'mmci' and 'pl011-dma' into devel
commit 31edf274f9aff1ccd39934a0b2fce38f4405c656
Merge: 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 ed60453fa8f8fc3d034dfdf10371a99cc6905626 ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644 28257f7fdee0facc3b7f934e82c2485f27120d41 b23065313297e750edd57ab6edfd36224826724e 50005a8deb38e5e6456ebd94e57adb321d4589de cf562b4a550b3cd9d602a05bc27aaaaa376947b4 3d09fbcd26851ffb2c40cec411b8e56db02520d1 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Jan 5 18:08:10 2011 +0000
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel
commit 38d624361b2a82d6317c379aebf81b1b28210bb0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 17:59:16 2010 +0000
ARM: PL011: add DMA burst threshold support for ST variants
ST Micro variants has some specific dma burst threshold compensation,
which allows them to make better use of a DMA controller. Add support
to set this up.
Based on a patch from Linus Walleij.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 68b65f7305e54b822b2483c60de7d7b017526a92
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 17:24:39 2010 +0000
ARM: PL011: Add support for transmit DMA
Add DMA engine support for transmit to the PL011 driver. Based on a
patch from Linus Walliej, with the following changes:
- remove RX DMA support. As PL011 doesn't give us receive timeout
interrupts, we only get notified of received data when the RX DMA
has completed. This rather sucks for interactive use of the TTY.
- remove abuse of completions. Completions are supposed to be for
events, not to tell what condition buffers are in. Replace it with
a simple 'queued' bool.
- fix locking - it is only safe to access the circular buffer with the
port lock held.
- only map the DMA buffer when required - if we're ever behind an IOMMU
this helps keep IOMMU usage down, and also ensures that we're legal
when we change the scatterlist entry length.
- fix XON/XOFF sending - we must send XON/XOFF characters out as soon
as possible - waiting for up to 4095 characters in the DMA buffer
to be sent first is not acceptable.
- fix XON/XOFF receive handling - we need to stop DMA when instructed
to by the TTY layer, and restart it again when instructed to. There
is a subtle problem here: we must not completely empty the circular
buffer with DMA, otherwise we will not be notified of XON.
- change the 'enable_dma' flag into a 'using DMA' flag, and track
whether we can use TX DMA by whether the channel pointer is non-NULL.
This gives us more control over whether we use DMA in the driver.
- we don't need to have the TX DMA buffer continually allocated for
each port - instead, allocate it when the port starts up, and free
it when it's shut down. Update the 'using DMA' flag if we get
the buffer, and adjust the TTY FIFO size appropriately.
- if we're going to use PIO to send characters, use the existing IRQ
based functionality rather than reimplementing it. This also ensures
we call uart_write_wakeup() at the appropriate time, otherwise we'll
stall.
- use DMA engine helper functions for type safety.
- fix init when built as a module - we can't have to initcall functions,
so we must settle on one. This means we can eliminate the deferred
DMA initialization.
- there is no need to terminate transfers on a failed prep_slave_sg()
call - nothing has been setup, so nothing needs to be terminated.
This avoids a potential deadlock in the DMA engine code
(tasklet->callback->failed prepare->terminate->tasklet_disable
which then ends up waiting for the tasklet to finish running.)
- Dan says that the submission callback should not return an error:
| dma_submit_error() is something I should have removed after commit
| a0587bcf "ioat1: move descriptor allocation from submit to prep" all
| errors should be notified by prep failing to return a descriptor
| handle. Negative dma_cookie_t values are only returned by the
| dma_async_memcpy* calls which translate a prep failure into -ENOMEM.
So remove the error handling at that point. This also solves the
potential deadlock mentioned in the previous comment.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 963cc981af620c7c07b5f6d1ab998b639e90ecb1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 17:16:09 2010 +0000
ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
As the DMA support introduces a separate interrupt-time callback, our
interrupt handler will not be the only handler which takes the port
lock, so we need to ensure that IRQs are disabled. We must use the
_irqsave variant so we don't inadvertently enable interrupts.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ffca2b114c6a804d1307781df687e877a373a1c2
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 17:13:05 2010 +0000
ARM: PL011: Separate hardware FIFO size from TTY FIFO size
With DMA support, we need to tell the TTY subsystem that the DMA buffer
is the size of the FIFO, otherwise things like tty_wait_until_sent()
will time out too early. Keep (and use) the hardware value separately
from the port->fifosize.
This was part of a larger patch from Linus Walleij, with a little
modification.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit c19f12b5ef3adf3c139eabbe3d3d0201838b77b1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 17:48:26 2010 +0000
ARM: PL011: Allow better handling of vendor data
Rather than copying all vendor data into the port structure, copy
just that which is frequently used, and keep a pointer to the
remaining vendor data structure. This makes it easier to add
vendor quirks in the future.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5063e2c567ee569cccfc01ebf80c898cb4e6833a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 17:09:08 2010 +0000
ARM: PL011: Ensure error flags are clear at startup
The error flags weren't being cleared upon UART startup, which
can cause problems when we add DMA support. It's good practice
to ensure that these flags are cleared anyway, so let's do so.
This was part of a larger patch from Linus Walleij.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e8a7ba86ff993311f8712e5b3bb2e3892e82df5f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Dec 28 09:16:54 2010 +0000
ARM: PL011: include revision number in boot-time port printk
Include the revision number of the PL011 primecell in the boot-time
port printk to allow proper identification of the peripheral.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit eccdfe2d245a882feacc4630c9bc29805e9929c8
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Jan 4 16:32:52 2011 -0200
perf script: Make some lists static
Not accessed outside builtin-script, so make them static.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 6d8afb56300c53a250c6de0f973ef502e54aabf3
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Jan 4 16:27:30 2011 -0200
perf script: Use the default lost event handler
That already does what was being done here. The warning is now unconditionally
given by __perf_session__process_pipe_events, just like for non pipe processing.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 1109599458c06256064213dc44ca5f5fa8ee3833
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Jan 4 16:25:15 2011 -0200
perf session: Warn about errors when processing pipe events too
Just like we do at __perf_session__process_events
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit d030260ad33b482a371f999c7e9db79ef7a2111f
Author: Stephane Eranian <eranian@xxxxxxxxxx>
Date: Tue Jan 4 16:30:01 2011 +0200
perf tools: Fix perf_event.h header usage
This patch fixes the usage of the perf_event.h header file
between command modules and the supporting code in util.
It is necessary to ensure that ALL files use the SAME
perf_event.h header from the kernel source tree.
There were a couple of #include <linux/perf_event.h> mixed
with #include "../../perf_event.h".
This caused issues on some distros because of mismatch
in the layout of struct perf_event_attr. That eventually
led perf stat to segfault.
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxx>
LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@xxxxxxxxxxxxx>
Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 454a3bbe9b75eb8cbddffcf383fbb8e97ea78f52
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Jan 4 10:40:08 2011 -0200
perf test: Clarify some error reports in the open syscall test
Rebooted my devel machine, first thing I ran was perf test, that expects
debugfs to be mounted, test fails. Be more clear about it.
Also add missing newlines and add more informative message when
sys_perf_event_open fails.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit a7862aa90ffd1113bc2898ae6be2e4861b1f76cc
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Jan 5 12:31:15 2011 -0300
[media] cx25821: Fix compilation breakage due to BKL dependency
drivers/staging/cx25821/cx25821-video.c: In function â??video_openâ??:
drivers/staging/cx25821/cx25821-video.c:817:8: error: implicit declaration of function â??lock_kernelâ??
drivers/staging/cx25821/cx25821-video.c:834:9: error: implicit declaration of function â??unlock_kernelâ??
This patch just adds a header with BKL function. It should be enough
to avoid compilation breakage, but, as BKL will be removed, we need
to properly fix it on a latter patch.
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Reported-by: Anca Emanuel <anca.emanuel@xxxxxxxxx>
Cc: Palash Bandyopadhyay <Palash.Bandyopadhyay@xxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6
Author: Huang Ying <ying.huang@xxxxxxxxx>
Date: Tue Jan 4 22:38:09 2011 -0500
x86, NMI: Add touch_nmi_watchdog to io_check_error delay
Prevent the long delay in io_check_error making NMI watchdog
timeout.
Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
LKML-Reference: <1294198689-15447-3-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 554ec063982752e9a569ab9189eeffa3d96731b2
Author: Dongdong Deng <dongdong.deng@xxxxxxxxxxxxx>
Date: Tue Jan 4 22:38:08 2011 -0500
x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time
The spin_lock_debug/rcu_cpu_stall detector uses
trigger_all_cpu_backtrace() to dump cpu backtrace.
Therefore it is possible that trigger_all_cpu_backtrace()
could be called at the same time on different CPUs, which
triggers and 'unknown reason NMI' warning. The following case
illustrates the problem:
CPU1 CPU2 ... CPU N
trigger_all_cpu_backtrace()
set "backtrace_mask" to cpu mask
|
generate NMI interrupts generate NMI interrupts ...
\ | /
\ | /
The "backtrace_mask" will be cleaned by the first NMI interrupt
at nmi_watchdog_tick(), then the following NMI interrupts
generated by other cpus's arch_trigger_all_cpu_backtrace() will
be taken as unknown reason NMI interrupts.
This patch uses a test_and_set to avoid the problem, and stop
the arch_trigger_all_cpu_backtrace() from calling to avoid
dumping a double cpu backtrace info when there is already a
trigger_all_cpu_backtrace() in progress.
Signed-off-by: Dongdong Deng <dongdong.deng@xxxxxxxxxxxxx>
Reviewed-by: Bruce Ashfield <bruce.ashfield@xxxxxxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
LKML-Reference: <1294198689-15447-2-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
commit 9ab181fa9ff73a38fccd0a4f1c40a38dfe62b535
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Tue Jan 4 22:38:07 2011 -0500
x86: Only call smp_processor_id in non-preempt cases
There are some paths that walk the die_chain with preemption on.
Make sure we are in an NMI call before we start doing anything.
This was triggered by do_general_protection calling notify_die
with DIE_GPF.
Reported-by: Jan Kiszka <jan.kiszka@xxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
LKML-Reference: <1294198689-15447-1-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit aef1b9cef78ae65c6501850851cc3f61f9be477b
Merge: 20c457b8587bee4644d998331d9e13be82e05b4c 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Jan 5 14:22:08 2011 +0100
Merge commit 'v2.6.37' into perf/core
Merge reason: Add the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6bf4123760a5aece6e4829ce90b70b6ffd751d65
Author: NeilBrown <neilb@xxxxxxx>
Date: Wed Jan 5 12:50:16 2011 +1100
sched: Change wait_for_completion_*_timeout() to return a signed long
wait_for_completion_*_timeout() can return:
0: if the wait timed out
-ve: if the wait was interrupted
+ve: if the completion was completed.
As they currently return an 'unsigned long', the last two cases
are not easily distinguished which can easily result in buggy
code, as is the case for the recently added
wait_for_completion_interruptible_timeout() call in
net/sunrpc/cache.c
So change them both to return 'long'. As MAX_SCHEDULE_TIMEOUT
is LONG_MAX, a large +ve return value should never overflow.
Signed-off-by: NeilBrown <neilb@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: J. Bruce Fields <bfields@xxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <20110105125016.64ccab0e@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 27066fd484a32c80630136aa2b91c980f3198f9d
Merge: 101e5f77bf35679809586e250b6c62193d2ed179 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Jan 5 14:14:42 2011 +0100
Merge commit 'v2.6.37' into sched/core
Merge reason: Merge the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cb2ded37fd2e1039f96c8c892da024a8f033add5
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Jan 4 16:38:52 2011 -0800
x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion
Found one x2apic pre-enabled system, x2apic_mode suddenly get
corrupted after register some cpus, when compiled
CONFIG_NR_CPUS=255 instead of 512.
It turns out that generic_processor_info() ==> phyid_set(apicid,
phys_cpu_present_map) causes the problem.
phys_cpu_present_map is sized by MAX_APICS bits, and pre-enabled
system some cpus have an apic id > 255.
The variable after phys_cpu_present_map may get corrupted
silently:
ffffffff828e8420 B phys_cpu_present_map
ffffffff828e8440 B apic_verbosity
ffffffff828e8444 B local_apic_timer_c2_ok
ffffffff828e8448 B disable_apic
ffffffff828e844c B x2apic_mode
ffffffff828e8450 B x2apic_disabled
ffffffff828e8454 B num_processors
...
Actually phys_cpu_present_map is referenced via apic id, instead
index. We should use MAX_LOCAL_APIC instead MAX_APICS.
For 64-bit it will be 32768 in all cases. BSS will increase by 4k bytes
on 64-bit:
text data bss dec filename
21696943 4193748 12787712 38678403 vmlinux.before
21696943 4193748 12791808 38682499 vmlinux.after
No change on 32bit.
Finally we can remove MAX_APCIS that was rather confusing.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
LKML-Reference: <4D23BD9C.3070102@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8e1023016cf17152972b98bce6c144834a4916d5
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:18 2011 +0100
[S390] prevent unneccesary loops_per_jiffy recalculation
When the seqfile /proc/cpuinfo gets accesses for each possible cpu
loops_per_jiffy gets recalculated. However its value is only needed
on first access.
In addition loops_per_jiffy should be recalculated when the machine
reports a capability change.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 19726cec63aeadad127f9e72ee69240336e37f15
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:17 2011 +0100
[S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
Use get_online_cpus() instead of preempt_disable() to make sure cpus
don't go offline while accessing their per cpu data.
The preempt_disable() stuff is old code which was used before
get_online_cpus() was available.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 974de4d7e70a6d759457722a6f322cc86b480eea
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:16 2011 +0100
[S390] smp: remove cpu hotplug messages
Get rid of messages that indicate if a cpu went online or offline.
There is nothing special about this anymore and these messages might
flood the kernel log buffer which makes debugging harder since more
important messages might be overwritten.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit fa188ae1657d6edc7963d524ce9a0650fe725242
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Wed Jan 5 12:48:15 2011 +0100
[S390] mutex: enable spinning mutex on s390
This enables the spinning mutex feature on s390 by removing
HAVE_DEFAULT_NO_SPIN_MUTEXES from arch/s390/Kconfig.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 34b133f8e94e39ff3cf4d1c1f67f2e07cdc3d54e
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Wed Jan 5 12:48:14 2011 +0100
[S390] mutex: Introduce arch_mutex_cpu_relax()
The spinning mutex implementation uses cpu_relax() in busy loops as a
compiler barrier. Depending on the architecture, cpu_relax() may do more
than needed in this specific mutex spin loops. On System z we also give
up the time slice of the virtual cpu in cpu_relax(), which prevents
effective spinning on the mutex.
This patch replaces cpu_relax() in the spinning mutex code with
arch_mutex_cpu_relax(), which can be defined by each architecture that
selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so
this patch should not affect other architectures than System z for now.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290437256.7455.4.camel@thinkpad>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c03017544e3b2e60aa3c8ae451fac01595f1bf11
Author: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Date: Wed Jan 5 12:48:13 2011 +0100
[S390] cio: fix ccwgroup unregistration race condition
A race condition exists in the ccwgroup device unregistration code
which can cause a kernel panic due to a use-after-free bug. This
race condition might be triggered when all ccw devices associated with
a ccwgroup device are removed at the same time (e.g. because the
corresponding channel path becomes no longer available).
Fix this race condition by clearing the references from the associated
ccw devices to the ccw group device during unregistration of the
ccw group device.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f602be639e97024a77062368e123008c94b3109a
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:12 2011 +0100
[S390] perf: add DWARF register lookup for s390
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 4cc9bed034d1ae588e5b773ee0edeb74ef3c0ff4
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:48:11 2011 +0100
[S390] cleanup ftrace backend functions
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5e9a26928f550157563cfc06ce12c4ae121a02ec
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:48:10 2011 +0100
[S390] ptrace cleanup
Overhaul program event recording and the code dealing with the ptrace
user space interface.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit da7f51c11d5fedca9ba779ee220063ccb4f0a27e
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:09 2011 +0100
[S390] smp/idle: call init_idle() before starting a new cpu
Call init_idle() which (re-)initializes the idle task structure before
it gets used on a new cpu.
That way we can also get rid of the odd preempt_enable_no_resched()
call we have in the cpu offline path within cpu_idle(). That call
prevented preempt count imbalances between cpu hotplug operations.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f230886b0b0f0ce604395481bea05f3c0ad8fc9e
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:08 2011 +0100
[S390] smp: delay idle task creation
Delay idle task creation until a cpu gets set online instead of
creating them for all possible cpus at system startup.
For one cpu system this should safe more than 1 MB.
On my debug system with lots of debug stuff enabled this saves 2 MB.
Same as on x86.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 09a8e7adcf960bd6a7204f3f3b377a89ce22efbf
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Wed Jan 5 12:48:07 2011 +0100
[S390] dasd: Correct retry counter for terminated I/O.
In case the DASD driver needs to term a running I/O the retry counter
is decreased twice.
Remove the unnecessary retry counter decrease in das_term_IO.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e4dbb0f2b5dd6a836d0e5c60aa5f573e0bbcf76a
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Wed Jan 5 12:48:06 2011 +0100
[S390] dasd: Add support for raw ECKD access.
Normal I/O operations through the DASD device driver give only access
to the data fields of an ECKD device even for track based I/O.
This patch extends the DASD device driver to give access to whole
ECKD tracks including count, key and data fields.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6f272b9cec285a9610a2acf101f694bc58bed37e
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Wed Jan 5 12:48:05 2011 +0100
[S390] dasd: Prevent deadlock during suspend/resume.
The freeze callback may set a stop bit so that a worker thread could
not start I/O. The discipline specific freeze function waits for the
worker to be completed.
Set the stop_bit after the discipline specific freeze function has
returned and no worker is running.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5a27e60dec59a95bd7f8ae9a19ae2ede4f76395b
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date: Wed Jan 5 12:48:04 2011 +0100
[S390] dasd: Improve handling of stolen DASD reservation
If a DASD device has been reserved by a Linux system, and later
this reservation is â??stolenâ?? by a second system by means of an
unconditional reserve, then the first system receives a
notification about this fact. With this patch such an event can
be either ignored, as before, or it can be used to let the device
fail all I/O request, so that the device will not block anymore.
Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit a4d26c6aeceea330ee5e0fb6b017d57e3b252d29
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date: Wed Jan 5 12:48:03 2011 +0100
[S390] dasd: do path verification for paths added at runtime
When a new path is added at runtime, the CIO layer will call the drivers
path_event callback. The DASD device driver uses this callback to trigger
a path verification for the new path. The driver will use only those
paths for I/O, which have been successfully verified.
Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ef19298b406f93af4bb249f0776deb8366e97532
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date: Wed Jan 5 12:48:02 2011 +0100
[S390] dasd: add High Performance FICON multitrack support
Some storage systems support multitrack High Performance FICON
requests, which read or write data to more than one track.
This patch enables the DASD device driver to generate multitrack
High Performance FICON requests.
Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9062014cb60194630272709da82d5879d563865e
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date: Wed Jan 5 12:48:01 2011 +0100
[S390] cio: reduce memory consumption of itcw structures
Any list of indirect data adresses (TIDAL) used by a TCW must not
cross a page boundary. The original itcw implementation complies with
this restriction by allocating allmost twice as much memory as
actually needed, so that in any case there is enough room for the full
TIDAL, either above or below the page boundary.
This patch implements an alternative method, by using a TTIC TIDAW to
connect TIDAL parts below and above a page boundary.
Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f3e1a273594c7d82b07102bd03e8adfe681f2864
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:48:00 2011 +0100
[S390] nmi: enable machine checks early
Until now machine checks for the swapper process of the IPL cpu are just
implicitly (and more or less accidently) enabled when the first time the
idle process goes into idle state and loads an enabled wait psw.
Before that machine checks are disabled.
So let's enable them explicitly in trap_init() so we have a well defined
time when machine checks are enabled.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit aa3a41d009d433dd9775b356b2d70551816f1f3c
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:59 2011 +0100
[S390] qeth: buffer count imbalance
The used buffers counter is not incremented in case of an error so
the counter can become negative. Increment the used buffers counter
before checking for errors.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 4bc4e965d3e86897e4c7c487a477ccdf13db5b82
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:58 2011 +0100
[S390] css: update subchannel descriptor
Update the subchannel descriptor if we receive a
"Installed parameters modified" crw.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 1de3447a41ea72972966b4896a9f8d2b064bd23f
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:57 2011 +0100
[S390] 31 bit entry.S update.
Make the code in the 31 bit entry.S code as similar as possible to the
64 bit version in entry64.S. That makes it easier to add new code to
the first level interrupt handler that affects both 31 and 64 bit kernels.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ce322ccd53f2505cf8b0ed204631d6ac054ac66a
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:56 2011 +0100
[S390] cio: obtain mdc value per channel path
Add support to accumulate the number of 64K-bytes blocks all paths
to a device at least support for a transport command.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 37e8952174c6c239d1c86125e032fd6ad107a3e6
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:55 2011 +0100
[S390] nohz: optimize arch_needs_cpu()
arch_needs_cpu() gets always executed on the current cpu. Therefore
the cpu parameter can be ignored it is possible to use __get_cpu_var()
instead of per_cpu() to access the per_cpu variable, which will
generate better code.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 90adac58d1a4daf3560739ff5b76497d5ece16c4
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:54 2011 +0100
[S390] qdio: cleanup SIGA sync
Simplify the SIGA sync code and add unlikely annotations. In polling mode
SBALs may be accessed without interrupt, so call SIGA sync before every scan.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 110da31709023de61735f2d8a3e52c20c23bb570
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:53 2011 +0100
[S390] qdio: remove enhanced SIGA
HiperSocket devices only use one SBAL per qdio call without the enhanced SIGA
feature. Since that feature is currently not used remove it from the qdio code
so the compiler can generate better code for the HiperSocket outbound path.
While at it mark the SIGA error conditions as unlikely.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 958c0ba403cb6a693b54be2389f9ef53377fa259
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:52 2011 +0100
[S390] qdio: use proper QEBSM operand for SIGA-R and SIGA-S
If QIOASSIST is enabled for a qdio device the SIGA instruction requires
a modified function code. This function code modifier was missing for
SIGA-R and SIGA-S which can lead to a kernel panic caused by an
operand exception.
Cc: stable@xxxxxxxxxx
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0195843bfda90a215f3b72c9aac2fd0bc9244b67
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:51 2011 +0100
[S390] qdio: outbound queue full counter
Add a counter for outbound queue full events to the qdio statistics.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 3d6c76ff32bb9b2ebf6e859855d315eb42e3df50
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:50 2011 +0100
[S390] qdio: outbound tasklet scan threshold
Introduce a scan treshold for the qdio outbound queues. By setting the
threshold the driver can tell qdio after how much used SBALs qdio
should schedule the outbound tasklet that scans the queue for finished
SBALs. The threshold is specific by the drivers because a
Hipersockets device is much faster in utilizing outbound buffers than a
ZFCP or OSA device.
The default values after how many used SBALs the tasklet should run are:
OSA: > 31 SBALs
Hipersockets: > 7 SBALs
zfcp: > 55 SBALs
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 4f325184f2d4c1f2258873b2a333005dc4dfcbc0
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:49 2011 +0100
[S390] qdio: prevent race for shared indicators
If the shared indicator is used the following race leads to
an inbound stall:
Device CPU0 CPU1
========================================================
non-shared DSCI =>1
ALSI => 1
Thin INT
ALSI => 0
non-shared DSCI
tasklets scheduled
shared DSCI => 1
ALSI => 1
shared DSCI => 0
ALSI ? -> set
Thin INT
ALSI => 0
ALSI was set,
shared DSCI => 1
After that no more interrupts occur because the DSCI is still set.
Fix that race by only resetting the shared DSCI if it was actually
set so the tasklets for all shared devices are scheduled and will
run after the interrupt.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 078f8ecaa30718694d1e13d9f415b7ce75b3c968
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Wed Jan 5 12:47:48 2011 +0100
[S390] Handling of 4096 bit RSA keys in CRT format.
Also process 4096 bit RSA keys in CRT format. Handle them like the
smaller keys and take care of the zero padding.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c2567f8ffa2704f6f2f81013e9a590deca5a865f
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Wed Jan 5 12:47:47 2011 +0100
[S390] zcrypt: cope with cca restriction of cex3
The cca on the crypto adapter has a restriction in the size of the
exponent if a key with a modulus bigger than 2048 bit is used. Thus
in that case we have to avoid that the crypto device driver thinks
the adapter is defect and sets it offline. Therfore a new member for
the zcrypt_device struct called max_exp_bit_length is introduced. This
will be set the first time the cca returns the error code function
not implemented. If this is done with an adapter twice it will return
-EINVAL.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2ade1fab026b4a103f0105ec4b47654fc2f729c7
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Wed Jan 5 12:47:46 2011 +0100
[S390] zcrypt: support for 4096 bit keys for cex3c
Definitions for CEX3 card types are changed to support 4096 bit RSA
keys in the coprocessor.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Ralph Wuerthner <ralph.wuerthner@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 3e309a66f52e042881f76cbfb9b6c2aa70163e02
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Wed Jan 5 12:47:45 2011 +0100
[S390] zcrypt: support for 4096 bit keys for cex3a
Definitions for CEX3 card types are changed to support 4096 bit RSA
keys. Also new structs for the accelerator mode are needed.
Additionaly when checking the length of key parts, the case for bigger
(4096 bit) keys is needed.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Ralph Wuerthner <ralph.wuerthner@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b1f933da570576d1f290ea4dc9b896404cbd285d
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Wed Jan 5 12:47:44 2011 +0100
[S390] zcrypt: Introduce check for 4096 bit support.
Implemented an asm in the ap bus and made it accessible for the card
specific parts of the zcrypt driver. Thus when a cex3a is recognized
a check can be performed to dermine whether the card supports 4096 bit
RSA keys.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2fcb3686e1601cff992e026dceeab1b22dc81178
Author: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:43 2011 +0100
[S390] hypfs: Move buffer allocation from open to read
Currently the buffer for diagnose data is allocated in the open function
of the debugfs file and is released in the close function. This has the
drawback that a user (root) can pin that memory by not closing the file.
This patch moves the buffer allocation to the read function. The buffer is
automatically released after the buffer is copied to userspace.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6432c015b754fef910dd7468b16fffc2b975348a
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:42 2011 +0100
[S390] current_thread_info optimization
Use thread_info lowcore field for current_thread_info(), saves
an unnecessary calculation.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b1b750918566c6c4e8ed6c9b3c0f05b4c0a8805c
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:41 2011 +0100
[S390] extint: get rid of early code plus cleanup
Get rid of register/unregister_early_external_interrupt() and clean up
the code while at it.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 98b799800c3e2f855ef2d2c6263e84fa5d1420a0
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:40 2011 +0100
[S390] sclp: use register_external_interrupt()
Use register_external_interrupt() instead of register_early_external_interrupt().
The early variant is not necessary since kmalloc works already.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit fb0a9d7e865afdae70829a64bb004a74ff67d29f
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:39 2011 +0100
[S390] pfault: delay register of pfault interrupt
Use an early init call to initialize pfault. That way it is possible to
use the register_external_interrupt() instead of the early variant.
No need to enable pfault any earlier since it has only effect if user
space processes are running.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 62d146ffe3adfed2747fc36138476c8417ce73a7
Author: Holger Dengler <hd@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:38 2011 +0100
[S390] ap bus: add support for irq statistics
Add support for AP Bus I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Holger Dengler <hd@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 85b81cdd0b038d580dedf6289df7de65826967d6
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:37 2011 +0100
[S390] ctc: add support for irq statistics
Add support for CTC I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 355eb4022b92349f70cd69ce5b9572c71c0be226
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:36 2011 +0100
[S390] claw: add support for irq statistics
Add support for CLAW I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 096a61682e86090e4e74118ff6fa6858ca73aa58
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:35 2011 +0100
[S390] lcs: add support for irq statistics
Add support for LCS I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f48198d592b0d680b9677bd69edd2290cd0c1f4f
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:34 2011 +0100
[S390] vmur: add support for irq statistics
Add support for VMUR I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b86651721f18f40319efe94ed3eac2d26682e5b9
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:33 2011 +0100
[S390] tape: add support for irq statistics
Add support for ccw based tape I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 3fe22f6bfd6f81aafd140d69578d3a2c39674664
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:32 2011 +0100
[S390] 3270: add support for irq statistics
Add support for 3270 I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 12fae5858cd97181c92472c9bb5f098a7eca2ffe
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:31 2011 +0100
[S390] 3215: add support for irq statistics
Add support for 3215 I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 3283942b71eb5023184b378230f5f0e3fbb40991
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:30 2011 +0100
[S390] dasd: add support for irq statistics
Add support for DASD I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 30d77c3e1cbdff304b16ae02cb56baaa308e42fd
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Jan 5 12:47:29 2011 +0100
[S390] qdio: add qdio interrupts to interrupt statistics
Count traditional qdio interrupts and adapter interrupts for qdio
in the interrupt statistics.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 052ff461c8427629aee887ccc27478fc7373237c
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:28 2011 +0100
[S390] irq: have detailed statistics for interrupt types
Up to now /proc/interrupts only has statistics for external and i/o
interrupts but doesn't split up them any further.
This patch adds a line for every single interrupt source so that it
is possible to easier tell what the machine is/was doing.
Part of the output now looks like this;
CPU0 CPU2 CPU4
EXT: 3898 4232 2305
I/O: 782 315 245
CLK: 1029 1964 727 [EXT] Clock Comparator
IPI: 2868 2267 1577 [EXT] Signal Processor
TMR: 0 0 0 [EXT] CPU Timer
TAL: 0 0 0 [EXT] Timing Alert
PFL: 0 0 0 [EXT] Pseudo Page Fault
[...]
NMI: 0 1 1 [NMI] Machine Checks
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 545b288dcbdea58a2ce2afba5f6a8302d31ac459
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:27 2011 +0100
[S390] time: let local_tick_enable/disable() reprogram the clock comparator
Let local_tick_enable/disable() reprogram the clock comparator so the
function names make semantically more sense.
Also that way the functions are more symmetric since normally each
local_tick_enable() call usually would have a subsequent call to
set_clock_comparator() anyway.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 17eb7a5cfa98627e5b34e9a9a33b4f04f1c8832d
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Jan 5 12:47:26 2011 +0100
[S390] time: move local_tick_enable()/disable() to timex.h
Move the two functions to timex.h where they make more sense than in
hardirq.h.
No functional change.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 860dba45e81be2e1ba977617652ae36084daebaf
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:25 2011 +0100
[S390] add kprobes annotations
Add kprobes annotations to get the massive 'probe kernel.function("*") {}'
stress test working.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 4a1886358b2d68f6f8745bfc10399c2376681acc
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:24 2011 +0100
[S390] kprobes: coding style
Correct some minor coding style issues.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0e917cc3297f3274993d25b5972c2b1c6f763819
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:23 2011 +0100
[S390] kprobes: restructure handler function
Restructure the kprobe breakpoint handler function. Add comments to
make it more comprehensible and add a sanity check for re-entering
kprobes.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 92b8cbf17ae98a118d3e4a123246a05130114d06
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:22 2011 +0100
[S390] kprobes: jprobe save and restore
Register %r14 and %r15 are already stored in jprobe_saved_regs, no need
to store them a second time in jprobe_saved_r14 / jprobe_saved_r15.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 371db06b017c518da2d69ae278c5978ebcd1041a
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:21 2011 +0100
[S390] kprobes: insn slots
The s390 architecture can execute code on kmalloc/vmalloc memory.
No need for the __ARCH_WANT_KPROBES_INSN_SLOT detour.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b9599798f953084774da926caa8bafd7e244948e
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:20 2011 +0100
[S390] kprobes: activation and deactivation
Replace set_current_kprobe/reset_current_kprobe/save_previous_kprobe/
restore_previous_kprobe with a simpler scheme push_kprobe/pop_kprobe.
The mini kprobes stack can store up to two active kprobes.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ba640a591574036ab22cd32b47897340b0605342
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:19 2011 +0100
[S390] kprobes: instruction fixup
Determine instruction fixup details in resume_execution, no need to do
it beforehand. Remove fixup, ilen and reg from arch_specific_insn.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5a8b589f8a35b2c69d1819e3365825e4385a844c
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:18 2011 +0100
[S390] kprobes: instruction swap
Move the definition of the helper structure ins_replace_args to the
only place where it is used and drop the old member as it is not needed.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit fc0a1fea6b81095b6c0e01ec3407d04c8341974c
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:17 2011 +0100
[S390] kprobes: single step cleanup
The saved interrupt mask and the saved control registers are only
relevant while single stepping is set up. A secondary kprobe while
kprobe single stepping is active may not occur. That makes is safe
to remove the save and restore of kprobe_saved_imask / kprobe_save_ctl
from save_previous_kprobe and restore_previous_kprobe.
Move all single step related code to two functions, enable_singlestep
and disable_singlestep.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 35f2aaa79a2d484c8449f34461464a1e84e36e2b
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:16 2011 +0100
[S390] kprobes: single stepped breakpoint
Remove special case of a kprobe on a breakpoint while a relocated
instruction is single stepped. The only instruction that may cause
a fault while kprobe single stepping is active is the relocated
instruction. There is no kprobe on the instruction slot retrieved
with get_insn_slot().
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6f9a3c330652b0fdb65d89e94977a8e79fe730e7
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Wed Jan 5 12:47:15 2011 +0100
[S390] cleanup s390 Kconfig
Make use of def_bool and def_tristate where possible and add sensible
defaults to the config symbols where applicable. This shortens the
defconfig file by another ~40 lines.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 53ec24b1e6c7118a127cf029a1519a2ce55268ec
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Wed Jan 5 12:46:44 2011 +0100
[S390] zcrypt: Fix check to look for facility bits 2 & 65
Fix the check for ap interupts to look for facility bits 2 and 65.
Make sure that we only register interrupts for aps, if the machine
has ap interrupt support.
This patch is relevant only for the 2.6.37 stable series.
Cc: stable@xxxxxxxxxx
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0af85dda39d9b673aca8c0ebae004ea70f3efc93
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:58:50 2010 +0000
ARM: vexpress: add sched_clock() for Versatile Express
Add a sched_clock() implementation to Versatile Express using the new
sched_clock() infrastructure for extending 32bit counters to full
64-bit nanoseconds.
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 1051b9f0f9eab8091fe3bf98320741adf36b4cfa
Merge: cde9efef401563943d5a58eb9b7274bfdc08ca9b a58154d1c3535f451a409abbd0bda6770b2d9380
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Jan 5 10:23:38 2011 +0000
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
commit d3a23e1678a5827c38ed8a465ad91d65e59fa911
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date: Wed Jan 5 20:01:21 2011 +1100
Revert "fs: use RCU read side protection in d_validate"
This reverts commit 3825bdb7ed920845961f32f364454bee5f469abb.
You cannot dget() a dentry without having a reference, or holding
a lock that guarantees it remains valid.
Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
commit 97cbc8fb1e35e328073e84c4031bd338306397d6
Merge: 17d6ce11195fceda62af00beefde37e37a01337c 14bbb7c61557172e4482d4d97a5f56042a12b969
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Jan 5 17:30:20 2011 +0900
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
commit 025a10a76808cfd9e55dbf965d0f1453e4f8ae84
Merge: 6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8 f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b c070c203cde0e019cd373d3247137be11961deb3 d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Jan 5 17:25:29 2011 +0900
Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 14bbb7c61557172e4482d4d97a5f56042a12b969
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Dec 29 08:12:29 2010 +0000
fbdev: sh_mipi_dsi: use platform provided register layout and values
Different sh-mobile SoCs have variations in their MIPI DSI register layouts,
besides, different LCD panels require different configuration parameters. This
patch switches the driver to use platform-provided MIPI DSI parameters.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6fd465956e287f2bff8ff70ad4f27825dc3b468c
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Dec 29 08:12:26 2010 +0000
ARM: mach-shmobile: specify sh7372 MIPI DSI register layout
Prepare the ap4evb board for the MIPI DSI driver transition to support
different register layouts.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 38f3a8794236af422312d280bbe3801130cfa63b
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Dec 29 08:12:22 2010 +0000
fbdev: sh_mipi_dsi: support different register layouts
The register layout of the MIPI DSI unit on sh-mobile SoCs differ. Add platform
parameters to support such variations.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0851d50dc12a844778a9b243e141f713cd8f074f
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Mon Dec 27 10:23:09 2010 +0000
ARM: mach-shmobile: improve MIPI DSI clock configuration
Now, that the MIPI DSI driver implements runtime PM, we don't need anymore to
configure clocks statically in the platform code. This patch also adds a DSITX1
clock definition for sh7372 and attaches PHY clocks to respective devices.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 236782a5f3674d06865d822092b8a1ea65a44f96
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Mon Dec 27 10:23:05 2010 +0000
fbdev: sh-mobile: implement MIPI DSI runtime PM support
On SH-Mobile platforms using runtime PM with the MIPI DSI driver switches the
DSI Tx link clock on PM events.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c070c203cde0e019cd373d3247137be11961deb3
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Wed Dec 22 14:15:08 2010 +0000
ARM: mach-shmobile: sh73a0: fix div4 table
sh73a0 has divisor[12] setting as 1/7 on FRQCRA.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Tue Dec 28 05:54:53 2010 +0000
ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ae37c8de74734f640f757be64ddb85f19f042626
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Dec 22 14:47:40 2010 +0000
ARM: mach-shmobile: Mackerel VGA camera support
Add VGA camera support to the Mackerel board
using soc_camera_platform.
The VGA camera module is hooked up using the
8-bit CEU bus, and it is constantly bursting
out frames in fixed video mode setting. The
camera module does not allow any I2C control.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit eac676e531214f1e276645613acae7d7c4529035
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Sat Jan 1 18:36:36 2011 +0000
sh: correct definitions to access stack pointers
A definition like:
#define regs_return_value(regs) ((regs)->regs[0])
called with regs_return_value(foo) will be preprocessed to:
((foo)->foo[0])
^^^
So to fix this to ensure the preprocessor compiles such calls correctly.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Dec 29 07:59:25 2010 +0000
mmc: sh_mmcif: make DMA support by the driver unconditional
Simplify the driver by removing the possibility to build it without the DMA
support and remove the respective Kconfig parameter.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Acked-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 050855887236701c5e7ff803b42265824ce99885
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:19 2011 +0000
sparc: update copyright in piggyback.c
Update copyright info in piggyback.c to include
info from piggyback_64.c.
Include my own copyright too.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Josip Rodin <joy@xxxxxxxxxxxxxx>
Cc: Jakub Jelinek <jakub@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9202db2202288f0013c3285b291d8281a8190962
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:18 2011 +0000
sparc: unify strip command in boot/Makefile
Include an additional "Kernel is ready" print for zImage
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 56818a6f9105ac016ecf5907f7cb63bcdab639fe
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:17 2011 +0000
sparc: rename piggyback_32 to piggyback
Now that we use the same piggyback for 32 and 64 bit
we can drop the _32 suffix.
Include some trivial unification in the Makefile
now that 32 and 64 bit can share the same piggyback command.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1075c4ef707ca83afbeb0950094436eb0245ec86
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:16 2011 +0000
sparc: fix tftpboot.img for sparc64 on little-endian host
piggyback_32 adapted to support sparc64:
- locating "HdrS" differs for sparc and sparc64
- sparc64 updates a_text, a_data + a_bss in the final a.out header
Updated Makefile to use piggyback_32 for sparc64.
Deleted the now unused piggyback_64.c
piggyback_32.c is host endian neutral and works on both
little-endian and big-endian hosts.
This fixes a long standing bug where sparc64 could not
generate tftpboot.img on a x86 host.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a020bb17b7046cd97ea6924ca99325b6e516bc2d
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:15 2011 +0000
sparc: add $BITS to piggyback arguments
Add new option to piggyback that identify if this is
for 32 or 64 bit.
Use this information to determine the alignment used.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 571e08f6e2ddd6ec5d547358f55342726c063072
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:14 2011 +0000
sparc: remove obsolete ELF support in piggyback_32.c
As we always convert to a.out there is no need to
support ELF.
Removing ELF support because:
- it is not used
- it simplifies code to support a.out only
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9c239053045568abf960b01e4eb2c7205e3cd7d6
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:13 2011 +0000
sparc: additional comments to piggyback_32.c
While reverse engineering the functionality of piggyback
I missed that the code was actually commented.
So I added a few comments.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b2a39b0d8ec2ce2bdcff4e01572b4e885220254d
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:12 2011 +0000
sparc: use _start for the start entry (like 64 bit does)
We use "_start" in 64 bit - do the same in 32 bit.
It is always good to be consistent.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e405ae76af19cd2c85335b842f880a2bc98ba785
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:11 2011 +0000
sparc: use trapbase in setup_arch
start and trapbase point to the same address.
But using start to assing to sparc_ttable looked confusing.
Replace this with the use of trapbase.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2fe74fa9662f8df51e6ef18227089f54cc07e16a
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Tue Jan 4 11:39:10 2011 +0000
sparc: refactor piggy_32.c
Refactoring to increase readability (a little).
- sort includes
- spaces around operators
- small helpers introduced
- added a few comments
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Jan 4 16:50:19 2011 -0800
Linux 2.6.37
commit 65f42886e24be2197b1263f138eabf40c6774d00
Merge: 8a87694ed159d7abd2c9ed657416696c05db2252 9fc3bbb4a752f108cf096d96640f3b548bbbce6c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Jan 4 13:55:49 2011 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv4/route.c: respect prefsrc for local routes
bridge: stp: ensure mac header is set
bridge: fix br_multicast_ipv6_rcv for paged skbs
atl1: fix oops when changing tx/rx ring params
drivers/atm/atmtcp.c: add missing atm_dev_put
starfire: Fix dma_addr_t size test for MIPS
tg3: fix return value check in tg3_read_vpd()
Broadcom CNIC core network driver: fix mem leak on allocation failures in cnic_alloc_uio_rings()
ISDN, Gigaset: Fix memory leak in do_disconnect_req()
CAN: Use inode instead of kernel address for /proc file
skfp: testing the wrong variable in skfp_driver_init()
ppp: allow disabling multilink protocol ID compression
ehea: Avoid changing vlan flags
ueagle-atm: fix PHY signal initialization race
commit dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a
Merge: 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 9fc3bbb4a752f108cf096d96640f3b548bbbce6c
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Jan 4 11:57:25 2011 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit db98a6cfcc9ac951067c9a2cb60459b618fd7b10
Author: roel kluin <roel.kluin@xxxxxxxxx>
Date: Mon Jan 3 12:03:44 2011 -0800
libertas: down_interruptible() can return -EINTR, not EINTR
Fix test in lbs_spi_thread(). down_interruptible() can return -EINTR, but
not EINTR.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Cc: Dan Williams <dcbw@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b5c34f662a3519d34f9634a14d8de638fdbe0ca3
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Mon Jan 3 19:51:09 2011 +0100
mac80211: fix some key comments and code
The key documentation is slightly out of date, fix
that. Also, the list entry in the key struct is no
longer used that way, so list_del_init() isn't
necessary any more there.
Finally, ieee80211_key_link() is no longer invoked
under RCU read lock, but rather with an appropriate
station lock held.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cc72128750700d01c31f583a355c5f8f809498bb
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Mon Jan 3 21:22:18 2011 +0530
ath9k_htc: Fix packet injection
To inject a packet in monitor mode, a dummy station has
to be associated with the monitor interface in the target.
Failing to do this would result in a firmware crash on the device.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a8851d10aadb46b25db4459aa0d1150c957d2bc1
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Jan 3 08:46:29 2011 +0300
ath5k: ath5k_eeprom_mode_from_channel() returns signed
ath5k_eeprom_mode_from_channel() returns -1 on error but we're storing
the result in "ee_mode" which is an unsigned char. This breaks the
error handling. This patch makes "ee_mode" an int.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2ae79d52cdac733037490486792a53de9fb8d6b6
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Fri Dec 31 20:49:00 2010 +0530
ath9k : few rate control clean ups
Remove some obvious looking dead code and rename few functions
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 707e634326448190bfe2d937c44ec05c8dea63c4
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Thu Dec 30 17:29:53 2010 +0100
Revert "mac80211: temporarily disable reorder release timer"
This reverts enables the reorder release timer once again.
The issues laid out in:
<http://www.spinics.net/lists/linux-wireless/msg57214.html>
Have been addressed by:
mac80211: serialize rx path workers
mac80211: ignore PSM bit of reordered frames
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 24a8fdad35835e8d71f7c4b978a246fafed2e7b4
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Thu Dec 30 17:25:29 2010 +0100
mac80211: serialize rx path workers
This patch addresses the issue of serialization between
the main rx path and various reorder release timers.
<http://www.spinics.net/lists/linux-wireless/msg57214.html>
It converts the previously local "frames" queue into
a global rx queue [rx_skb_queue]. This way, everyone
(be it the main rx-path or some reorder release timeout)
can add frames to it.
Only one active rx handler worker [ieee80211_rx_handlers]
is needed. All other threads which have lost the race of
"runnning_rx_handler" can now simply "return", knowing that
the thread who had the "edge" will also take care of their
workload.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1186488b4a4d4871e40cb1604ba3ede3d4b7cc90
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Thu Dec 30 19:07:44 2010 +0530
ath9k: fix beacon restart on channel change
Restart the beacon timers only if the beacon
was already configured. Otherwise beacons timers
are restarted unnecessarily in unassociated state too.
Cc: stable@xxxxxxxxxx
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bd8027a72a1af95efd1dc8ea6df2fd9724c885b2
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Thu Dec 30 12:18:01 2010 +0530
Revert "ath9k: Parse DTIM period from mac80211"
This reverts commit 0ce3bcfc84900a64347b0fe1140229bd81314008.
Event though with the above commit we obtain the configured DTIM period
from the AP rather than always hardcoding it to '1', this seems to cause
problems under the following scenarios:
* Preventing association with broken AP's
* Adds latency in roaming
So its better to always use the safe value of '1' for dtim period
Cc: Jouni Malinen <Jouni.Malinen@xxxxxxxxxxx>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ff039c6fb372c87a3cc4fd25bb846790cb35edb8
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Wed Dec 29 17:09:02 2010 -0500
cfg80211: fix transposition of words in printk
Fixes the misplaced article in the following:
"cfg80211: Updating information on frequency 5785 MHz for
20 a MHz width channel with regulatory rule:"
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f76b57b47e5fd423f9827c7b0ba7bbd06cca6b9b
Author: Joel A Fernandes <agnel.joel@xxxxxxxxx>
Date: Tue Dec 28 19:28:11 2010 -0600
mac80211: Fix mesh portal communication with other mesh nodes.
Fixed a bug where if a mesh interface has a different MAC address from its bridge
interface, then it would not be able to send data traffic to any other mesh node.
This also adds support for communication between mesh nodes and external bridged
nodes by using a 6 address format if the source is a node within the mesh and the
destination is an external node proxied by a mesh portal.
Signed-off-by: Joel A Fernandes <agnel.joel@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1c30cc19081c16b1fe73ac13f2cb2abc009cdcc4
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Tue Dec 28 15:46:16 2010 +0100
ath9k_hw: fix dma descriptor rx error bit parsing
An Rx DMA descriptor can have multiple error bits set, and some error
bits (e.g. MIC failure) are filtered by the driver based on other criteria.
Remove the 'else' in various error bit checks so that all error information
is properly passed to the driver.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1e1f4ad25fab29ca48b1166e74a81e9c89ddf0fb
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 28 14:28:52 2010 +0530
ath9k_htc: Move LED/RFKILL code to htc_drv_gpio.c
And add the copyright/license header.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 039a07215e0fca00c450f4bf1dc9b458bdfe8559
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 28 14:28:37 2010 +0530
ath9k_htc: Fix fast channel change
When returning to the operating channel, a full HW
reset has to be done instead of a fast channel change.
Since sw_scan_complete() is called after the config() call for the
home channel, we end up doing a FCC. Fix this issue by checking
the OFFCHANNEL flag to determine FCC.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 73908674c6957082e8ab57daed57d2bb97a1ebba
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 28 14:28:27 2010 +0530
ath9k_htc: Handle FATAL events
The device has to be reset when a FATAL event is received.
Not doing so would leave the card in a non-working state.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 66e3547431a8738416b508badfb9f326d11dabcc
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 28 14:28:14 2010 +0530
ath9k_htc: Move work cancellation outside of mutex
There is no need to lock the various work cancellation
calls. This will be helpful when handling FATAL events.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ff8f59b5bbdf1527235b8c88d859c7d23691324f
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 28 14:28:05 2010 +0530
ath9k_htc: Handle pending URBs properly
When doing a channel change, the pending URBs have to be killed
properly on calling htc_stop().
This fixes the probe response timeout seen when sending UDP traffic at
a high rate and running background scan at the same time.
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ee832d3e9e72abf83931205a2f5379944be501c2
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Dec 28 13:06:26 2010 +0530
ath9k: Few clean ups in beacon config parameters
Some minor clean ups in assigning values to beacon config parameters
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4cfda47b69d0a37e5fc0292addba6d0f5f671a14
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Mon Dec 27 23:21:26 2010 +0100
mac80211: ignore PSM bit of reordered frames
This patch tackles one of the problems of my
reorder release timer patch from August.
<http://www.spinics.net/lists/linux-wireless/msg57214.html>
=>
What if the reorder release triggers and ap_sta_ps_end
(called by ieee80211_rx_h_sta_process) accidentally clears
the WLAN_STA_PS_STA flag, because 100ms ago - when the STA
was still active - frames were put into the reorder buffer.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5af3c1d195a6169a925a929e800dc4fce2a545ae
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 27 15:07:35 2010 +0100
rt2x00: Fix comment about removed spinlock
The comment doesn't match the code anymore. Fix that.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 48103d25c4ca00a1d0692895f9aa68fcac6bc6af
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 27 15:07:16 2010 +0100
rt2x00: Remove unused interface spinlock
Since the last user of intf->lock is gone we can safely remove it.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bfe6a15d60671993eb3d4ac396b1f442ae08581c
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 27 15:06:57 2010 +0100
rt2x00: Simplify intf->delayed_flags locking
Instead of protecting delayed_flags with a spinlock use atomic bitops to
make the code more readable.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f833eea0a77b0910ea202468175bfc80470d44d0
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 27 15:06:36 2010 +0100
rt2x00: Remove superfluous assignment of mpdu_density
The tx desciptor already gets initialized to 0. Hence, there's no need
to explicitly assign 0 to mpdu_density here.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 11f16aefcc07178972f149f1a1d53e6868481394
Author: Ismael Luceno <ismael.luceno@xxxxxxxxx>
Date: Mon Dec 27 15:06:17 2010 +0100
rt2x00: Fix panic on frame padding for rt2800 usb devices
Backtrace:
rt2800usb_write_tx_data
rt2x00queue_write_tx_frame
rt2x00mac_tx
invoke_tx_handlers
__ieee80211_tx
ieee80211_tx
virt_to_head_page
ieee80211_xmit
ieee80211_tx_skb
ieee80211_scan_work
schedule
ieee80211_scan_work
process_one_work
...
It tried to expand the skb past it's end using skb_put. So I replaced it
with a call to skb_padto, which takes the issue into account.
Signed-off-by: Ismael Luceno <ismael.luceno@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 736e3acadce8438e610b897af2b1c472ed58444b
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Mon Dec 27 15:05:55 2010 +0100
rt2x00: Fix pointer errors.
Fix some pointer errors in the various calls to memcpy, memset and memmove.
Although none of these errors are fatal (the expression used now results in
the same pointer value) it is better to use the proper expression.
All errors are having to deal with arrays.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a39fd6be19bde021314262a6d2193b3792c808db
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Mon Dec 27 15:05:35 2010 +0100
rt2x00: remove intf->mac field.
The mac field of the rt2x00_intf structure is written to once and used
twice. In both these uses the mac address is available via other means.
Remove this field as it does not appear to be necessary.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Mon Dec 27 15:05:14 2010 +0100
rt2x00: Remove intf->bssid field.
The bssid field in struct rt2x00_intf is only written to once, and is
never read from.
Remove this field, as it appears to not be needed.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5235189c8edddf2eb32982f814bc858b55e6350a
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Mon Dec 27 15:04:54 2010 +0100
rt2x00: allow txstatus_fifo w/o txstatus_tasklet
When DRIVER_REQUIRE_TXSTATUS_FIFO is set, intialize the
txstatus_fifo, but initialize rt2x00dev->txstatus_tasklet
only when both DRIVER_REQUIRE_TXSTATUS_FIFO and
rt2x00dev->ops->lib->txstatus_tasklet are set.
This allows the txstatus_fifo to be used by rt2800usb which
does not use txstatus_tasklet.
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c4d63244218bf93d1f0cdf4389e0906df8f506c1
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Mon Dec 27 15:04:29 2010 +0100
rt2x00: simplify txstatus_fifo handling
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 97e2c40269e168df986daf94af1c62e07d4fc599
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sun Dec 26 18:22:29 2010 +0100
carl9170: fix usb pm suspend->resume woes
This patch revamps some common code-paths which are
shared between (re-)initialization and suspend/resume
subroutines. It also adds some helpful comments
about quirks and associated difficulties.
It's quite big, but it should fix #25382:
<https://bugzilla.kernel.org/show_bug.cgi?id=25382>
And hopefully the code is robust enough to deal with
all possible suspend/resume scenarios without requiring
the user to do any sort of manual and possibly
dangerous work.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3b386510f49ff5c6e6ac1001da4f3c922ae7de3f
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sun Dec 26 18:22:16 2010 +0100
carl9170: reduce channel change delay
By removing two "safety" msleeps (and an echo nop), the
channel change delay is effectively halved. Previously,
the delay could be as long as 260 ms and the device
could not go off-channel without risking to miss the
next DTIM beacon [interval ~307 ms].
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9fc3bbb4a752f108cf096d96640f3b548bbbce6c
Author: Joel Sing <jsing@xxxxxxxxxx>
Date: Mon Jan 3 20:24:20 2011 +0000
ipv4/route.c: respect prefsrc for local routes
The preferred source address is currently ignored for local routes,
which results in all local connections having a src address that is the
same as the local dst address. Fix this by respecting the preferred source
address when it is provided for local routes.
This bug can be demonstrated as follows:
# ifconfig dummy0 192.168.0.1
# ip route show table local | grep local.*dummy0
local 192.168.0.1 dev dummy0 proto kernel scope host src 192.168.0.1
# ip route change table local local 192.168.0.1 dev dummy0 \
proto kernel scope host src 127.0.0.1
# ip route show table local | grep local.*dummy0
local 192.168.0.1 dev dummy0 proto kernel scope host src 127.0.0.1
We now establish a local connection and verify the source IP
address selection:
# nc -l 192.168.0.1 3128 &
# nc 192.168.0.1 3128 &
# netstat -ant | grep 192.168.0.1:3128.*EST
tcp 0 0 192.168.0.1:3128 192.168.0.1:33228 ESTABLISHED
tcp 0 0 192.168.0.1:33228 192.168.0.1:3128 ESTABLISHED
Signed-off-by: Joel Sing <jsing@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c9e57f0fdccf74ef7884fed61d212e524b9c4bcd
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sun Dec 26 18:21:53 2010 +0100
carl9170: add missing return-value check
This patch adds a forgotten bail-out path.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bb007554fe1f66c4796c7c7ae7bfc735fc8213f7
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Sun Dec 26 12:10:05 2010 -0500
ath5k: fix cycle counter inconsistent locking
ath5k_reset is called from process context and takes the cc_lock
with plain spin_lock(), but cc_lock can also be taken from tasklets
in softirq context. Thus we need to at least use spin_lock_bh.
This fixes the following lockdep warning:
[ 19.967874] sky2 0000:01:00.0: eth0: enabling interface
[ 19.982761] ieee80211 phy0: device now idle
[ 20.904809] NET: Registered protocol family 17
[ 21.243857] ieee80211 phy0: device no longer idle - scanning
[ 21.404343]
[ 21.404346] =================================
[ 21.404450] [ INFO: inconsistent lock state ]
[ 21.404518] 2.6.37-rc7-wl+ #242
[ 21.404582] ---------------------------------
[ 21.404650] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 21.404721] kworker/u:4/982 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 21.404792] (&(&common->cc_lock)->rlock){+.?...}, at: [<f8115780>] ath5k_ani_calibration+0x29/0x5d9 [ath5k]
[ 21.405011] {SOFTIRQ-ON-W} state was registered at:
[ 21.405011] [<c105cadd>] __lock_acquire+0x62f/0x13c1
[ 21.405011] [<c105d944>] lock_acquire+0xd5/0xf1
[ 21.405011] [<c12c978d>] _raw_spin_lock+0x45/0x72
[ 21.405011] [<f8111533>] ath5k_reset+0x2c0/0x349 [ath5k]
[ 21.405011] [<f8111a7a>] ath5k_start+0xb8/0x139 [ath5k]
[ 21.405011] [<f849c714>] ieee80211_do_open+0x13f/0x819 [mac80211]
[ 21.405011] [<f849ce51>] ieee80211_open+0x63/0x66 [mac80211]
[ 21.405011] [<c1258b2e>] __dev_open+0x8d/0xb6
[ 21.405011] [<c1255c64>] __dev_change_flags+0x9d/0x114
[ 21.405011] [<c1258a75>] dev_change_flags+0x18/0x44
[ 21.405011] [<c1262990>] do_setlink+0x23f/0x521
[ 21.405011] [<c1262d58>] rtnl_setlink+0xe6/0xea
[ 21.405011] [<c126347c>] rtnetlink_rcv_msg+0x18a/0x1a0
[ 21.405011] [<c126d5f0>] netlink_rcv_skb+0x35/0x7b
[ 21.405011] [<c12632eb>] rtnetlink_rcv+0x20/0x27
[ 21.405011] [<c126d370>] netlink_unicast+0x1bb/0x21e
[ 21.405011] [<c126db21>] netlink_sendmsg+0x23b/0x288
[ 21.405011] [<c124823c>] sock_sendmsg+0xac/0xc4
[ 21.405011] [<c1248680>] sys_sendmsg+0x152/0x1a2
[ 21.405011] [<c1249b0d>] sys_socketcall+0x214/0x275
[ 21.405011] [<c10029d0>] sysenter_do_call+0x12/0x36
[ 21.405011] irq event stamp: 138032
[ 21.405011] hardirqs last enabled at (138032): [<c12ca252>] _raw_spin_unlock_irqrestore+0x3b/0x5e
[ 21.405011] hardirqs last disabled at (138031): [<c12c98cc>] _raw_spin_lock_irqsave+0x18/0x7e
[ 21.405011] softirqs last enabled at (138024): [<f84a570e>] ieee80211_tx_skb+0x47/0x49 [mac80211]
[ 21.405011] softirqs last disabled at (138027): [<c100452b>] do_softirq+0x63/0xb4
[ 21.405011]
[ 21.405011] other info that might help us debug this:
[ 21.405011] 3 locks held by kworker/u:4/982:
[ 21.405011] #0: (name){+.+.+.}, at: [<c1046158>] process_one_work+0x1b8/0x41b
[ 21.405011] #1: ((&(&local->scan_work)->work)){+.+.+.}, at: [<c1046158>] process_one_work+0x1b8/0x41b
[ 21.405011] #2: (&local->mtx){+.+.+.}, at: [<f84920fb>] ieee80211_scan_work+0x32/0x4a4 [mac80211]
[ 21.405011]
[ 21.405011] stack backtrace:
[ 21.405011] Pid: 982, comm: kworker/u:4 Not tainted 2.6.37-rc7-wl+ #242
[ 21.405011] Call Trace:
[ 21.405011] [<c12c6e68>] ? printk+0x1d/0x25
[ 21.405011] [<c105a742>] print_usage_bug+0x181/0x18b
[ 21.405011] [<c105b196>] ? check_usage_forwards+0x0/0xb6
[ 21.405011] [<c105a9ec>] mark_lock+0x2a0/0x4aa
[ 21.405011] [<c1059f6d>] ? trace_hardirqs_off+0xb/0xd
[ 21.405011] [<c105ca68>] __lock_acquire+0x5ba/0x13c1
[ 21.405011] [<c1059eed>] ? trace_hardirqs_off_caller+0x18/0x8d
[ 21.405011] [<c1059f6d>] ? trace_hardirqs_off+0xb/0xd
[ 21.405011] [<c1050411>] ? local_clock+0x2c/0x4f
[ 21.405011] [<c1059e00>] ? save_trace+0x2/0xa0
[ 21.405011] [<c105ac39>] ? mark_held_locks+0x43/0x5b
[ 21.405011] [<c12ca252>] ? _raw_spin_unlock_irqrestore+0x3b/0x5e
[ 21.405011] [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k]
[ 21.405011] [<c105d944>] lock_acquire+0xd5/0xf1
[ 21.405011] [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k]
[ 21.405011] [<c12c9b1a>] _raw_spin_lock_bh+0x4a/0x77
[ 21.405011] [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k]
[ 21.405011] [<f8115780>] ath5k_ani_calibration+0x29/0x5d9 [ath5k]
[ 21.405011] [<c105ac39>] ? mark_held_locks+0x43/0x5b
[ 21.405011] [<f8113496>] ath5k_tasklet_ani+0x1d/0x27 [ath5k]
[ 21.405011] [<c1037304>] tasklet_action+0x96/0x137
[ 21.405011] [<c10379b5>] __do_softirq+0xde/0x1c3
[ 21.405011] [<c10b0cef>] ? arch_get_unmapped_area_topdown+0x3b/0x127
[ 21.405011] [<c10378d7>] ? __do_softirq+0x0/0x1c3
[ 21.405011] <IRQ> [<c1036dee>] ? irq_exit+0x3d/0x49
[ 21.405011] [<c1003b4f>] ? do_IRQ+0x98/0xac
[ 21.405011] [<c1002eee>] ? common_interrupt+0x2e/0x34
[ 21.405011] [<c103007b>] ? sys_unshare+0x57/0x226
[ 21.405011] [<c1047fee>] ? queue_delayed_work+0x1/0x27
[ 21.405011] [<f84a83a0>] ? ieee80211_queue_delayed_work+0x2e/0x33 [mac80211]
[ 21.405011] [<f8492528>] ? ieee80211_scan_work+0x45f/0x4a4 [mac80211]
[ 21.405011] [<c104620e>] ? process_one_work+0x26e/0x41b
[ 21.405011] [<c1046158>] ? process_one_work+0x1b8/0x41b
[ 21.405011] [<f84920c9>] ? ieee80211_scan_work+0x0/0x4a4 [mac80211]
[ 21.405011] [<c10466b6>] ? worker_thread+0x18a/0x2a5
[ 21.405011] [<c12ca25e>] ? _raw_spin_unlock_irqrestore+0x47/0x5e
[ 21.405011] [<c104652c>] ? worker_thread+0x0/0x2a5
[ 21.405011] [<c104abe7>] ? kthread+0x67/0x6c
[ 21.405011] [<c104ab80>] ? kthread+0x0/0x6c
[ 21.405011] [<c1002efa>] ? kernel_thread_helper+0x6/0x10
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
Acked-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 44cefead807daf96d0f43eb494b1eb5edb5454bf
Author: Brian Prodoehl <bprodoehl@xxxxxxxxx>
Date: Sat Dec 25 14:34:43 2010 -0500
ath9k: fix spur mitigation no-spur case for AR9002
For the AR9002, the spur frequency read from the EEPROM is mangled
before being compared against AR_NO_SPUR. This results in the driver
trying to set up the spur mitigation for bogus spurs, rather than
cleanly breaking out.
Signed-off-by: Brian Prodoehl <bprodoehl@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ad9082adfc0a6bdcef1bad2f22485575479d7a9d
Author: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Date: Sat Dec 25 15:03:58 2010 +0900
airo: use simple_write_to_buffer
Simplify write file operation for /proc files by using
simple_write_to_buffer().
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: linux-wireless@xxxxxxxxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 52671e43dbfb0e0dfa5fab604cb3984bd1d777a6
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Thu Dec 23 21:06:57 2010 +0530
ath9k: spin_lock_bh is not required within tasklet context.
Disabling BH is not required while running from a tasklet context
and so replace spin_lock_bh with just spin_lock.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cd017f25e391dfabaca185bb4a5aefd02fd6c0ca
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Thu Dec 23 15:12:30 2010 +0100
iwlagn: fix scan tx antenna setting on 5Ghz band
Looks that we do not set correctly antennas when scanning
on 5Ghz band and when bluetooth is enabled, because
priv->cfg->scan_tx_antennas[band] is only defined for
IEEE80211_BAND_2GHZ.
To fix we check band before limiting antennas to first one.
This allow to remove hard coded cfg->scan_tx_antennas[band].
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cd2c5486526b744fb505e18c9d981b35feaf283a
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Wed Dec 22 19:20:32 2010 +0900
ath5k: Move mac80211 functions into new file
Move mac80211 functions into new file mac80211-ops.c to have a better
separation and to make base.c smaller.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48
Author: Francois-Xavier Le Bail <fx.lebail@xxxxxxxxx>
Date: Tue Jan 4 09:10:20 2011 +0000
net: typos in comments in include/linux/igmp.h
There are typos in comments in include/linux/igmp.h:
83 #define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
84 #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
[snip]
88 #define IGMPV2_HOST_MEMBERSHIP_REPORT 0x16 /* V2 version of 0x11 */
89 #define IGMP_HOST_LEAVE_MESSAGE 0x17
90 #define IGMPV3_HOST_MEMBERSHIP_REPORT 0x22 /* V3 version of 0x11 */
The line 88 and 90 are about REPORT messages.
The IGMP_HOST_MEMBERSHIP_REPORT (IGMP V1) value is 0x12.
So the comment on line 88 must be /* V2 version of 0x12 */,
and the comment on line 90 must be /* V3 version of 0x12 */.
Signed-off-by: Francois-Xavier Le Bail <fx.lebail@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0511af9e9a43c64dd7e23e642c9087710688768c
Merge: 782a9e31e81956a271375c0ba8d46fbb0480983e 003ea98195eebdfcf476317b517e8c29a25b9d10
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Tue Jan 4 14:26:34 2011 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit 782a9e31e81956a271375c0ba8d46fbb0480983e
Merge: 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a 17f9cc3124c97f50a19a7597e5f29f915b5b835c
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Tue Jan 4 14:25:28 2011 -0500
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
commit d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Mon Jan 3 19:42:24 2011 +0100
mac80211: add missing synchronize_rcu
commit ad0e2b5a00dbec303e4682b403bb6703d11dcdb2
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Jun 1 10:19:19 2010 +0200
mac80211: simplify key locking
removed the synchronization against RCU and thus
opened a race window where we can use a key for
TX while it is already freed. Put a synchronisation
into the right place to close that window.
Reported-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Cc: stable@xxxxxxxxxx [2.6.36+]
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 919bbad580445801c22ef6ccbe624551fee652bd
Author: Milton Miller <miltonm@xxxxxxx>
Date: Thu Dec 30 02:01:03 2010 -0600
mac80211: fix mesh forwarding when ratelimited too
Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said:
Under memory pressure, the mac80211 mesh code
may helpfully print a message that it failed
to clone a mesh frame and then will proceed
to crash trying to use it anyway. Fix that.
Avoid the reference whenever the frame copy is unsuccessful
regardless of the debug message being suppressed or printed.
Cc: stable@xxxxxxxxxx [2.6.27+]
Signed-off-by: Milton Miller <miltonm@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f28f3313aa97dcb46954f90f596d75f8faf4626e
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:35 2011 +0000
Added support for ampopts in APBUART driver. Used in AMP systems.
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d89ddf0da8f0a140d4dc2e2dbc594fb278e33db5
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:34 2011 +0000
APBUART: added raw AMBA vendor/device number to match against.
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9663eb21fcfeb1ed9afd73d14bbc4198796cfc7b
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:33 2011 +0000
SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing
When the REG property is not available the NODE-ID is used as an unique
identifier in order to avoid filesystem name duplicates in /proc/openprom
filesystem
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2791c1a4390085789e37347fc49f7d189fedae88
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:32 2011 +0000
SPARC/LEON: added support for selecting Timer Core and Timer within core
The ability to select Timer Core and Timer instance for system clock
makes it possible for multiple AMP systems to coexist.
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9742e72cd1e24ede007daa8f3eb1cece66f0fd0f
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:31 2011 +0000
LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e2305e37d4c82ef55be54e9edc8a7e2250739b4f
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:30 2011 +0000
SPARC/LEON: added support for IRQAMP IRQ Controller
Needed for LEON AMP systems where different CPUs are routed to
different IRQ controllers. This patch selects the IRQ Controller
which has been routed to the boot CPU, it is up to the boot loader
to configure the IRQ controller.
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 53aea7caf2e27108912b9b9dbc5bfe18dbbaec9d
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Tue Jan 4 01:41:29 2011 +0000
SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded.
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 554d1d027b19265c4aa3f718b3126d2b86e09a08
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Thu Dec 23 12:38:21 2010 +0100
iwlagn: enable only rfkill interrupt when device is down
Since commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd "iwlagn: fix
hw-rfkill while the interface is down", we enable interrupts when
device is not ready to receive them. However hardware, when it is in
some inconsistent state, can generate other than rfkill interrupts
and crash the system. I can reproduce crash with "kernel BUG at
drivers/net/wireless/iwlwifi/iwl-agn.c:1010!" message, when forcing
firmware restarts.
To fix only enable rfkill interrupt when down device and after probe.
I checked patch on laptop with 5100 device, rfkill change is still
passed to user space when device is down.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8a87694ed159d7abd2c9ed657416696c05db2252
Author: Christoph Hellwig <hch@xxxxxx>
Date: Tue Jan 4 07:14:24 2011 +0100
remove trim_fs method from Documentation/filesystems/Locking
The ->trim_fs has been removed meanwhile, so remove it from the documentation
as well.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reported-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 36f54ff67bc78c6d8dc4a90ac257165e05fdd8da
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Dec 31 12:34:32 2010 -0300
[media] v4l2-compat-ioctl32: fix compile warning
drivers/media/video/v4l2-compat-ioctl32.c: In function 'get_v4l2_format32':
drivers/media/video/v4l2-compat-ioctl32.c:169:2: warning: case value '0' not in enumerated type 'enum v4l2_buf_type'
drivers/media/video/v4l2-compat-ioctl32.c: In function 'put_v4l2_format32':
drivers/media/video/v4l2-compat-ioctl32.c:200:2: warning: case value '0' not in enumerated type 'enum v4l2_buf_type'
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Dec 31 12:30:56 2010 -0300
[media] zoran: fix compiler warning
drivers/media/video/zoran/zoran_driver.c: In function 'zoran_dqbuf':
drivers/media/video/zoran/zoran_driver.c:2197:21: warning: 'bs.frame' may be used uninitialized in this function
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0c8fc77e481a3bfc243336085a3fe1fc71f9c1fb
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Dec 31 12:26:53 2010 -0300
[media] tda18218: fix compile warning
drivers/media/common/tuners/tda18218.c: In function 'tda18218_wr_regs':
drivers/media/common/tuners/tda18218.c:58:5: warning: 'ret' may be used uninitialized in this function
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4f77b86c665ff6a167edfdf152ebfa997783fa17
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Dec 31 12:25:32 2010 -0300
[media] ngene: fix compile warning
drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_start':
drivers/media/dvb/ngene/ngene-core.c:1308:16: warning: unused variable 'flags'
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e6de30d63eb17c5cbb7affdfc71df95286bfa7d9
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:08:37 2011 +0000
r8169: more 8168dp support.
Adapted from version 8.019.00 of Realtek's r8168 driver
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 650e8d5d1fdd5e55869136e2df54287a4432d87f
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:08:29 2011 +0000
r8169: rtl_csi_access_enable rename.
Newer 8168 needs a slightly different rtl_csi_access_enable.
This patch separates some noise from the real thing.
No functional change.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b646d90053f887c1bc243191e693a9b02d09f2c2
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:08:21 2011 +0000
r8169: magic.
Adapted from version 8.019.00 of Realtek's r8168 driver.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 065c27c184d64aeb9ae107c0ef7026ea3642b15b
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:08:12 2011 +0000
r8169: phy power ops
Bits from :
- version 8.019.00 of Realtek's 8168 driver
- version 1.019.00 of Realtek's 8101 driver
Plain old 8169 (PCI) devices do not seem to need anything akin to it.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c0e45c1ca3162acb2e77b3d9e152ce6e7b6fa3f5
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:08:04 2011 +0000
r8169: 8168DP specific MII registers access methods.
Adapted from version 8.019.00 of Realtek's r8168 driver and
amended per Hayes Wang's correction :
- OCPDR_GPHY_REG_SHIFT must be 16, not 12
- the reg should be at bit 16 ~ 22, whence OCPDR_REG_MASK
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4da19633429f67c794b013488348550f457298c4
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:07:55 2011 +0000
r8169: use device dependent methods to access the MII registers.
Current mdio_{read/write} needs device specific information to work
correctly with newer chipsets.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f0298f8143e89ac4da306e14b9aa1927e93916d0
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:07:42 2011 +0000
r8169: identify different registers.
Documentation (sort of).
The location are the same, the values are the same but it is
just accidental. Note that the 810x could cope with a smaller
value as it does not support jumbo frames.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Hayes <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date: Mon Jan 3 15:07:31 2011 +0000
r8169: remove the firmware of RTL8111D.
The binary file of the firmware is moved to linux-firmware repository.
The firmwares are rtl_nic/rtl8168d-1.fw and rtl_nic/rtl8168d-2.fw.
The driver goes along if the firmware couldn't be found. However, it
is suggested to be done with the suitable firmware.
Some wrong PHY parameters are directly corrected in the driver.
Simple firmware checking added per Ben Hutchings suggestion.
Signed-off-by: Hayes Wang <hayeswang@xxxxxxxxxxx>
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Ben Hutchings <benh@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 101e5f77bf35679809586e250b6c62193d2ed179
Author: Mike Galbraith <efault@xxxxxx>
Date: Fri Dec 31 09:32:30 2010 +0100
sched, autogroup: Fix reference leak
The cgroup exit mess also uncovered a struct autogroup reference leak.
copy_process() was simply freeing vs putting the signal_struct,
stranding a reference.
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
LKML-Reference: <1293784350.6839.2.camel@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 4f8219875a0dad2cfad9e93a3fafcd9626db98d2
Author: Mike Galbraith <efault@xxxxxx>
Date: Thu Dec 16 15:09:52 2010 +0100
sched, autogroup: Fix potential access to freed memory
Oleg pointed out that the /proc interface kref_get() useage may race with
the final put during autogroup_move_group(). A signal->autogroup assignment
may be in flight when the /proc interface dereference, leaving them taking
a reference to an already dead group.
Reported-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1292508592.5940.28.camel@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a58154d1c3535f451a409abbd0bda6770b2d9380
Author: Yong Shen <yong.shen@xxxxxxxxxx>
Date: Tue Jan 4 14:22:56 2011 +0800
ARM i.MX53: Make MX53 EVK bootable
1. Add entries to Kconfig
2. Add machine definition
3. Add Uart platform data, pad setting and base address
4. Adjust GPIO irq number
Signed-off-by: Yong Shen <yong.shen@xxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 644b1d586d6670262501057ae99d893fadb012de
Author: Yong Shen <yong.shen@xxxxxxxxxx>
Date: Tue Jan 4 14:22:55 2011 +0800
ARM i.MX53: Some bug fix about MX53 MSL code
1. pll_base address should return right value
2. uart parent clk is from pll3
Signed-off-by: Yong Shen <yong.shen@xxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3
Author: Alan Ott <alan@xxxxxxxxxxx>
Date: Tue Jan 4 00:37:22 2011 -0500
HID: hidraw: add compatibility ioctl() for 32-bit applications.
Added the ioctl function to the compat_ioctl pointer in the file_operations
struct. Before this, some ioctls would fail for 32-bit apps on 64-bit systems.
Signed-off-by: Alan Ott <alan@xxxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit d50d8fe192428090790e7178e9507e981e0b005b
Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Date: Tue Jan 4 17:20:54 2011 +1030
x86, mm: Initialize initial_page_table before paravirt jumps
v2.6.36-rc8-54-gb40827f (x86-32, mm: Add an initial page table
for core bootstrapping) made x86 boot using initial_page_table
and broke lguest.
For 2.6.37 we simply cut & paste the initialization code into
lguest (da32dac10126 "lguest: populate initial_page_table"), now
we fix it properly by doing that initialization before the
paravirt jump.
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Acked-by: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: lguest <lguest@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <201101041720.54535.rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bc030d6cb9532877c1c5a3f5e7123344fa24a285
Merge: d3bd058826aa8b79590cca6c8e6d1557bf576ada 387c31c7e5c9805b0aef8833d1731a5fe7bdea14
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Jan 4 09:43:42 2011 +0100
Merge commit 'v2.6.37-rc8' into x86/apic
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6706125e291bd3dddd269e043323a6ab93ccd5fb
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date: Fri Dec 31 21:58:58 2010 +0800
sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <1293803938-8157-1-git-send-email-yong.zhang0@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Mon Dec 13 14:56:02 2010 +0100
firewire: use split transaction timeout only for split transactions
Instead of starting the split transaction timeout timer when any request
is submitted, start it only when the destination's ACK_PENDING has been
received. This prevents us from using a timeout that is too short, and,
if the controller's AT queue is emptying very slowly, from cancelling
a packet that has not yet been sent.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 693a50b511818e07a131efc944cba1a504b63d3d
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Sat Jan 1 15:17:05 2011 +0100
firewire: ohci: consolidate context status flags
"firewire: ohci: restart iso DMA contexts on resume from low power mode"
added the flag struct context.active and "firewire: ohci: cache the
context run bit" added struct context.running.
These flags contain the same information; combine them.
Also, normalize whitespace in pci_resume().
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 386a4153a2c1455e424f280d636efa3c91864466
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Fri Dec 24 14:42:46 2010 +0100
firewire: ohci: cache the context run bit
The DMA context run control bit is entirely controlled by software, so
it is safe to cache it. This allows the driver to avoid doing an
additional MMIO read when queueing an AT packet.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 78dec56d6a56322e1b728d51f3a7def416d36b34
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Sat Jan 1 15:15:40 2011 +0100
firewire: ohci: flush AT contexts after bus reset - addendum
Add comments
- on why bus_reset_tasklet flushes AT queues,
- that commit 76f73ca1b291 can possibly be reverted now.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
commit 672d8eafe38e9324055b8c0d0ad6e95c43b6d52a
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date: Tue Nov 16 14:33:51 2010 -0600
ipmi: explicitly include of_address.h and of_irq.h
of_address.h and of_irq.h are implicitly included on powerpc. Adding
them fixes builds on non-powerpc platforms.
Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 20c457b8587bee4644d998331d9e13be82e05b4c
Author: Thomas Renninger <trenn@xxxxxxx>
Date: Mon Jan 3 17:50:45 2011 +0100
perf timechart: Adjust perf timechart to the new power events
builtin-timechart must only pass -e power:xy events if they are supported by
the running kernel, otherwise try to fetch the old power:power{start,end}
events.
For this I added the tiny helper function:
int is_valid_tracepoint(const char *event_string)
to parse-events.[hc], which could be more generic as an interface and support
hardware/software/... events, not only tracepoints, but someone else could
extend that if needed...
Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
LKML-Reference: <1294073445-14812-4-git-send-email-trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 25e41933b58777f2d020c3b0186b430ea004ec28
Author: Thomas Renninger <trenn@xxxxxxx>
Date: Mon Jan 3 17:50:44 2011 +0100
perf: Clean up power events by introducing new, more generic ones
Add these new power trace events:
power:cpu_idle
power:cpu_frequency
power:machine_suspend
The old C-state/idle accounting events:
power:power_start
power:power_end
Have now a replacement (but we are still keeping the old
tracepoints for compatibility):
power:cpu_idle
and
power:power_frequency
is replaced with:
power:cpu_frequency
power:machine_suspend is newly introduced.
Jean Pihet has a patch integrated into the generic layer
(kernel/power/suspend.c) which will make use of it.
the type= field got removed from both, it was never
used and the type is differed by the event type itself.
perf timechart userspace tool gets adjusted in a separate patch.
Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Acked-by: Jean Pihet <jean.pihet@xxxxxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: rjw@xxxxxxx
LKML-Reference: <1294073445-14812-3-git-send-email-trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1290072314-31155-2-git-send-email-trenn@xxxxxxx>
commit 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
Author: Thomas Renninger <trenn@xxxxxxx>
Date: Mon Jan 3 17:50:43 2011 +0100
perf: Do not export power_frequency, but power_start event
power_frequency moved to drivers/cpufreq/cpufreq.c which has
to be compiled in, no need to export it.
intel_idle can a be module though...
Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Acked-by: Jean Pihet <jean.pihet@xxxxxxxxxxxxxx>
Cc: Jean Pihet <j-pihet@xxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: rjw@xxxxxxx
LKML-Reference: <1294073445-14812-2-git-send-email-trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1290072314-31155-2-git-send-email-trenn@xxxxxxx>
commit 928585536ff5a8f320e60efc60e2b7ef2a5f548d
Merge: cc2221969906a166a638aecdbae84a3d0462719e d854861c4292a4e675a5d3bfd862c5f7421c81e8
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Jan 4 08:10:28 2011 +0100
Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit cc2221969906a166a638aecdbae84a3d0462719e
Merge: 56f4c400349157289b474a3fd49ee96acab0a4d7 387c31c7e5c9805b0aef8833d1731a5fe7bdea14
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Jan 4 08:08:51 2011 +0100
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 55ee4ef30241a62b700f79517e6d5ef2ddbefa67
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Thu Dec 16 12:15:15 2010 -0600
gameport: use this_cpu_read instead of lookup
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 357089fca91f639dd005ae0721f5f932b4f276ab
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Thu Dec 16 12:14:43 2010 -0600
x86: udelay: Use this_cpu_read to avoid address calculation
The code will use a segment prefix instead of doing the lookup and
calculation.
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 42bb8d56953a06de50941d6d3df89dc3023bb92d
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Mon Jan 3 15:21:46 2011 +0000
cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver()
We should call bnx2i to send the iSCSI netlink message earlier in
cnic_unregister_device(). By the time cnic_unregister_driver() is
called, bnx2i may have freed data structures used by the upcalls.
Update version to 2.2.12.
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 57045c996fb4e035f1d152b7e04315fc223352e9
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Mon Jan 3 15:21:45 2011 +0000
cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode
Because the hardware does not yet support these in this mode.
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4a3a255289e7e322b8044286cce85031990f888a
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Nov 11 22:42:06 2010 -0800
sparc: explicitly cast negative phandle checks to s32
When we switched sparc from using 'int's to 'phandle's (which is a u32), we
neglected to do anything with the various checks for -1. For those tests,
explicitly cast the phandles to s32.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit d854861c4292a4e675a5d3bfd862c5f7421c81e8
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Jan 4 00:16:20 2011 -0200
perf test: Add test for counting open syscalls
To test the use of the perf_evsel class on something other than
the tools from where we refactored code to create it.
It calls open() N times and then checks if the event created to
monitor it returns N events.
[acme@felicio linux]$ perf test
1: vmlinux symtab matches kallsyms: Ok
2: detect open syscall event: Ok
[acme@felicio linux]$
It does.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Han Pingtian <phan@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 4eed11d5e24540dc133003b6e8f904cb747ac4bb
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Jan 4 00:13:17 2011 -0200
perf evsel: Auto allocate resources needed for some methods
While writing the first user of the routines created from the ad-hoc
routines in the existing builtins I noticed that the resulting set of
calls was too long, reduce it by doing some best effort allocations.
Tools that need to operate on multiple threads and cpus should pre-allocate
enough resources by explicitely calling the perf_evsel__alloc_{fd,counters}
methods.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 86bd5e8603b00b06189328c6d7034d2dc434d6bb
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 23:09:46 2011 -0200
perf evsel: Use {cpu,thread}_map to shorten list of parameters
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 5c98d466e49267a9221f30958d45cd06f794269a
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 17:53:33 2011 -0200
perf tools: Refactor all_tids to hold nr and the map
So that later, we can pass the thread_map instance instead of
(thread_num, thread_map) for things like perf_evsel__open and friends,
just like was done with cpu_map.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 60d567e2d9187379d642f6aba7c8a52b3fd5d261
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 17:49:48 2011 -0200
perf tools: Refactor cpumap to hold nr and the map
So that later, we can pass the cpu_map instance instead of (nr_cpus, cpu_map)
for things like perf_evsel__open and friends.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 48290609c0d265f5dac0fca6fd4e3c5732542f67
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 17:48:12 2011 -0200
perf evsel: Introduce per cpu and per thread open helpers
Abstracting away the loops needed to create the various event fd handlers.
The users have to pass a confiruged perf->evsel.attr field, which is already
usable after perf_evsel__new (constructor) time, using defaults.
Comes out of the ad-hoc routines in builtin-stat, that now uses it.
Fixed a small silly bug where we were die()ing before killing our
children, dysfunctional family this one 8-)
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit c52b12ed2511e6c031a0295fd903ea72b93701fb
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 17:45:52 2011 -0200
perf evsel: Steal the counter reading routines from stat
Making them hopefully generic enough to be used in 'perf test',
well see.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 989d873fc5b6a96695b97738dea8d9f02a60f8ab
Merge: d9a1abe4844e7591cd82e167a1a09e6546f6c45e 04228460a3ded723b2da09141c76c45ddd712caf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 3 16:37:01 2011 -0800
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: pxa: fix page table corruption on resume
ARM: it8152: add IT8152_LAST_IRQ definition to fix build error
ARM: pxa: PXA_ESERIES depends on FB_W100.
ARM: 6605/1: Add missing include "asm/memory.h"
ARM: 6540/1: Stop irqsoff trace on return to user
ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers
ARM: 6536/1: Add missing SZ_{32,64,128}
ARM: fix cache-feroceon-l2 after stack based kmap_atomic()
ARM: fix cache-xsc3l2 after stack based kmap_atomic()
ARM: get rid of kmap_high_l1_vipt()
ARM: smp: avoid incrementing mm_users on CPU startup
ARM: pxa: PXA_ESERIES depends on FB_W100.
commit d9a1abe4844e7591cd82e167a1a09e6546f6c45e
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 3 14:59:11 2011 -0800
arch/mn10300/kernel/irq.c: fix build
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=25702
Reported-by: Martin Ettl <ettl.martin@xxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 867c20265459d30a01b021a9c1e81fb4c5832aa9
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon Jan 3 14:59:10 2011 -0800
ima: fix add LSM rule bug
If security_filter_rule_init() doesn't return a rule, then not everything
is as fine as the return code implies.
This bug only occurs when the LSM (eg. SELinux) is disabled at runtime.
Adding an empty LSM rule causes ima_match_rules() to always succeed,
ignoring any remaining rules.
default IMA TCB policy:
# PROC_SUPER_MAGIC
dont_measure fsmagic=0x9fa0
# SYSFS_MAGIC
dont_measure fsmagic=0x62656572
# DEBUGFS_MAGIC
dont_measure fsmagic=0x64626720
# TMPFS_MAGIC
dont_measure fsmagic=0x01021994
# SECURITYFS_MAGIC
dont_measure fsmagic=0x73636673
< LSM specific rule >
dont_measure obj_type=var_log_t
measure func=BPRM_CHECK
measure func=FILE_MMAP mask=MAY_EXEC
measure func=FILE_CHECK mask=MAY_READ uid=0
Thus without the patch, with the boot parameters 'tcb selinux=0', adding
the above 'dont_measure obj_type=var_log_t' rule to the default IMA TCB
measurement policy, would result in nothing being measured. The patch
prevents the default TCB policy from being replaced.
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Cc: David Safford <safford@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 301a3da358b4af84915f575479e4f0885be47b73
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Mon Jan 3 15:02:47 2011 -0700
powerpc/405: Fix missing #{address,size}-cells in i2c node
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit c8bf6b52af670496f1e8145600e74a3ef3942a4c
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date: Wed Nov 17 15:28:56 2010 -0800
powerpc/5200: dts: refactor dts files
This patch creates mpc5200b.dtsi containing the information for the MPC5200b
SoC then modifies all of the dts files for MPC5200b based systems to use
mpc5200b.dtsi.
Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 11946c826d02a16521edc777d88470a6a0fe1441
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date: Wed Nov 17 15:28:47 2010 -0800
powerpc/5200: dts: Change combatible strings on localbus
This patch changes some incorrect compatible strings on the local plus bus node
in dts files for MPC5200b based systems.
Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 6847317377c871c6e7a8d54e5849bcd0f9b11eb4
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date: Wed Nov 17 15:28:39 2010 -0800
powerpc/5200: dts: remove unused properties
This patch remove unused properties in dts files in preparation of refactoring
the dts files for MPC5200b based boards.
Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit abf1e27fbb4200a010b8fcb1be8cc02485744862
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date: Wed Nov 17 15:28:30 2010 -0800
powerpc/5200: dts: rename nodes to prepare for refactoring dts files
This patch renames nodes in dts fils for MPC5200b files to prepare for
refactoring of these files later. When refactoring it will be easier to verify
the results if the node names aren't changing at the same time.
Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 658f29a51e9830e620bb9a1ce3534b318a38bfeb
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date: Wed Nov 17 15:28:20 2010 -0800
of/flattree: Update dtc to current mainline.
Pull in recent changes from the main dtc repository. These changes
primarily allow multiple device trees to be declared which are merged
by dtc. This feature allows us to include a basic dts file and then
provide more information for the specific system through the merging
functionality.
Changes pulled from git://git.jdl.com/software/dtc.git
commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier"
Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit cd1e65044d4473cca9a01bae7b7938f065044a4b
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Mon Jan 3 15:51:11 2011 -0700
of/device: Don't register disabled devices
Device nodes with the property status="disabled" are not usable and so
don't register them when parsing the device tree for devices.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Hollis Blanchard <hollis_blanchard@xxxxxxxxxx>
Cc: Deepak Saxena <deepak_saxena@xxxxxxxxxx>
Cc: Scott Wood <scottwood@xxxxxxxxxxxxx>,
Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
commit cf562b4a550b3cd9d602a05bc27aaaaa376947b4
Author: Jochen Friedrich <jochen@xxxxxxxx>
Date: Mon Jan 3 12:19:00 2011 +0100
ARM: 6607/1: sa1100: Update platform device registration
Replace some magic numbers with constants and add interrupt definitions.
Signed-off-by: Jochen Friedrich <jochen@xxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4f444e2b59dd4255d121b57ec41a4a8c5d6bce46
Author: Jochen Friedrich <jochen@xxxxxxxx>
Date: Mon Jan 3 12:09:05 2011 +0100
ARM: 6606/1: sa1100: Fix platform device registration
Since commit 7a5b4e16c880f8350d255dc188f81622905618c1, simpad devices don't
boot anymore, since platform devices are registered too early. Fix by moving
the registration from map_io to arch_initcall as done on other sa1100 boards.
Signed-off-by: Jochen Friedrich <jochen@xxxxxxxx>
Acked-by: Kristoffer Ericson <kristoffer.ericson@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 04228460a3ded723b2da09141c76c45ddd712caf
Merge: 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 24c78557741395e038e83f25367cf2bfd7f582b8
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Jan 3 22:55:21 2011 +0000
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
commit 82b662dc41027527675740de15344d1b4e34958e
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Fri Dec 24 14:40:15 2010 +0100
firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
The OHCI 1.2 (draft) specification, clause 7.2.3.3, allows and
recommends that, after a bus reset, the controller does not flush all
the packets in the AT queues. Therefore, the driver has to do this
itself.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 1a9180a20f3a314fda3e96b77570cad3864b2896
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Mon Jan 3 11:08:58 2011 +0000
net/bridge: fix trivial sparse errors
net/bridge//br_stp_if.c:148:66: warning: conversion of
net/bridge//br_stp_if.c:148:66: int to
net/bridge//br_stp_if.c:148:66: int enum umh_wait
net/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as NULL pointer
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ebd80880c55364d2850e1ff569869245142318e0
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date: Mon Jan 3 11:22:15 2011 +0000
depca: Fix section mismatch derived from depca_isa_probe()
This fixes the following warning:
WARNING: drivers/net/depca.o(.data+0x0): Section mismatch in reference from the variable depca_isa_driver to the function .init.text:depca_isa_probe()
The variable depca_isa_driver references
the function __init depca_isa_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
Tested with linux-next (next-20101231)
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1170bed04e2acf720de9ccceabe40ff8c56c9c79
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date: Mon Jan 3 11:15:58 2011 +0000
smsc-ircc2: Fix section mismatch derived from smsc_ircc_pnp_probe()
This fixes the following warning:
drivers/net/irda/smsc-ircc2.o(.data+0x18): Section mismatch in reference from the variable smsc_ircc_pnp_driver to the function .init.text:smsc_ircc_pnp_probe()
The variable smsc_ircc_pnp_driver references
the function __init smsc_ircc_pnp_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
Tested with linux-next (next-20101231)
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cbad832239e70b91502a5e6ce1fc53a464ad6345
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date: Mon Jan 3 11:06:58 2011 +0000
ksz884x: Fix section mismatch derived from pcidev_init()
This fixes the following warning:
WARNING: drivers/net/ksz884x.o(.data+0x18): Section mismatch in reference from the variable pci_device_driver to the function .init.text:pcidev_init()
The variable pci_device_driver references
the function __init pcidev_init()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
Tested with linux-next (next-20101231)
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6bd121e2d4dcabb145d390a7131ec83102dfb838
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Mon Jan 3 14:06:17 2011 -0700
powerpc/dts: fix syntax bugs in bluestone.dts
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit da81c3b9825c826bfb06a4dcc0524c671985eb68
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date: Tue Nov 16 14:33:50 2010 -0600
of: Fixes for OF probing on little endian systems
Fixes for sdhci-of and ipmi drivers.
Auditing all drivers using of_get_property did not find other
occurrences likely to be used on LE platforms.
Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 236cdc7bc718566a7e7cb9f763b51a8dcad88cbe
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date: Mon Jan 3 11:56:38 2011 -0600
of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
Some OF drivers could likely be used on non-powerpc OF based platforms,
so fix the kconfig depends to be CONFIG_OF instead of CONFIG_PPC_OF.
Compile tested on ARM and sparc.
Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 39980292fda20b38baf95bfa577db8b678eecc86
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Jan 3 10:35:22 2011 +0000
ifb: add performance flags
Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit :
> From: Jarek Poplawski <jarkao2@xxxxxxxxx>
> Date: Mon, 3 Jan 2011 20:37:03 +0100
>
> > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote:
> >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit :
> >>
> >> > Ingress is before vlans handler so these features and the
> >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering
> >> > dev_hard_start_xmit() checks.
> >>
> >> OK, here is v2 of the patch then, thanks everybody.
> >>
> >>
> >> [PATCH v2 net-next-2.6] ifb: add performance flags
> >>
> >> IFB can use the full set of features flags (NETIF_F_SG |
> >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
> >> avoid unnecessary split of some packets (GRO for example)
> >>
> >> Changli suggested to also set vlan_features,
> >
> > He also suggested more GSO flags of which especially NETIF_F_TSO6
> > seems interesting (wrt GRO)?
>
> I think at least TSO6 would very much be appropriate here.
Yes, why not, I am only wondering why loopback / dummy (and others ?)
only set NETIF_F_TSO :)
Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;)
For other flags, I really doubt it can matter on ifb ?
[PATCH v3 net-next-2.6] ifb: add performance flags
IFB can use the full set of features flags (NETIF_F_SG |
NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
avoid unnecessary split of some packets (GRO for example)
Changli suggested to also set vlan_features, NETIF_F_TSO6,
NETIF_F_TSO_ECN.
Jarek suggested to add NETIF_F_HW_VLAN_TX as well.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Changli Gao <xiaosuo@xxxxxxxxx>
Cc: Jarek Poplawski <jarkao2@xxxxxxxxx>
Cc: Pawel Staszewski <pstaszewski@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5f66dd35b49ea81a03e71bfd74c28364f4e32d21
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Mon Jan 3 08:27:55 2011 +0000
sparc: fix sparse warnings in arch/sparc/prom for 32 bit build
Fix following sparse warnings:
arch/sparc/prom/bootstr_32.c:32:35: warning: Using plain integer as NULL pointer
arch/sparc/prom/memory.c:61:13: warning: symbol 'prom_meminit' was not declared. Should it be static?
arch/sparc/prom/misc_32.c:74:1: error: symbol 'prom_halt' redeclared with different type (originally declared at arch/sparc/include/asm/oplib_32.h:67) - different modifiers
arch/sparc/prom/ranges.c:16:26: warning: symbol 'promlib_obio_ranges' was not declared. Should it be static?
arch/sparc/prom/ranges.c:17:5: warning: symbol 'num_obio_ranges' was not declared. Should it be static?
arch/sparc/prom/ranges.c:39:1: warning: symbol 'prom_adjust_ranges' was not declared. Should it be static?
arch/sparc/prom/ranges.c:69:13: warning: symbol 'prom_ranges_init' was not declared. Should it be static?
arch/sparc/prom/tree_32.c:286:22: warning: Using plain integer as NULL pointer
arch/sparc/prom/tree_32.c:286:38: warning: Using plain integer as NULL pointer
None of the warnings indicated any serious issues.
We are now sparse clean for 32 bit build in arch/sparc/prom.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0dfb33a0d7e2d9316eb4441a065ddd173f87223e
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Jan 3 08:11:38 2011 +0000
sch_red: report backlog information
Provide child qdisc backlog (byte count) information so that "tc -s
qdisc" can report it to user.
packet count is already correctly provided.
qdisc red 11: parent 1:11 limit 60Kb min 15Kb max 45Kb ecn
Sent 3116427684 bytes 1415782 pkt (dropped 8, overlimits 7866 requeues 0)
rate 242385Kbit 13630pps backlog 13560b 8p requeues 0
marked 7865 early 1 pdrop 7 other 0
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7f891cf1fc0d5d5c5b359caec77e5383e1d55986
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date: Mon Jan 3 08:04:59 2011 +0000
dcbnl: more informed return values for new dcbnl routines
More accurate return values for the following (new) dcbnl routines:
dcbnl_getdcbx()
dcbnl_setdcbx()
dcbnl_getfeatcfg()
dcbnl_setfeatcfg()
Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e6f26129ebbb0071016e2526036f42036ccf30e1
Author: Florian Westphal <fw@xxxxxxxxx>
Date: Mon Jan 3 04:16:28 2011 +0000
bridge: stp: ensure mac header is set
commit bf9ae5386bca8836c16e69ab8fdbe46767d7452a
(llc: use dev_hard_header) removed the
skb_reset_mac_header call from llc_mac_hdr_init.
This seems fine itself, but br_send_bpdu() invokes ebtables LOCAL_OUT.
We oops in ebt_basic_match() because it assumes eth_hdr(skb) returns
a meaningful result.
Cc: acme@xxxxxxxxxxxxxxxxxx
References: https://bugzilla.kernel.org/show_bug.cgi?id=24532
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 87e609760b5304ef0c0c53cf4d0b29fde9812e1b
Author: Michal Simek <monstr@xxxxxxxxx>
Date: Mon Jan 3 00:32:36 2011 +0000
ll_temac: Fix section mismatch from the temac_of_probe
Replace __init by __devinit.
Warning message:
WARNING: vmlinux.o(.data+0xbc14): Section mismatch in reference from the variable
temac_of_driver to the function .init.text:temac_of_probe()
The variable temac_of_driver references
the function __init temac_of_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 68763c890eb2a60f9b50a061502f94e0cf20fdfe
Author: Michal Simek <monstr@xxxxxxxxx>
Date: Sun Jan 2 22:54:09 2011 +0000
trivial: Fix typo fault in netdevice.h
Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9f84f8886b98a9411ee20a10ca390487507037b9
Author: amit salecha <amit.salecha@xxxxxxxxxx>
Date: Sun Jan 2 21:58:45 2011 +0000
netxen: update driver version 4.0.75
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4baaf719807ffc87c6321f3914b93dd512b64c4
Author: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Date: Sun Jan 2 21:58:44 2011 +0000
netxen: enable LRO based on NETIF_F_LRO
o Enable/disable LRO in device based on NETIF_F_LRO flag, instead of using
driver private flag.
o Disable LRO, if rx csum offloading is off.
David Miller,
You should use netdev_info() instead of dev_info().
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 03ed6a3aa600c48593c3984812fda2d5945ddb46
Merge: 4c37a4b53de2d08c469a6e4304cf2a17178200aa a0a2b71bb750ffe9b3faa317cb6317f4ad109383
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 3 11:51:22 2011 -0800
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix callchain hit bad cast on ascii display
arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU
watchdog: Improve initialisation error message and documentation
commit 4c37a4b53de2d08c469a6e4304cf2a17178200aa
Merge: d45fa563a62c908d0e9a581d4f091fed6371ebd0 8fd0bda511406ef0e9dcce9be055d7ab931e92ba
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 3 11:50:26 2011 -0800
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] em28xx: radio_fops should also use unlocked_ioctl
[media] wm8775: Revert changeset fcb9757333 to avoid a regression
[media] cx25840: Prevent device probe failure due to volume control ERANGE error
commit d45fa563a62c908d0e9a581d4f091fed6371ebd0
Merge: a1cf11d8f673a3ad91012c5da96beed06ecefde1 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 3 11:48:54 2011 -0800
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: provide dummy functions for DMA_ENGINE=n
mv_xor: fix race in tasklet function
commit a1cf11d8f673a3ad91012c5da96beed06ecefde1
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date: Mon Jan 3 15:07:02 2011 +0000
name_to_dev_t() must not call __init code
The function can't be __init itself (being called from some sysfs
handler), and hence none of the functions it calls can be either.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f
Author: Cliff Wickman <cpw@xxxxxxx>
Date: Mon Jan 3 12:03:53 2011 -0600
x86, UV, BAU: Extend for more than 16 cpus per socket
Fix a hard-coded limit of a maximum of 16 cpu's per socket.
The UV Broadcast Assist Unit code initializes by scanning the
cpu topology of the system and assigning a master cpu for each
socket and UV hub. That scan had an assumption of a limit of 16
cpus per socket. With Westmere we are going over that limit.
The UV hub hardware will allow up to 32.
If the scan finds the system has gone over that limit it returns
an error and we print a warning and fall back to doing TLB
shootdowns without the BAU.
Signed-off-by: Cliff Wickman <cpw@xxxxxxx>
Cc: <stable@xxxxxxxxxx> # .37.x
LKML-Reference: <E1PZol7-0000mM-77@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9d89081d698132b5f964aea88112f76492563ee9
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date: Mon Jan 3 11:26:08 2011 -0800
bridge: fix br_multicast_ipv6_rcv for paged skbs
use pskb_may_pull to access ipv6 header correctly for paged skbs
It was omitted in the bridge code leading to crash in blind
__skb_pull
since the skb is cloned undonditionally we also simplify the
the exit path
this fixes bug https://bugzilla.kernel.org/show_bug.cgi?id=25202
Dec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 IEEE 802.11: authenticated
Dec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 IEEE 802.11: associated (aid 2)
Dec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 RADIUS: starting accounting session 4D0608A3-00000005
Dec 15 14:36:41 User-PC kernel: [175576.120287] ------------[ cut here ]------------
Dec 15 14:36:41 User-PC kernel: [175576.120452] kernel BUG at include/linux/skbuff.h:1178!
Dec 15 14:36:41 User-PC kernel: [175576.120609] invalid opcode: 0000 [#1] SMP
Dec 15 14:36:41 User-PC kernel: [175576.120749] last sysfs file: /sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent
Dec 15 14:36:41 User-PC kernel: [175576.121035] Modules linked in: approvals binfmt_misc bridge stp llc parport_pc ppdev arc4 iwlagn snd_hda_codec_realtek iwlcore i915 snd_hda_intel mac80211 joydev snd_hda_codec snd_hwdep snd_pcm snd_seq_midi drm_kms_helper snd_rawmidi drm snd_seq_midi_event snd_seq snd_timer snd_seq_device cfg80211 eeepc_wmi usbhid psmouse intel_agp i2c_algo_bit intel_gtt uvcvideo agpgart videodev sparse_keymap snd shpchp v4l1_compat lp hid video serio_raw soundcore output snd_page_alloc ahci libahci atl1c
Dec 15 14:36:41 User-PC kernel: [175576.122712]
Dec 15 14:36:41 User-PC kernel: [175576.122769] Pid: 0, comm: kworker/0:0 Tainted: G W 2.6.37-rc5-wl+ #3 1015PE/1016P
Dec 15 14:36:41 User-PC kernel: [175576.123012] EIP: 0060:[<f83edd65>] EFLAGS: 00010283 CPU: 1
Dec 15 14:36:41 User-PC kernel: [175576.123193] EIP is at br_multicast_rcv+0xc95/0xe1c [bridge]
Dec 15 14:36:41 User-PC kernel: [175576.123362] EAX: 0000001c EBX: f5626318 ECX: 00000000 EDX: 00000000
Dec 15 14:36:41 User-PC kernel: [175576.123550] ESI: ec512262 EDI: f5626180 EBP: f60b5ca0 ESP: f60b5bd8
Dec 15 14:36:41 User-PC kernel: [175576.123737] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
Dec 15 14:36:41 User-PC kernel: [175576.123902] Process kworker/0:0 (pid: 0, ti=f60b4000 task=f60a8000 task.ti=f60b0000)
Dec 15 14:36:41 User-PC kernel: [175576.124137] Stack:
Dec 15 14:36:41 User-PC kernel: [175576.124181] ec556500 f6d06800 f60b5be8 c01087d8 ec512262 00000030 00000024 f5626180
Dec 15 14:36:41 User-PC kernel: [175576.124181] f572c200 ef463440 f5626300 3affffff f6d06dd0 e60766a4 000000c4 f6d06860
Dec 15 14:36:41 User-PC kernel: [175576.124181] ffffffff ec55652c 00000001 f6d06844 f60b5c64 c0138264 c016e451 c013e47d
Dec 15 14:36:41 User-PC kernel: [175576.124181] Call Trace:
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c01087d8>] ? sched_clock+0x8/0x10
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0138264>] ? enqueue_entity+0x174/0x440
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c016e451>] ? sched_clock_cpu+0x131/0x190
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c013e47d>] ? select_task_rq_fair+0x2ad/0x730
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0524fc1>] ? nf_iterate+0x71/0x90
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f83e4914>] ? br_handle_frame_finish+0x184/0x220 [bridge]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f83e4790>] ? br_handle_frame_finish+0x0/0x220 [bridge]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f83e46e9>] ? br_handle_frame+0x189/0x230 [bridge]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f83e4790>] ? br_handle_frame_finish+0x0/0x220 [bridge]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f83e4560>] ? br_handle_frame+0x0/0x230 [bridge]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c04ff026>] ? __netif_receive_skb+0x1b6/0x5b0
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c04f7a30>] ? skb_copy_bits+0x110/0x210
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0503a7f>] ? netif_receive_skb+0x6f/0x80
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f82cb74c>] ? ieee80211_deliver_skb+0x8c/0x1a0 [mac80211]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f82cc836>] ? ieee80211_rx_handlers+0xeb6/0x1aa0 [mac80211]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c04ff1f0>] ? __netif_receive_skb+0x380/0x5b0
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c016e242>] ? sched_clock_local+0xb2/0x190
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c012b688>] ? default_spin_lock_flags+0x8/0x10
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c05d83df>] ? _raw_spin_lock_irqsave+0x2f/0x50
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f82cd621>] ? ieee80211_prepare_and_rx_handle+0x201/0xa90 [mac80211]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f82ce154>] ? ieee80211_rx+0x2a4/0x830 [mac80211]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f815a8d6>] ? iwl_update_stats+0xa6/0x2a0 [iwlcore]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f8499212>] ? iwlagn_rx_reply_rx+0x292/0x3b0 [iwlagn]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c05d83df>] ? _raw_spin_lock_irqsave+0x2f/0x50
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f8483697>] ? iwl_rx_handle+0xe7/0x350 [iwlagn]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<f8486ab7>] ? iwl_irq_tasklet+0xf7/0x5c0 [iwlagn]
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c01aece1>] ? __rcu_process_callbacks+0x201/0x2d0
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0150d05>] ? tasklet_action+0xc5/0x100
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0150a07>] ? __do_softirq+0x97/0x1d0
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c05d910c>] ? nmi_stack_correct+0x2f/0x34
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0150970>] ? __do_softirq+0x0/0x1d0
Dec 15 14:36:41 User-PC kernel: [175576.124181] <IRQ>
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c01508f5>] ? irq_exit+0x65/0x70
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c05df062>] ? do_IRQ+0x52/0xc0
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c01036b0>] ? common_interrupt+0x30/0x38
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c03a1fc2>] ? intel_idle+0xc2/0x160
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c04daebb>] ? cpuidle_idle_call+0x6b/0x100
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c0101dea>] ? cpu_idle+0x8a/0xf0
Dec 15 14:36:41 User-PC kernel: [175576.124181] [<c05d2702>] ? start_secondary+0x1e8/0x1ee
Cc: David Miller <davem@xxxxxxxxxxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0cf445ceaf43be31c5fc70b0e2d5fdccb291c925
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date: Sat Jan 1 13:28:30 2011 +0000
netdev: Update status of 8390 based drivers in MAINTAINERS
With the original 8 bit ISA ne1000 card being over 20 years old, it
only makes sense to consider ne.c and all the other toplevel 8390
based driver files as legacy for obsolete hardware. The most
recent thing made in large quantities that was 8390 based were
those crazy PCI ne2k clones - and even they are now 10+ years old.
Also remove myself as maintainer, since the only changes to these
drivers going forward will be the generic API type changes that
touch all drivers.
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f08c3117c349ea56bd57be347b0b5f8be8c3143c
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date: Sat Jan 1 13:15:01 2011 +0000
net/Space: delete orphaned externs from deleted drivers
The drivers associated with the prototypes in this commit have
been deleted some time ago, but the externs escaped detection.
Using a simple "git grep" shows that these references are
historical artefacts, only mentioned by the deleted lines.
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2f32c867219734b06abc980d4812f67b6d6fe517
Author: J. K. Cliburn <jcliburn@xxxxxxxxx>
Date: Sat Jan 1 05:02:12 2011 +0000
atl1: fix oops when changing tx/rx ring params
Commit 3f5a2a713aad28480d86b0add00c68484b54febc zeroes out the statistics
message block (SMB) and coalescing message block (CMB) when adapter ring
resources are freed. This is desirable behavior, but, as a side effect,
the commit leads to an oops when atl1_set_ringparam() attempts to alter
the number of rx or tx elements in the ring buffer (by using ethtool
-G, for example). We don't want SMB or CMB to change during this
operation.
Modify atl1_set_ringparam() to preserve SMB and CMB when changing ring
parameters.
Cc: stable@xxxxxxxxxx
Signed-off-by: Jay Cliburn <jcliburn@xxxxxxxxx>
Reported-by: Tõnu Raitviir <jussuf@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a0a2b71bb750ffe9b3faa317cb6317f4ad109383
Merge: c7c25802b39c443b3745cfa973dc49a97a3491f8 d425de5436a620de506f9e4119bf8daa1cb93718
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Jan 3 19:59:24 2011 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
commit 70d544d0576775a2b3923a7e68cb49b0313d80c9
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 16:51:39 2011 -0200
perf evsel: Delete the event selectors at exit
Freeing all the possibly allocated resources, reducing complexity
on each tool exit path.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 1e7972cc5c16e06f258b0278d8c9adfb5aa75c68
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 16:50:55 2011 -0200
perf util: Move do_read from session to util
Not really something to be exported from session.c. Rename it to
'readn' as others did in the past.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit daec78a09de3df5fbfbbd167da0304d49d7fcfe5
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 16:49:44 2011 -0200
perf evsel: Adopt MATCH_EVENT macro from 'stat'
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 69aad6f1ee69546dea8535ab8f3da9f445d57328
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Jan 3 16:39:04 2011 -0200
perf tools: Introduce event selectors
Out of ad-hoc code and global arrays with hard coded sizes.
This is the first step on having a library that will be first
used on regression tests in the 'perf test' tool.
[acme@felicio linux]$ size /tmp/perf.before
text data bss dec hex filename
1273776 97384 5104416 6475576 62cf38 /tmp/perf.before
[acme@felicio linux]$ size /tmp/perf.new
text data bss dec hex filename
1275422 97416 1392416 2765254 2a31c6 /tmp/perf.new
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit c32e061fa19893ce4acf95d97d5613a161f0f1b7
Author: roel kluin <roel.kluin@xxxxxxxxx>
Date: Sat Jan 1 19:40:23 2011 +0100
[SCSI] arcmsr: fix write to device check
Use command->sc_data_direction instead of trying (incorrectly) to
figure it out from the command itself
[jejb: fix up compile failure]
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Acked-by: NickCheng <nick.cheng@xxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 474ffb74c75ea9845860ffb24cdc127eda0d5657
Author: Tomas Henzl <thenzl@xxxxxxxxxx>
Date: Wed Dec 22 16:52:40 2010 +0100
[SCSI] lpfc: lower stack use in lpfc_fc_frame_check
according to checkstack the lpfc_fc_frame_check occupies the first
place in stack usage:
make checkstack
objdump -d vmlinux $(find . -name '*.ko') | \
perl /root/rpmbuild/BUILD/kernel-2.6.32/linux-2.6.32.x86_64/scripts/checkstack.pl x86_64
0x000013f4 lpfc_fc_frame_check [lpfc]: 1936
...
This change makes the rctl_names static, thus not on stack.
Signed-off-by: Tomas Henzl <thenzl@xxxxxxxxxx>
Acked-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474
Author: R, Durgadoss <durgadoss.r@xxxxxxxxx>
Date: Mon Jan 3 17:22:04 2011 +0530
x86, hwmon: Add core threshold notification to therm_throt.c
This patch adds code to therm_throt.c to notify core thermal threshold
events. These thresholds are supported by the IA32_THERM_INTERRUPT register.
The status/log for the same is monitored using the IA32_THERM_STATUS register.
The necessary #defines are in msr-index.h. A call back is added to mce.h, to
further notify the thermal stack, about the threshold events.
Signed-off-by: Durgadoss R <durgadoss.r@xxxxxxxxx>
LKML-Reference: <D6D887BA8C9DFF48B5233887EF04654105C1251710@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 41511704b678f7b101a76e58d6c6b7bbe2a9ad70
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 16:04:56 2010 -0500
[SCSI] eliminate an unnecessary local variable from scsi_remove_target()
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 96de6d447f40612acb93f81a561a834177cca685
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Mon Dec 6 11:37:30 2010 +0100
ARM i.MX51: rename IPU irqs
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit b848169b37f71c494ea59b260ba665290c23c350
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Mon Dec 6 09:13:21 2010 +0100
ARM i.MX51: Add ipu clock support
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 24c78557741395e038e83f25367cf2bfd7f582b8
Author: Aric D. Blumer <aric@xxxxxxxxxxxxxx>
Date: Wed Dec 29 11:18:29 2010 -0500
ARM: pxa: fix page table corruption on resume
Before this patch, the following error would sometimes occur after a
resume on pxa3xx:
/path/to/mm/memory.c:144: bad pmd 8040542e.
The problem was that a temporary page table mapping was being improperly
restored.
The PXA3xx resume code creates a temporary mapping of resume_turn_on_mmu
to avoid a prefetch abort. The pxa3xx_resume_after_mmu code requires
that the r1 register holding the address of this mapping not be
modified, however, resume_turn_on_mmu does modify it. It is mostly
correct in that r1 receives the base table address, but it may also
get other bits in 13:0. This results in pxa3xx_resume_after_mmu
restoring the original mapping to the wrong place, corrupting memory
and leaving the temporary mapping in place.
Signed-off-by: Matt Reimer <mreimer@xxxxxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 823a2df258627b80df2e75056b850424a8eb5fed
Author: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Date: Wed Dec 29 09:06:26 2010 +0200
ARM: it8152: add IT8152_LAST_IRQ definition to fix build error
The commit 6ac6b817f3f4c23c5febd960d8deb343e13af5f3 (ARM: pxa: encode
IRQ number into .nr_irqs) removed definition of ITE_LAST_IRQ which
caused the following build error:
CC arch/arm/common/it8152.o
arch/arm/common/it8152.c: In function 'it8152_init_irq':
arch/arm/common/it8152.c:86: error: 'IT8152_LAST_IRQ' undeclared (first use in this function)
arch/arm/common/it8152.c:86: error: (Each undeclared identifier is reported only once
arch/arm/common/it8152.c:86: error: for each function it appears in.)
make[2]: *** [arch/arm/common/it8152.o] Error 1
Defining the IT8152_LAST_IRQ in the arch/arm/include/hardware/it8152.c
fixes the build.
Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 82427de2c7c39ee7bcaa4cb0260b4e9b9ab19eb8
Author: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Date: Wed Dec 15 07:20:16 2010 +0800
ARM: pxa: PXA_ESERIES depends on FB_W100.
As arch/arm/mach-pxa/eseries.c references w100fb_gpio_{read,write}()
directly.
Signed-off-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit d425de5436a620de506f9e4119bf8daa1cb93718
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Mon Jan 3 16:13:11 2011 +0100
perf: Fix callchain hit bad cast on ascii display
ipchain__fprintf_graph() casts the number of hits in a branch as an
int, which means we lose its highests bits.
This results in meaningless number of callchain hits in perf.data
that have a high number of hits recorded, typically those that have
callchain branches hits appearing more than INT_MAX. This happens
easily as those are pondered by the event period.
Reported-by: Nick Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
commit c67a3e09a5316bb34a14e2751cee719339934235
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Mon Jan 3 11:16:39 2011 -0200
ARM: imx/mx27_3ds: Add PMIC support
MX27_3DS board has a MC13783 PMIC connected to the CSPI2 port.
Add support for the PMIC.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit c7c25802b39c443b3745cfa973dc49a97a3491f8
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Mon Jan 3 12:15:14 2011 +0100
arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU
Disable preemption in init_ibs(). The function only checks the
ibs capabilities and sets up pci devices (if necessary). It runs
only on one cpu but operates with the local APIC and some MSRs,
thus it is better to disable preemption.
[ 7.034377] BUG: using smp_processor_id() in preemptible [00000000] code: modprobe/483
[ 7.034385] caller is setup_APIC_eilvt+0x155/0x180
[ 7.034389] Pid: 483, comm: modprobe Not tainted 2.6.37-rc1-20101110+ #1
[ 7.034392] Call Trace:
[ 7.034400] [<ffffffff812a2b72>] debug_smp_processor_id+0xd2/0xf0
[ 7.034404] [<ffffffff8101e985>] setup_APIC_eilvt+0x155/0x180
[ ... ]
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22812
Reported-by: <atswartz@xxxxxxxxx>
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
Cc: oprofile-list@xxxxxxxxxxxxxxxxxxxxx <oprofile-list@xxxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Dan Carpenter <error27@xxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx> [2.6.37.x]
LKML-Reference: <20110103111514.GM4739@xxxxxxxxxxxx>
[ small cleanups ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8fd0bda511406ef0e9dcce9be055d7ab931e92ba
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 18 09:59:51 2010 -0300
[media] em28xx: radio_fops should also use unlocked_ioctl
em28xx uses core assisted locking, so it shouldn't use .ioctl.
The .ioctl callback was replaced by .unlocked_ioctl for video nodes,
but not for radio nodes. This is now corrected.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9eedd96301cad8ab58ee8c1e579677d0a75c2ba1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Jan 3 00:00:17 2011 +0000
ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
Replace the page_to_dma() and dma_to_page() macros with their PFN
equivalents. This allows us to map parts of memory which do not have
a struct page allocated to them to bus addresses. This will be used
internally by dma_alloc_coherent()/dma_alloc_writecombine().
Build tested on Versatile, OMAP1, IOP13xx and KS8695.
Tested-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 46e67acd5d4cacda758e871eebd15cef4e2c2665
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Jan 3 09:09:56 2011 -0200
[media] wm8775: Revert changeset fcb9757333 to avoid a regression
It seems that cx88 and ivtv use wm8775 on some different modes. The
patch that added support for a board with wm8775 broke ivtv boards with
this device. As we're too close to release 2.6.37, let's just revert
it.
Reported-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Reported-by: Eric Sharkey <eric@xxxxxxxxxxxxx>
Reported-by: Auric <auric@xxxxxxxxxxxx>
Reported by: David Gesswein <djg@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f23b7952d37c69c0caa6c8dfb85dbf2eb9e5fcaa
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Sun Dec 5 19:42:30 2010 -0300
[media] cx25840: Prevent device probe failure due to volume control ERANGE error
This patch fixes a regression that crept into 2.6.36.
The volume control scale in the cx25840 driver has an unusual mapping
from register values to v4l2 volume control values. Enforce the mapping
limits, so that the default volume control setting does not fall out of
bounds to prevent the cx25840 module device probe from failing.
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit cde9efef401563943d5a58eb9b7274bfdc08ca9b
Merge: 50401d77ee4904673042dd737eed436067cc23f5 60ebe1568fd15b7ffa101acc645069e27d546ed6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Jan 3 10:31:54 2011 +0000
Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable
commit 50401d77ee4904673042dd737eed436067cc23f5
Merge: 206323c181371f3d5fab36c6d33e1fac09b61082 760efe6910d5743084b586d3d0a3b65aea96fb2f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Jan 3 10:31:38 2011 +0000
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
commit 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Dec 22 14:46:46 2010 +0100
dmaengine: provide dummy functions for DMA_ENGINE=n
This lets drivers, optionally using the dmaengine, build with DMA_ENGINE
unselected.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 8333f65ef094e47020cd01452b4637e7daf5a77f
Author: Saeed Bishara <saeed@xxxxxxxxxxx>
Date: Tue Dec 21 16:53:39 2010 +0200
mv_xor: fix race in tasklet function
use mv_xor_slot_cleanup() instead of __mv_xor_slot_cleanup() as the former function
aquires the spin lock that needed to protect the drivers data.
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Saeed Bishara <saeed@xxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 711669e5b80b6f2d88f61ed8a9681f83d8cbd201
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Mon Dec 20 16:48:58 2010 +0100
mx51: fix usb clock support
Current code doesn't really enable the usb clocks so if they're disabled
when booting linux, the kernel/machine will hang as soon as someone is trying
to read a usb register
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 8305ed75d1418f02933a48bcabdbb5032d885628
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Mon Dec 20 16:48:57 2010 +0100
MX51: Add support for usb host 2
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 08406f540c7ce4cfed96fb240906eee04b9e3eb7
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Mon Dec 20 16:48:56 2010 +0100
arch/arm/plat-mxc/ehci.c: fix errors/typos
This patch is fixing some issues :
- MXC_OTG_UCTRL_OPM_BIT is for USBCTRL register and not PHYCTRL register.
- the MXC_EHCI_WAKEUP_ENABLED check was only clearing the bits so never allows
to set them.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 0d95b75e2dd736b23f7cc0971d2f2aacea7f3e49
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Tue Dec 21 16:38:22 2010 -0200
ARM: mx3/mx31_3ds: Add support for USB Host2 port
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 1c50e67263a6ab8abb9234e2357bd02134fb4b99
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Tue Dec 21 16:38:21 2010 -0200
ARM: mx3/mx31_3ds: Add support for OTG host mode
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 460d30a329a4186192598131505d9f75e6c5e2bc
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Wed Dec 22 12:25:32 2010 -0200
ARM: imx/mx25_3ds: Add USB support
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 96cf4239c72af1fa099affc720731bad2f86927b
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Wed Dec 22 12:25:31 2010 -0200
ARM: imx/mx27_3ds: Add USB OTG support
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 130a0ddad9e8f48250dd0e4a5f35aa8afa9d1c5f
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Wed Dec 22 12:25:30 2010 -0200
ARM: mx3/mx35_3ds: Add USB OTG Host mode
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 1fef891761ddcbd7e57ec3961a0fb748003222ac
Merge: d3d4b60b12369eded0ea0c5dffee0888ec4d80cd 1d3f33d541312acd34bd2fa780396d111a0f73b1
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Mon Jan 3 10:15:11 2011 +0100
Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new
commit 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Jan 3 02:26:53 2011 +0100
ARM: 6605/1: Add missing include "asm/memory.h"
This patch fixes below build error by adding the missing asm/memory.h,
which is needed for arch_is_coherent().
$ make pxa3xx_defconfig; make
CC init/do_mounts_rd.o
In file included from include/linux/list_bl.h:5,
from include/linux/rculist_bl.h:7,
from include/linux/dcache.h:7,
from include/linux/fs.h:381,
from init/do_mounts_rd.c:3:
include/linux/bit_spinlock.h: In function 'bit_spin_unlock':
include/linux/bit_spinlock.h:61: error: implicit declaration of function 'arch_is_coherent'
make[1]: *** [init/do_mounts_rd.o] Error 1
make: *** [init] Error 2
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d3d4b60b12369eded0ea0c5dffee0888ec4d80cd
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date: Thu Dec 30 19:25:06 2010 +0800
arm: mx50: add mx50 reference design board support
Add basic function and uart device support.
Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 3d5a44be308203a9a192a77037fb613c2f82ed85
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date: Thu Dec 30 19:25:05 2010 +0800
arm: mx50: add core functions support except clock
Add core definitions and memory map, gpio, irq, iomux, uart device
support.
Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 02226a20bcfb01322d4a168f2ed6a6e4366796fd
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date: Thu Dec 30 19:25:03 2010 +0800
arm: mx5: mx51/53 have different mxc_cpu_type definition
Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit dca3abf8d071cb78bac8c8f50259e9fe3a81a4bd
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date: Thu Dec 30 19:25:02 2010 +0800
arm: mx51: define mx51's own MXC_GPIO_IRQS
mx5 SoCs have different GPIO port count.
Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit b086e97b20f150e81609a04ed7da92e12d77f1b0
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date: Thu Dec 30 19:25:01 2010 +0800
arm: plat-mxc: add full parameter macro to define gpio port
Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 626d90c884591005fdaa9464de81731aab23b864
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date: Thu Dec 30 19:25:00 2010 +0800
ARM: mx5: use config to define boot related addresses
Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 1f42be484ffc5559a29466c82adac7dd472d4439
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Sat Jan 1 12:53:11 2011 +0000
sparc: remove unused prom tree functions
Remove the following unused funtions:
prom_nodematch()
prom_firstprop()
prom_node_has_property()
Also declare a few local functions static.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a7e4236511c678bf012901faf3c285d199a1adc8
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Sat Jan 1 12:53:10 2011 +0000
sparc: remove unused prom cpu functions
Remove the following unused funtions:
prom_stopcpu()
prom_idlecpu()
prom_restartcpu()
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit efef2e497717958d9c8bde24998c5a915dd04cd5
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Sat Jan 1 12:53:09 2011 +0000
sparc: drop prom/palloc.c
None of the functions was used.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 743ceeed277c77a7e6751649ad0c4fa42af8063b
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Sat Jan 1 12:53:08 2011 +0000
sparc: drop prom/devmap.c
None of the functions was used.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 551423748a4eba55f2eb0fc250d757986471f187
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Sun Jan 2 23:02:42 2011 +0000
watchdog: Improve initialisation error message and documentation
The error message 'NMI watchdog failed to create perf event...'
does not make it clear that this is a fatal error for the
watchdog. It also currently prints the error value as a
pointer, rather than extracting the error code with PTR_ERR().
Fix that.
Add a note to the description of the 'nowatchdog' kernel
parameter to associate it with this message.
Reported-by: Cesare Leonardi <celeonar@xxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Cc: 599368@xxxxxxxxxxxxxxx
Cc: 608138@xxxxxxxxxxxxxxx
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx> # .37.x and later
LKML-Reference: <1294009362.3167.126.camel@localhost>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit b518a64983cbf2ff31aed530898de2d80e4573d5
Author: Maurus Cuelenaere <mcuelenaere@xxxxxxxxx>
Date: Sun Jan 2 14:48:16 2011 -0500
hwmon: (s3c-hwmon) Fix compilation
The owner field was removed from struct attribute in
6fd69dc578fa0b1bbc3aad70ae3af9a137211707, so don't assign it anymore.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@xxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sun Jan 2 22:17:00 2011 +0100
HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
We have a memory leak in drivers/hid/hid-picolcd.c::picolcd_debug_out_report()
in an error path.. We are not always freeing the memory allocated to
'buff' - this patch makes sure we always kfree() what we allocate with
kmalloc() when it is no longer needed.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 9109f4eb847b7c0be61ae25fb21b1ce2acc9c2d6
Merge: a1a54303d1c58709a0c16402942d6dede2f69f43 d0dfc6b74a0c6e9ee46b62713256e2b025244d3c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 2 10:44:21 2011 -0800
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: i8259: initialize isr_ack
KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow
commit a1a54303d1c58709a0c16402942d6dede2f69f43
Merge: d864b7b4d69d2fd5a3f129d27ad0bb4fc81cc32b ea78484bd508d582f543ff727c9a53a381c15895
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 2 10:43:51 2011 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda: Use LPIB quirk for Dell Inspiron m101z/1120
sound: Prevent buffer overflow in OSS load_mixer_volumes
ASoC: codecs: wm8753: Fix register cache incoherency
ASoC: codecs: wm9090: Fix register cache incoherency
ASoC: codecs: wm8962: Fix register cache incoherency
ASoC: codecs: wm8955: Fix register cache incoherency
ASoC: codecs: wm8904: Fix register cache incoherency
ASoC: codecs: wm8741: Fix register cache incoherency
ASoC: codecs: wm8523: Fix register cache incoherency
ASoC: codecs: max98088: Fix register cache incoherency
ASoC: codecs: Add missing control_type initialization
commit d864b7b4d69d2fd5a3f129d27ad0bb4fc81cc32b
Merge: 3643e0e87c13c670a0fdcd0c34401b38b36ff021 7ad1227818f09242cfe9bf1845fd24211f5f99bd
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 2 10:37:19 2011 -0800
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kconfig: fix undesirable side effect of adding "visible" menu attribute
commit 15095bb0fe779c0403091bda7adce5fb3bb9ca35
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Jan 2 15:05:21 2011 +0000
ARM: TWD: enable one-shot mode
Allow one shot timer mode to be used with the TWD. This allows
NOHZ mode to be used on SMP systems using the TWD localtimer.
Tested on Versatile Express and U8500.
Tested-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ea78484bd508d582f543ff727c9a53a381c15895
Merge: e03fa055bc126e536c7f65862e08a9b143138ea9 776065e36de1d5eb9e33ff908352fef4050ab38d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sun Jan 2 11:01:55 2011 +0100
Merge branch 'fix/asoc' into for-linus
commit d0dfc6b74a0c6e9ee46b62713256e2b025244d3c
Author: Avi Kivity <avi@xxxxxxxxxx>
Date: Fri Dec 31 10:52:15 2010 +0200
KVM: i8259: initialize isr_ack
isr_ack is never initialized. So, until the first PIC reset, interrupts
may fail to be injected. This can cause Windows XP to fail to boot, as
reported in the fallout from the fix to
https://bugzilla.kernel.org/show_bug.cgi?id=21962.
Reported-and-tested-by: Nicolas Prochazka <prochazka.nicolas@xxxxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
commit 40cd201e37073b3e2281cf2c73fcf5674f22267f
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date: Sat Jan 1 14:56:18 2011 -0800
tipc: update log.h re-include protection to reflect new name
The tipc/dbg.h file was recently renamed to tipc/log.h,
but the re-include define was not updated accordingly.
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0885a30b699a2c96d892b61cc48e8ba68fe87bfc
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Fri Dec 31 15:34:27 2010 +0000
sky2: implement 64 bit stats
This implements 64 bit statistics support and fixes races when reading
counter values. The PHY counters can only be accessed 16 bits at a time,
so they are subject to carry races.
NB:
* TX/RX counters are maintained in software because the the hardware packet count
is only a 32 bit value.
* Error counters are really only 32 bit.
* Old 32 bit counter fields in dev->stats still used for some
software counters
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a016892cd6eb8d3dd9769021b088917ac7371abd
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:35 2010 +0000
tipc: remove extraneous braces from single statements
Cleans up TIPC's source code to eliminate the presence of unnecessary
use of {} around single statements.
These changes are purely cosmetic and do not alter the operation of TIPC
in any way.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e3ec9c7d5eea9adf2c604c623c987360cc700b88
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:34 2010 +0000
tipc: remove zeroing assignments to static global variables
Cleans up TIPC's source code to eliminate the needless initialization
of static variables to zero.
These changes are purely cosmetic and do not alter the operation of TIPC
in any way.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2db9983a4318818845193bd577879c0620705e82
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:33 2010 +0000
tipc: split variable assignments out of conditional expressions
Cleans up TIPC's source code to eliminate assigning values to variables
within conditional expressions, improving code readability and reducing
warnings from various code checker tools.
These changes are purely cosmetic and do not alter the operation of TIPC
in any way.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e65967e33be61e5f67727edd4ea829b47676fc0
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:32 2010 +0000
tipc: cleanup various cosmetic whitespace issues
Cleans up TIPC's source code to eliminate deviations from generally
accepted coding conventions relating to leading/trailing white space
and white space around commas, braces, cases, and sizeof.
These changes are purely cosmetic and do not alter the operation of TIPC
in any way.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 25860c3bd5bd1db236d4fd5826d76127d677dc28
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:31 2010 +0000
tipc: recode getsockopt error handling for better readability
The existing code for the copy to user and error handling at the
end of getsockopt isn't easy to follow, due to the excessive use
of if/else. By simply using return where appropriate, it can be
made smaller and easier to follow at the same time.
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e83504f72456809cdbdbc91700d3ba6370c9da1c
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:30 2010 +0000
tipc: remove pointless check for NULL prior to kfree
It is acceptable to call kfree() with NULL, so these checks are not
serving any useful purpose.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 886ef52a8ce6930a9d0c58267d5b5038ac3e8d30
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:29 2010 +0000
tipc: remove redundant #includes
Eliminates a number of #include statements that no longer serve any
useful purpose.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6e7e309c62ab584348e0fef90c8e3e48f634dba1
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:28 2010 +0000
tipc: Finish streamlining of debugging code
Completes the simplification of TIPC's debugging capabilities. By default
TIPC includes no debugging code, and any debugging code added by developers
that calls the dbg() and dbg_macros() is compiled out. If debugging support
is enabled, TIPC prints out some additional data about its internal state
when certain abnormal conditions occur, and any developer-added calls to the
TIPC debug macros are compiled in.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8d64a5ba58157dedc61f3f1f51e1c5d66f32a484
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:27 2010 +0000
tipc: Prune down link-specific debugging code
Eliminates most link-specific debugging code in TIPC, which is now
largely unnecessary. All calls to the link-specific debugging macros
have been removed, as are the macros themselves; in addition, the optional
allocation of print buffers to hold debugging information for each link
endpoint has been removed. The ability for TIPC to print out helpful
diagnostic information when link retransmit failures occur has been
retained for the time being, as an aid in tracking down the cause of
such failures.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7ced6890bf81d311ab2ea846f92d5f3d0951c08c
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:26 2010 +0000
tipc: remove dump() and tipc_dump_dbg()
Eliminates calls to two debugging macros that are being completely obsoleted,
as well as any associated debugging routines that are no longer required.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b29f14284989b3d0b3a5ce268b5b1fc4df9c5795
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:25 2010 +0000
tipc: remove calls to dbg() and msg_dbg()
Eliminates obsolete calls to two of TIPC's main debugging macros, as well
as a pair of associated debugging routines that are no longer required.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f5e75269f59f7c3816f23314b924895e4ecf8409
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:24 2010 +0000
tipc: rename dbg.[ch] to log.[ch]
As the first step in removing obsolete debugging code from TIPC the
files that implement TIPC's non-debug-related log buffer subsystem
are renamed to better reflect their true nature.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5af5479296fba0ace5d5cab84045de5b19bde3fe
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:23 2010 +0000
tipc: Remove internal linked list of node objects
Eliminates a sorted list TIPC uses to keep track of the neighboring
nodes it has links to, since this duplicates information already present
in the internal array of node object pointers.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b0c1e928c85023c73780b5d9873406ccf1cd8019
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:22 2010 +0000
tipc: Remove user registry subsystem
Eliminates routines, data structures, and files that make up TIPC's
user registry. The user registry is no longer needed since the native
API routines that utilized it no longer exist and there are no longer
any internal TIPC services that use it.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa70200e001fc4d76552c974c94f65ab26020203
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:21 2010 +0000
tipc: Eliminate use of user registry by topology service
Simplifies TIPC's network topology service so that it no longer registers
its ports with the user registry, since the service doesn't take advantage
of any of the registry's capabilities.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7a488fd3d40a127d0d6057ecd2696f39e11e63c3
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:20 2010 +0000
tipc: Eliminate use of user registry by configuration service
Simplifies TIPC's configuration service so that it no longer registers
its port with the user registry, since the service doesn't take advantage
of any of the registry's capabilities.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8f92df6ad49da958d97e171762d0a97a3dc738f1
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:19 2010 +0000
tipc: Remove prototype code for supporting multiple clusters
Eliminates routines, data structures, and files that were intended
to allow TIPC to support a network containing multiple clusters.
Currently, TIPC supports only networks consisting of a single cluster
within a single zone, so this code is unnecessary.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 51a8e4dee7653698ba4c6e7de71053665f075273
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:18 2010 +0000
tipc: Remove prototype code for supporting inter-cluster routing
Eliminates routines and data structures that were intended to allow
TIPC to route messages to other clusters. Currently, TIPC supports only
networks consisting of a single cluster within a single zone, so this
code is unnecessary.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 08c80e9a031df0a8f0269477a32f5eae47d7a146
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:17 2010 +0000
tipc: Remove prototype code for supporting slave nodes
Simplifies routines and data structures that were intended to allow
TIPC to support slave nodes (i.e. nodes that did not have links to
all of the other nodes in its cluster, forcing TIPC to route messages
that it could not deliver directly through a non-slave node).
Currently, TIPC supports only networks containing non-slave nodes,
so this code is unnecessary.
Note: The latest edition of the TIPC 2.0 Specification has eliminated
the concept of slave nodes entirely.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 51f98a8d70583b18cb08b19353aeed5efb0244af
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Fri Dec 31 18:59:16 2010 +0000
tipc: Remove prototype code for supporting multiple zones
Eliminates routines, data structures, and files that were intended
to allows TIPC to support a network containing multiple zones.
Currently, TIPC supports only networks consisting of a single cluster
within a single zone, so this code is unnecessary.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa6027cacdd912ce884953714fcc7392b6155bc6
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sat Jan 1 05:22:46 2011 +0000
tg3: fix warnings
In case CONFIG_PM_SLEEP is disabled, we dont need tg3_suspend() and
tg3_resume().
drivers/net/tg3.c:15056: warning: â??tg3_suspendâ?? defined but not used
drivers/net/tg3.c:15110: warning: â??tg3_resumeâ?? defined but not used
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Michael Chan <mchan@xxxxxxxxxxxx>
Cc: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a4f740cf33f7f6c164bbde3c0cdbcc77b0c4997c
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sat Oct 30 11:49:09 2010 -0400
of/flattree: Add of_flat_dt_match() helper function
This patch adds of_flat_dt_match() which tests a node for
compatibility with a list of values and converts the relevant powerpc
platform code to use it. This approach simplifies the board support
code a bit.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Reviewed-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
commit 77e58efd134b553d723fd963f436920a6aaaa6df
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
Date: Fri Dec 31 09:50:31 2010 -0800
spi/topcliff: Typo fix threhold to threshold
Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit b9556f9a1abdc56a179ac7ba6053469373b6de0f
Author: Julia Lawall <julia@xxxxxxx>
Date: Wed Dec 29 04:01:03 2010 +0000
drivers/atm/atmtcp.c: add missing atm_dev_put
The earlier call to atm_dev_lookup increases the reference count of dev,
so decrease it on the way out.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x, E;
constant C;
@@
x = atm_dev_lookup(...);
... when != false x != NULL
when != true x == NULL
when != \(E = x\|x = E\)
when != atm_dev_put(dev);
*return -C;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Thu Dec 30 08:52:29 2010 +0000
skge: Do not use legacy PCI power management
The skge driver used the legacy PCI power management, and did its
own PCI callbacks. Use the same code model as Rafael's changes to
sky2. Let the PCI subsystem take care of all the PCI-specific aspects of
device handling during system power transitions.
Compile tested only (so far).
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 18c8d82ae5b802c5d82e0dfbcc08b1b568955f46
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Dec 31 12:48:55 2010 -0800
sfq: fix slot_dequeue_head()
slot_dequeue_head() should make sure slot skb chain is correct in both
ways, or we can crash if all possible flows are in use.
Jarek pointed out slot_queue_init() can now be done in sfq_init() once,
instead each time a flow is setup.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit eeaeb068f1393b4db4861481bf594bcd1c3eda7a
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Dec 28 21:53:33 2010 +0000
sch_sfq: allow big packets and be fair
SFQ is currently 'limited' to small packets, because it uses a 15bit
allotment number per flow. Introduce a scale by 8, so that we can handle
full size TSO/GRO packets.
Use appropriate handling to make sure allot is positive before a new
packet is dequeued, so that fairness is respected.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4d5900a99dbc354ef1ba384d445ff80ae4d77b4
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Wed Dec 29 04:26:17 2010 +0000
starfire: Fix dma_addr_t size test for MIPS
Commit 56543af "starfire: use BUILD_BUG_ON for netdrv_addr_t" revealed
that the preprocessor condition used to find the size of dma_addr_t
yielded the wrong result for some architectures and configurations.
This was kluged for 64-bit PowerPC in commit 3e502e6 by adding yet
another case to the condition. However, 64-bit MIPS configurations
are not detected reliably either.
This should be fixed by using CONFIG_ARCH_DMA_ADDR_T_64BIT, but that
isn't yet defined everywhere it should be.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 824f5f38d3005c346a043dedcfe8b048b699b81a
Author: David Sterba <dsterba@xxxxxxx>
Date: Wed Dec 29 03:40:31 2010 +0000
tg3: fix return value check in tg3_read_vpd()
Besides -ETIMEDOUT and -EINTR, pci_read_vpd may return other error
values like -ENODEV or -EINVAL which are ignored due to the buggy
check, but the data are not read from VPD anyway and this is checked
subsequently with at most 3 needless loop iterations. This does not
show up as a runtime bug.
CC: Matt Carlson <mcarlson@xxxxxxxxxxxx>
CC: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f7e4c9775ea648deed4a8193951e50d0c7706173
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Fri Dec 31 11:18:48 2010 -0800
Broadcom CNIC core network driver: fix mem leak on allocation failures in cnic_alloc_uio_rings()
We are leaking memory in drivers/net/cnic.c::cnic_alloc_uio_rings() if
either of the calls to dma_alloc_coherent() fail. This patch fixes it by
freeing both the memory allocated with kzalloc() and memory allocated with
previous calls to dma_alloc_coherent() when there's a failure.
Thanks to Joe Perches <joe@xxxxxxxxxxx> for suggesting a better
implementation than my initial version.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2393c944d5d60eedaede80273ede8a816b5fa3e0
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sun Dec 26 09:59:58 2010 +0000
ISDN, Gigaset: Fix memory leak in do_disconnect_req()
Hi,
In drivers/isdn/gigaset/capi.c::do_disconnect_req() we will leak the
memory allocated (with kmalloc) to 'b3cmsg' if the call to alloc_skb()
fails.
...
b3cmsg = kmalloc(sizeof(*b3cmsg), GFP_KERNEL);
allocation here ------^
if (!b3cmsg) {
dev_err(cs->dev, "%s: out of memory\n", __func__);
send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
return;
}
capi_cmsg_header(b3cmsg, ap->id, CAPI_DISCONNECT_B3, CAPI_IND,
ap->nextMessageNumber++,
cmsg->adr.adrPLCI | (1 << 16));
b3cmsg->Reason_B3 = CapiProtocolErrorLayer1;
b3skb = alloc_skb(CAPI_DISCONNECT_B3_IND_BASELEN, GFP_KERNEL);
if (b3skb == NULL) {
dev_err(cs->dev, "%s: out of memory\n", __func__);
send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
return;
leak here ------^
...
This leak is easily fixed by just kfree()'ing the memory allocated to
'b3cmsg' right before we return. The following patch does that.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: Tilman Schmidt <tilman@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0f333d10e3f689640b229c8cf00b16ea51ce4951
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sun Dec 26 08:44:32 2010 +0000
sky2: Do not use legacy PCI power management
The sky2 driver uses the legacy PCI power management, so it has to do
some PCI-specific things in its ->suspend() and ->resume() callbacks,
which isn't necessary and should better be done by the PCI
sybsystem-level power management code. Moreover, it uses
device_set_wakeup_enable() incorrectly (that function should be
used when the WoL setting is changed rather than during suspend).
Convert sky2 to the new PCI power management framework and make it
let the PCI subsystem take care of all the PCI-specific aspects of
device handling during system power transitions.
Tested on a desktop machine with a Marvell 88E8056 PCI-E adapter.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c866b7eac073198cef03ea6bac2dc978635a9f5c
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sat Dec 25 12:56:23 2010 +0000
tg3: Do not use legacy PCI power management
The tg3 driver uses the legacy PCI power management, so it has to do
some PCI-specific things in its ->suspend() and ->resume() callbacks,
which isn't necessary and should better be done by the PCI
sybsystem-level power management code.
Convert tg3 to the new PCI power management framework and make it
let the PCI subsystem take care of all the PCI-specific aspects of
device handling during system power transitions.
Tested on HP nx6325 with a NetXtreme BCM5788 adapter.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9f260e0efa4766e56d0ac14f1aeea6ee5eb8fe83
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date: Sun Dec 26 06:54:53 2010 +0000
CAN: Use inode instead of kernel address for /proc file
Since the socket address is just being used as a unique identifier, its
inode number is an alternative that does not leak potentially sensitive
information.
CC-ing stable because MITRE has assigned CVE-2010-4565 to the issue.
Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Acked-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f5260f02e7903bb10e45b1bf3500eab6425edf5c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Dec 25 12:23:42 2010 +0000
USB: cdc_ether: remove unneeded check
We already verified that "dev->udev->actconfig->extralen" was non-zero
so "len" is non-zero here as well.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Oliver Neukum <oneukum@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0268102d53c872b42e214f95492065c8058b042e
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Fri Dec 31 11:04:02 2010 -0800
bnx2: Update firmware and version
Update MIPS firmware to 6.2.1, with improved small packet performance
in RSS mode, and iSCSI CID allocation bug fix on 5708.
Update driver version to 2.0.21.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a29ba9d2d84889686a3af1c5a6023f28be75ccba
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Fri Dec 31 11:03:14 2010 -0800
bnx2: Free IRQ before freeing status block memory
When changing ring size, we free all memory including status block
memory. If we're in INTA mode and sharing IRQ, the IRQ handler can
be called and it will reference the NULL status block pointer.
Because of the lockless design of the IRQ handler, there is no simple
way to synchronize and prevent this. So we avoid this problem by
freeing the IRQ handler before freeing the status block memory.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0438a1b24437cf007ed0e0f5f6b414d5b49468dc
Author: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Date: Fri Dec 31 10:55:38 2010 -0800
netxen: update module description
This driver supports only Intelligent Ethernet Adapters.
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7c14c3f10e6dcd7f70e49f77b6e1ae605c4861e6
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date: Thu Dec 30 06:27:10 2010 +0000
dcbnl: cleanup
A couple of small cleanups for patches:
[net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
[net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
[net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 785b9b1aebcb748fb7627ad4c12dffb7f4f91b55
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date: Thu Dec 30 06:27:03 2010 +0000
bnx2x: adding dcbnl support
Adding dcbnl implementation to bnx2x allowing users to manage the
embedded DCBX engine.
This patch is dependent on the following patches:
[net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
[net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
[net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ea45fe4e176a42d2396878f530cfdc8265bef37b
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date: Thu Dec 30 06:26:55 2010 +0000
dcbnl: adding DCBX feature flags get-set
Adding a pair of set-get routines to dcbnl for setting the negotiation
flags of the various DCB features. Conforms to the CEE flavor of DCBX
The user sets these flags (enable, advertise, willing) for each feature
to be used by the DCBX engine. The 'get' routine returns which of the
features is enabled after the negotiation.
This patch is dependent on the following patches:
[net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
[net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
[net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6241b6259b16aa390ff4bf50f520685b3801200b
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date: Thu Dec 30 06:26:48 2010 +0000
dcbnl: adding DCBX engine capability
Adding an optional DCBX capability and a pair for get-set routines for
setting the device DCBX mode. The DCBX capability is a bit field of
supported attributes. The user is expected to set the DCBX mode with a
subset of the advertised attributes.
This patch is dependent on the following patches:
[net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
[net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
[net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Acked-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 96b99684e365f28d49bdb1221ca022b75cb91a98
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Thu Dec 30 09:26:37 2010 +0000
net_dcb: add application notifiers
DCBx applications priorities can be changed dynamically. If
application stacks are expected to keep the skb priority
consistent with the dcbx priority the stack will need to
be notified when these changes occur.
This patch adds application notifiers for the stack to register
with.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9ab933ab2cc80f04690d6aa385b1110075c5e507
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Thu Dec 30 09:26:31 2010 +0000
dcbnl: add appliction tlv handlers
This patch adds application tlv handlers. Networking stacks
may use the application priority to set the skb priority of
their stack using the negoatiated dcbx priority.
This patch provides the dcb_{get|set}app() routines for the
stack to query these parameters. Notice lower layer drivers
can use the dcbnl_ops routines if additional handling is
needed. Perhaps in the firmware case for example
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3e29027af43728c2a91fe3f735ab2822edaf54a8
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Thu Dec 30 09:25:46 2010 +0000
dcbnl: add support for ieee8021Qaz attributes
The IEEE8021Qaz is the IEEE standard version of CEE. The
standard has had enough significant changes from the CEE
version that many of the CEE attributes have no meaning
in the new spec or do not easily map to IEEE standards.
Rather then attempt to create a complicated mapping
between CEE and IEEE standards this patch adds a nested
IEEE attribute to the list of DCB attributes. The policy
is,
[DCB_ATTR_IFNAME]
[DCB_ATTR_STATE]
...
[DCB_ATTR_IEEE]
[DCB_ATTR_IEEE_ETS]
[DCB_ATTR_IEEE_PFC]
[DCB_ATTR_IEEE_APP_TABLE]
[DCB_ATTR_IEEE_APP]
...
The following dcbnl_rtnl_ops routines were added to handle
the IEEE standard,
int (*ieee_getets) (struct net_device *, struct ieee_ets *);
int (*ieee_setets) (struct net_device *, struct ieee_ets *);
int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *);
int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
int (*ieee_getapp) (struct net_device *, struct dcb_app *);
int (*ieee_setapp) (struct net_device *, struct dcb_app *);
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bfcf72e4426da2fd8f8081a641385ffc3ccc2282
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date: Fri Dec 31 02:22:22 2010 -0600
[SCSI] libiscsi: use bh locking instead of irq with session lock
The session lock is taken in threads, timers, and bottom halves
like softirqs and tasklets. All the code but
iscsi_conn/session_failure take the session lock with the spin_lock_bh
call. This was done because I thought some offload drivers
would be calling these functions from a irq. They never did,
so this patch has iscsi_conn/session_failure use the bh
locking.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f41d472179a0d7c8e8160c85180ab1124947068e
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date: Fri Dec 31 02:22:21 2010 -0600
[SCSI] libiscsi: do not take host lock in queuecommand
iscsi_tcp, ib_iser, cxgb*, be2iscsi and bnx2i do not use
the host lock and do not take the session lock against
a irq, so this patch drops the DEF_SCSI_QCMD use. Instead
we just take the session lock and disable bhs.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 1227633a441363642cdbaf38c4241d071e917095
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date: Fri Dec 31 02:22:20 2010 -0600
[SCSI] be2iscsi: fix null ptr when accessing task hdr
If alloc_pdu fails then the task->hdr pointer may not be
set. This adds a check for this case in the cleanup callback.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit bc7accec8788ada4f459461194c2b8fad94ed239
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date: Fri Dec 31 02:22:19 2010 -0600
[SCSI] be2iscsi: fix gfp use in alloc_pdu
The pdu allication callout is called from a spin lock
and in the IO path so we cannot use GFP_KERNEL. This
has the driver use GFP_ATOMIC.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit df4da5cdfca05b37b366b9c69925b68586969c1c
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date: Fri Dec 31 02:22:18 2010 -0600
[SCSI] libiscsi: add more informative failure message during iscsi scsi eh
This adds a more informative error code and message
for the iscsi scsi eh session drop paths. This allows
you to distinguish if the session was dropped due to
a connection failure vs the iscsi layer dropping
the session due to scsi eh failure processing.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 5c10007560589a2335a77cbc92347b1474518296
Author: Julia Lawall <julia@xxxxxxx>
Date: Wed Dec 29 15:57:54 2010 +0100
[SCSI] gdth: Add missing call to gdth_ioctl_free
Add missing call to gdth_ioctl_free before aborting.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression buf,ha,len,addr,E;
@@
buf = gdth_ioctl_alloc(ha, len, FALSE, &addr)
... when != false buf != NULL
when != true buf == NULL
when != \(E = buf\|buf = E\)
when != gdth_ioctl_free(ha, len, buf, addr)
*return ...;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 9d1da730ee17e712c25c0b1e51653048f92d2385
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Sun Dec 26 10:23:58 2010 -0300
[media] DVB: IR support for TechnoTrend CT-3650
Based on Waling Dijkstra's discovery that the IR works the same as
on the TT-1500, this patch has been rewritten to fit with the
rc_core infrastructure.
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ebce9a3331f4dd1f39856dc4b79f539eb25f7f64
Author: Igor M. Liplianin <liplianin@xxxxx>
Date: Fri Dec 31 02:04:38 2010 -0300
[media] cx23885, cimax2.c: Fix case of two CAM insertion irq
For example boot up with two CAM inserted.
Signed-off-by: Abylay Ospan <aospan@xxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 21d33014108671cc6b02feda088f32bf26ce532d
Author: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
Date: Wed Dec 29 19:48:43 2010 -0300
[media] ir-nec-decoder: fix repeat key issue
Fixing the problem with NEC protocol and repeating keys under the following
circumstances. The problem occurs when there is a repeat code without
properly decoded scancode. This leads to repeat the wrong (last decoded)
scancode.
An example from real life:
I am pressing volume down, then several minutes later i am pressing
volume up, but the real scancode is wrongly decoded and only a repeat
event is emitted, so as a result volume is going down while i am holding
volume up button.
The patch fixes above problem using rc_keyup timeout (as pointed by Mauro).
It just prevents key repeats if they appear after rc_keyup.
Signed-off-by: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8f4bfadd200477acb6dcf41a45919dd37d01a6db
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date: Sun Dec 26 21:50:10 2010 -0800
[SCSI] bfa: remove unused defintions and misc cleanups
This patch removes unused functions, data strucutres, and definitions. It
also includes misc comment and formatting cleanups.
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2f2f40a45845e52fbbe07bcd3e09ccff44feb01b
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date: Sun Dec 26 21:48:53 2010 -0800
[SCSI] bfa: remove inactive functions
This patch removes some inactive functions and macros.
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit d4b671c58ebeb56dfc8fe8bcca25e0a06bc9359a
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date: Sun Dec 26 21:46:35 2010 -0800
[SCSI] bfa: replace bfa_assert with WARN_ON
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2f263d9d4f0432e4f7a708c95fab82f83ec14947
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
Date: Thu Dec 30 15:07:51 2010 -0800
spi/dw_spi Typo change diable to disable.
Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit ef98a2c0f2856f6b2aa87fd32d5b192afaeae518
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Thu Dec 30 15:23:41 2010 -0300
[media] staging: se401 depends on USB
Fix build errors by adding "depends on USB":
ERROR: "usb_register_driver" [drivers/staging/se401/se401.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/se401/se401.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/se401/se401.ko] undefined!
ERROR: "usb_control_msg" [drivers/staging/se401/se401.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/se401/se401.ko] undefined!
ERROR: "usb_kill_urb" [drivers/staging/se401/se401.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/se401/se401.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 798cf3144f8b7466533cf738740478e472677a01
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Thu Dec 30 15:23:38 2010 -0300
[media] staging: usbvideo/vicam depends on USB
Fix build errors by adding "depends on USB":
ERROR: "usb_register_driver" [drivers/staging/usbvideo/vicam.ko] undefined!
ERROR: "usb_bulk_msg" [drivers/staging/usbvideo/vicam.ko] undefined!
ERROR: "usb_control_msg" [drivers/staging/usbvideo/vicam.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/usbvideo/vicam.ko] undefined!
ERROR: "usb_get_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_put_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_set_interface" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_kill_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/usbvideo/usbvideo.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 96e442c1b2ef2ba9476e5da2607ba666ce09664d
Author: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Date: Thu Dec 2 07:43:37 2010 -0300
[media] soc_camera: Add the ability to bind regulators to soc_camedra devices
In certain machines, camera devices are supplied directly
by a number of regulators. This patch add the ability to drive
these regulators directly by the soc_camera driver.
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3153ac9c6208892ee237caccdbe2290f8247e236
Author: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Date: Thu Dec 2 11:53:28 2010 -0300
[media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b6a633c18ba83c0c8e96759a31d356bfb77e2b5f
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Sat Dec 25 17:40:26 2010 -0300
[media] v4l: soc-camera: switch to .unlocked_ioctl
Use the V4L mutex infrastructure in soc-camera core and drivers and switch to
.unlocked_ioctl.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c85bb69af09988f728aca825c11267c9d06ba32e
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Dec 30 08:37:06 2010 -0300
[media] v4l: ov772x: simplify pointer dereference
Use a more direct way to obtain a pointer to struct ov772x_priv, where the
subdevice is available.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 63c9718c1a4595d51f5b70ed4aed6cee5aea875b
Author: David Cohen <dacohen@xxxxxxxxx>
Date: Wed Dec 8 09:13:59 2010 -0300
[media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
OmniVision OV9640 driver wasn't requesting properly its private data
on I2C remove and video_probe functions. It was retrieving the V4L2
subdev struct address instead of priv struct's one. This patch fixes
such problem.
Signed-off-by: David Cohen <dacohen@xxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f7b74f76a3a5bcad4d2e8db76834253a63977545
Author: David Cohen <dacohen@xxxxxxxxx>
Date: Wed Dec 8 09:13:58 2010 -0300
[media] ov9640: use macro to request OmniVision OV9640 sensor private data
This cleanup patch creates macro to request OmniVision OV9640 private
data, which increases readability.
Signed-off-by: David Cohen <dacohen@xxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3643e0e87c13c670a0fdcd0c34401b38b36ff021
Merge: e983dc2428164698571e1dd1b25c4322181adbac cc6455f82edd3f9da3b03870d41cde3cb22ad40d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 30 12:09:26 2010 -0800
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
drm/i915/dvo: Report LVDS attached to ch701x as connected
Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
drm/i915/sdvo: Add hdmi connector properties after initing the connector
drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.
commit e983dc2428164698571e1dd1b25c4322181adbac
Author: Nitin Gupta <ngupta@xxxxxxxxxx>
Date: Thu Dec 30 04:07:58 2010 -0500
Revert "Staging: zram: work around oops due to startup ordering snafu"
This reverts commit 7e24cce38a99f373450db67bf576fe73e8168d66 because it
was never appropriate for mainline.
Do not check for init flag before starting I/O - zram module is unusable
without this fix.
The oops mentioned in the reverted commit message was actually a problem
only with the zram version as present in project's own repository where
we allocate struct zram_stats_cpu upon device initialization. OTOH, In
mainline/staging version of zram, we allocate struct stats upfront, so
this oops cannot happen in mainline version.
Checking for init_done flag in zram_make_request() results in a *no-op*
for any I/O operation since we simply always return success. This flag
is actually set when the first write occurs on a zram disk which
triggers its initialization.
Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=25722
Reported-by: Dennis Jansen <dennis.jansen@xxxxxx>
Signed-off-by: Nitin Gupta <ngupta@xxxxxxxxxx>
Cc: Anton Blanchard <anton@xxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit ff20f1779b7f60a9682aa8d62f8ca3b650e4c360
Merge: ebb76ce16daf6908dc030dec1c00827d37129fe5 0bc463426ab5eb39e76df637b29a4f191d01b8a0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 30 10:07:44 2010 -0800
Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
* 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/m68knommu: Coldfire QSPI platform support
spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition
commit ebb76ce16daf6908dc030dec1c00827d37129fe5
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Date: Wed Dec 29 14:07:11 2010 -0800
memcg: fix wrong VM_BUG_ON() in try_charge()'s mm->owner check
At __mem_cgroup_try_charge(), VM_BUG_ON(!mm->owner) is checked.
But as commented in mem_cgroup_from_task(), mm->owner can be NULL
in some racy case. This check of VM_BUG_ON() is bad.
A possible story to hit this is at swapoff()->try_to_unuse(). It passes
mm_struct to mem_cgroup_try_charge_swapin() while mm->owner is NULL. If we
can't get proper mem_cgroup from swap_cgroup information, mm->owner is used
as charge target and we see NULL.
Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Reported-by: Hugh Dickins <hughd@xxxxxxxxxx>
Reported-by: Thomas Meyer <thomas@xxxxxxxx>
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Reviewed-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit b83be6f20a0e468f715b14225c9f897538dfe5ad
Author: Christoph Hellwig <hch>
Date: Thu Dec 16 12:04:54 2010 +0100
update Documentation/filesystems/Locking
Mostly inspired by all the recent BKL removal changes, but a lot of older
updates also weren't properly recorded.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 9804ed9e840c461f88b290dea43173e3eed37102
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 11:58:37 2010 -0300
[media] ivtv-i2c: Fix two warnings
Fix two gcc warnings:
drivers/media/video/ivtv/ivtv-i2c.c:170: warning: cast from pointer to integer of different size
drivers/media/video/ivtv/ivtv-i2c.c:171: warning: cast from pointer to integer of different size
$ gcc --version
gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-48)
They seem bogus, but, as the original code also has problems with
LE/BE, just change its implementation to be clear.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit abfd013b665d21f57bc4b2e455b23c4cece0df9f
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 09:51:19 2010 -0300
[media] staging/lirc: Update lirc TODO files
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6a23a520c07ba556ea2317b1f72f3d2eb002f991
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 09:05:12 2010 -0300
[media] cx88: Remove the obsolete i2c_adapter.id field
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d7c7235695ef9cbbdc20bdeb8554dbf10f576ca1
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Tue Dec 28 22:49:50 2010 -0300
[media] lirc_zilog: Remove use of deprecated struct i2c_adapter.id field
Remove use of deprecated struct i2c_adapter.id field. In the process,
perform different detection of the HD PVR's Z8 IR microcontroller versus
the other Hauppauge cards with the Z8 IR microcontroller.
Also added a comment about probe() function behavior that needs to be
fixed.
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a9cd591e29b6b50e1212de7b7a86ccd270f5c2a6
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Tue Dec 28 22:47:46 2010 -0300
[media] ir-kbd-i2c: Add HD PVR IR Rx support to ir-kbd-i2c
Add HD PVR IR Rx support to ir-kbd-i2c
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ea6c06033f01216df504b0f337a350778a3bc80e
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Tue Dec 28 22:46:13 2010 -0300
[media] hdpvr: Add I2C and ir-kdb-i2c registration of the Zilog Z8 IR chip
Adds I2C registration of the Zilog Z8F0811 IR microcontroller for either
lirc_zilog or ir-kbd-i2c to use. This is a required step in removing
lirc_zilog's use of the deprecated struct i2c_adapter.id field.
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 41ca2b1ac269e2ed64e2562b91fa61cab0b19e7a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 08:37:33 2010 -0300
[media] Remove staging/lirc/lirc_i2c driver
This driver duplicates the same functionality found at ir-kbd-i2c.
There were a few missing key parsers that were added by the previous
patches. The only thing left on lirc_i2c driver is the IR parsing
for Asus TV-Box and Creative/VisionTek BreakOut-Box.
Those devices use pcf8574 chip for IR.
They are old video adapters with TV tuners. Their code were never
merged upstream, and they are not chipped anymore. So, it is very
unlikely that someone would have interests on porting them to the
Linux Kernel.
Due to that, let's remove lirc_i2c, as all the remaining functionality
are already mapped via ir-kbd-i2c.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8a6334fc91de3f58bbd3051d6f088e7f71a3becd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 10:25:12 2010 -0300
[media] ivtv-i2c: Don't use IR legacy mode for Zilog IR
The Zilog IR entries are already handled by IR new code. So,
remove its usage from the legacy IR support.
Acked-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e1e2c57565635310209566a31a300e593f74cc22
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 08:31:10 2010 -0300
[media] ivtv: Add Adaptec Remote Controller
lirc-i2c implements a get key logic for the Adaptec Remote
Controller, at address 0x6b. The only driver that seems to have
an Adaptec device is ivtv:
$ git grep -i adaptec drivers/media
drivers/media/video/cs53l32a.c: * cs53l32a (Adaptec AVC-2010 and AVC-2410) i2c ivtv driver.
drivers/media/video/cs53l32a.c: * Audio source switching for Adaptec AVC-2410 added by Trev Jackson
drivers/media/video/cs53l32a.c: /* Set cs53l32a internal register for Adaptec 2010/2410 setup */
drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2410 card */
drivers/media/video/ivtv/ivtv-cards.c: { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_ADAPTEC, 0x0093 },
drivers/media/video/ivtv/ivtv-cards.c: .name = "Adaptec VideOh! AVC-2410",
drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2010 card */
drivers/media/video/ivtv/ivtv-cards.c: { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_ADAPTEC, 0x0092 },
drivers/media/video/ivtv/ivtv-cards.c: .name = "Adaptec VideOh! AVC-2010",
drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */
drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */
drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_PCI_ID_ADAPTEC 0x9005
drivers/media/video/ivtv/ivtv-driver.c: "\t\t\t 8 = Adaptec AVC-2410\n"
drivers/media/video/ivtv/ivtv-driver.c: "\t\t\t 9 = Adaptec AVC-2010\n"
drivers/media/video/ivtv/ivtv-i2c.c: 0x6b, /* Adaptec IR */
There are two Adaptec cards defined there, but AVC-2010 doesn't have a
remote controller. So, the logic at lirc_i2c seems to be for Adaptec AVC-2410.
As we'll remove lirc_i2c from kernel, move the getkey code to ivtv driver, and
use it for AVC-2410.
Reviewed-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Acked-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1c0eb0ffb0d541bf05a4b422a629fa5986799313
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 08:02:51 2010 -0300
[media] cx88: Add RC logic for Leadtek PVR 2000
Currently, lirc-i2c has a decoding logic for Leadtek Remote
Control. Move it to cx88, as we intend to remove lirc-i2c.
For now, initialize LIRC remote keytable with RC_MAP_EMPTY, as
we don't know its keymap yet. It would be nice to later check
if is there any file on LIRC userspace with that keytable.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b22374544b981b82f7319a02e6b718fc796e9cfa
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 30 08:01:01 2010 -0300
[media] bttv-input: Add a note about PV951 RC
When comparing lirc-i2c and ir-kbd-i2c/bttv-input logic, a difference
was noticed. As lirc-i2c will be removed soon, store the difference on
a comment inside ir-kbd-i2c, in order to preserve the knowledge we
have about that remote controller.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8c11a94d86eb5489dc665bc566bf624e329d89fa
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Dec 28 19:40:40 2010 +0000
ARM: mmci: Clean up MMCI announcement printk
Make the MMCI announcement printk say which primecell part number
has been found. Display the revision as an unsigned decimal, and
display only the first 8 hex digits of the base address unless it's
larger.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cc6455f82edd3f9da3b03870d41cde3cb22ad40d
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 30 12:54:00 2010 +0000
drm/i915/dvo: Report LVDS attached to ch701x as connected
As we have already detected something attached to the chip during
initialisation, always report the LVDS connector status as connected
during probing.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit bcfbbce822d219eb587acaba8a6e062bbeae4761
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 30 09:07:15 2010 +0000
Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
As I feared, whilst this fixed the clocks for the Lenovo U160, it broke
many other machines. So lets reverts commit 448f53a1ede54eb854d036abf
and search for the real bug.
Reported-and-tested-by: Travis Hume <travis@xxxxxxxxxxxxxxx> [et al]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25842
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32698
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit e03fa055bc126e536c7f65862e08a9b143138ea9
Author: Daniel T Chen <crimsun@xxxxxxxxxx>
Date: Tue Dec 28 17:20:02 2010 -0500
ALSA: hda: Use LPIB quirk for Dell Inspiron m101z/1120
Sjoerd Simons reports that, without using position_fix=1, recording
experiences overruns. Work around that by applying the LPIB quirk
for his hardware.
Reported-and-tested-by: Sjoerd Simons <sjoerd@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit d81a12bc29ae4038770e05dce4ab7f26fd5880fb
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date: Sat Dec 25 16:23:40 2010 -0500
sound: Prevent buffer overflow in OSS load_mixer_volumes
The load_mixer_volumes() function, which can be triggered by
unprivileged users via the SOUND_MIXER_SETLEVELS ioctl, is vulnerable to
a buffer overflow. Because the provided "name" argument isn't
guaranteed to be NULL terminated at the expected 32 bytes, it's possible
to overflow past the end of the last element in the mixer_vols array.
Further exploitation can result in an arbitrary kernel write (via
subsequent calls to load_mixer_volumes()) leading to privilege
escalation, or arbitrary kernel reads via get_mixer_levels(). In
addition, the strcmp() may leak bytes beyond the mixer_vols array.
Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c1955b5f3a95717ce1f5235f6e9968da068e3183
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sat Dec 18 16:30:48 2010 +0100
x86: Use this_cpu_inc_return for nmi counter
this_cpu_inc_return() saves us a memory access there.
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 7b543a5334ff4ea2e3ad3b777fc23cdb8072a988
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sat Dec 18 16:30:05 2010 +0100
x86: Replace uses of current_cpu_data with this_cpu ops
Replace all uses of current_cpu_data with this_cpu operations on the
per cpu structure cpu_info. The scala accesses are replaced with the
matching this_cpu ops which results in smaller and more efficient
code.
In the long run, it might be a good idea to remove cpu_data() macro
too and use per_cpu macro directly.
tj: updated description
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 0a3aee0da4402aa19b66e458038533c896fb80c6
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sat Dec 18 16:28:55 2010 +0100
x86: Use this_cpu_ops to optimize code
Go through x86 code and replace __get_cpu_var and get_cpu_var
instances that refer to a scalar and are not used for address
determinations.
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 56f4c400349157289b474a3fd49ee96acab0a4d7
Merge: 32ae2ade462146729580117d9886cc9efd83dfbe da169f5df2764a6a937cb3b07562e269edfb1c0e
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 30 11:26:45 2010 +0100
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
commit 61ea3aa5bf309333c6655ccef825b4a765bff219
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Wed Dec 29 14:38:44 2010 -0300
[media] timblogiw: fix compile warning
Fix 64-bit compile warning:
drivers/media/video/timblogiw.c: In function â??timblogiw_dma_filter_fnâ??:
drivers/media/video/timblogiw.c:151: warning: cast from pointer to integer of different size
drivers/media/video/timblogiw.c: In function â??timblogiw_openâ??:
drivers/media/video/timblogiw.c:670: warning: cast to pointer from integer of different size
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Cc: Richard Rojförs <richard.rojfors@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 657f2271050beabe725ba101c1d840f51a41f33d
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Wed Dec 29 14:29:55 2010 -0300
[media] v4l: fix handling of v4l2_input.capabilities
The v4l core sets the v4l2_input.capabilities field based on the supplied
v4l2_ioctl_ops. However, several drivers do a memset or memcpy of the v4l2_input
struct, thus overwriting that field incorrectly.
Either remove the memset (which is already done by the v4l core), or add the
proper capabilities field in case of a memcpy.
The same is also true for v4l2_output, but that only affected the ivtv driver.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3ea2b673a55cee528f83653e711d09425ed4d8b6
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Wed Dec 29 14:28:13 2010 -0300
[media] em28xx: fix incorrect s_ctrl error code and wrong call to res_free
Calling subdevs to handle s_ctrl returned a non-zero return code even if
everything went fine.
Calling STREAMOFF if no STREAMON happened earlier would hit a BUG_ON
in res_free.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 02ac04805e6a753610d7dd1716181ccbd8e366af
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Wed Dec 29 14:27:05 2010 -0300
[media] v4l2-ctrls: only check def for menu, integer and boolean controls
The 'def' field is only valid for menus, integers and booleans.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 513521eaee4375a1a0da0b73c7131a165a9fe4d9
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Wed Dec 29 14:25:52 2010 -0300
[media] v4l2-ctrls: use const char * const * for the menu arrays
This prevents checkpatch warnings generated when defining
'static const char *foo[]' arrays. It makes sense to use
const char * const * anyway since the pointers in the array
are indeed const.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6d6a48e51fd3bcb40c5b88d0f9690ba960eedfd2
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Wed Dec 29 13:53:21 2010 -0300
[media] usbvision: coding style
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 52cb0bf275debe4ec8950157f11b9d9f14447a88
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Dec 19 20:33:51 2010 -0300
[media] usbvision: convert // to /* */
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5490a7cbe65d63c6ec45f1013287af1e390c95d7
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Dec 19 20:21:36 2010 -0300
[media] usbvision: get rid of camelCase
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c627b9d1f580f26fe99a8045d37a57f91e9aef66
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 18 11:06:09 2010 -0300
[media] usbvision: convert to unlocked_ioctl
Convert driver to use core-assisted locking.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a6d38f889750ed6290728a19d9dad577b147c6d0
Author: Ping Cheng <pinglinux@xxxxxxxxx>
Date: Fri Dec 24 13:16:53 2010 -0800
Input: wacom_w8001 - support pen or touch only devices
Not all penabled devices support touch. The same holds true for touch
devices, so we should be setting up devices according to the results
returned when we query the hardware.
Signed-off-by: Ping Cheng <pingc@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 0bc463426ab5eb39e76df637b29a4f191d01b8a0
Author: Jate Sujjavanich <jsujjavanich@xxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Sep 29 09:44:32 2010 -0400
spi/m68knommu: Coldfire QSPI platform support
After grabbing a msg from the msgq, the mcfqspi_work function calls
list_del_init on the mcfqspi->msgq which unintentionally deletes the rest
of the list before it can be processed. If qspi call was made using
spi_sync, this can result in a process hang.
Signed-off-by: Jate Sujjavanich <jsujjavanich@xxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Steven King <sfking@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 477ca3ad6ac5cdbd5bd40941fc22c6eedc9aa90d
Author: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Date: Wed Dec 1 17:29:18 2010 +0800
spi/fsl_espi: change the read behaviour of the SPIRF
The user must read N bytes of SPIRF (1 <= N <= 4) that do not exceed the
amount of data in the receive FIFO, so read the SPIRF byte by byte when
the data in receive FIFO is less than 4 bytes.
On Simics, when read N bytes that exceed the amout of data in receive
FIFO, we can't read the data out, that is we can't clear the rx FIFO,
then the CPU will loop on the espi rx interrupt.
Signed-off-by: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 73930a85cf38d72851305fcf640c07b4c13aa405
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date: Wed Nov 17 17:50:23 2010 -0600
of_serial: explicitly include of_irq.h
On PPC, of_irq.h gets implicitly included, but on other platforms
it does not.
Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit fe14042358fac0673d4b6362a73796fd64379938
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date: Thu Nov 18 15:55:02 2010 -0800
of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
unflatten_device_tree has two dependencies on things that happen
during boot time. Firstly, it references the initial device tree
directly. Secondly, it allocates memory using the early boot
allocator. This patch factors out these dependencies and uses
the new __unflatten_device_tree function to implement a driver-visible
fdt_unflatten_tree function, which can be used to unflatten a
blob after boot time.
V2:
- remove extra __va() call
- make dt_alloc functions return void *. This doesn't fix the general
strangeness in this code that constantly casts back and forth between
unsigned long and __be32 *
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 57d00ecf90cc9854973da2960012b734acc26e51
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date: Thu Nov 18 15:55:01 2010 -0800
of/flattree: Reorder unflatten_dt_node
Move unflatten_dt_node to be grouped with non-__init functions.
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit a40d6c4cf12d87980c10b230df435d0f56adc40b
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date: Thu Nov 18 15:55:00 2010 -0800
of/flattree: Refactor unflatten_dt_node
unflatten_dt_node is a helper function that does most of the work to
convert a device tree blob into tree of device nodes. This code
now uses a passed-in blob instead of using the single boot-time blob,
allowing it to be called in more contexts.
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 9706a36e35c4ce04f28a62cfe1205b4e3b0dd13c
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date: Thu Nov 18 15:54:59 2010 -0800
of/flattree: Add non-boottime device tree functions
In preparation for providing run-time handling of device trees, factor
out some of the basic functions so that they take an arbitrary blob,
rather than relying on the single boot-time tree.
V2:
- functions have of_fdt_* names
- removed find_flat_dt_string
- blob argument is first
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit e6ce1324e4f08b0d984340201a125806dae0e9a6
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date: Thu Nov 18 15:54:56 2010 -0800
of/flattree: Add Kconfig for EARLY_FLATTREE
The device tree code is now in two pieces: some which can be used generically
on any platform which selects CONFIG_OF_FLATTREE, and some early which is used
at boot time on only a few architectures. This patch segregates the early
code so that only those architectures which care about it need compile it.
This also means that some of the requirements in the early code (such as
a cmd_line variable) that most architectures (e.g. X86) don't provide
can be ignored.
Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
[grant.likely@xxxxxxxxxxxx: remove extra blank line addition]
[grant.likely@xxxxxxxxxxxx: fixed incorrect #ifdef CONFIG_EARLY_FLATTREE check]
[grant.likely@xxxxxxxxxxxx: Made OF_EARLY_FLATTREE select instead of depend
on OF_FLATTREE]
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 7ad1227818f09242cfe9bf1845fd24211f5f99bd
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date: Thu Dec 9 08:11:38 2010 +0000
kconfig: fix undesirable side effect of adding "visible" menu attribute
This lead to non-selected, non-user-selectable options to be written
out to .config. This is not only pointless, but also preventing the
user to be prompted should any of those options eventually become
visible (e.g. by de-selecting the *_AUTO options the "visible"
attribute was added for.
Furthermore it is quite logical for the "visible" attribute of a menu
to control the visibility of all contained prompts, which is what the
patch does.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 42ce7fd6319bed8ecb26d656c476365da46b29e9
Author: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 29 11:52:53 2010 +0100
spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition
When SPI wake up from OFF mode, CS is in the wrong state: force it to the
inactive state.
During the system life, I monitored the CS behavior using a oscilloscope.
I also activated debug in omap2_mcspi, so I saw when driver disable the clocks
and restore context when device is not used.Each time the CS was in the correct
state. It was only when system was put suspend to ram with off-mode activated
that on resume the CS was in wrong state( ie activated).
Changelog:
* Change from v1 to v2:
- Rebase on linus/master (after 2.6.37-rc1)
- Do some clean-up and fix indentation on both patches
- Add more explanations for patch 2
* Change from v2 to v3:
- Use directly resume function of spi_master instead of using function
- from spi_device as Grant Likely pointed it out.
- Force this transition explicitly for each CS used by a device.
* Change from v3 to v4:
- Patch clean-up according to Kevin Hilman and checkpatch.
- Now force CS to be in inactive state only if it was inactive when it was
suspended.
* Change from v4 to v5:
- Rebase on linus/master (after 2.6.37-rc3)
- Collapse some lines as pointed by Grant Likely
- Fix a spelling
* Change from v5 to v6:
- Rebase on linus/master (after 2.6.37-rc7)
- Use CONFIG_SUSPEND instead of CONFIG_PM
- Didn't use legacy PM methods anymore. Instead, add a struct dev_pm_ops and
add the resume method there.
- Fix multi-line comment style
* Change from v6 to v7:
- Rebase on linus/master (after 2.6.37-rc8)
- Drop an extra line
Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 60ebe1568fd15b7ffa101acc645069e27d546ed6
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Fri Dec 3 20:35:50 2010 +0530
ux500: add TC35893 keypad platform data
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 09c730a488c32c2cadb31cdb8dcc4df528441197
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Tue Dec 21 15:53:31 2010 +0530
input/tc3589x: add tc3589x keypad support
Add support for the keypad controller module found on the
TC3589X devices. This driver default adds the support for
TC35893 device.
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
[Some minor fixups for compilation]
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 4ef9e11d6867f88951e30db910fa015300e31871
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Wed Dec 29 21:55:28 2010 +0800
fix freeing user_struct in user cache
When racing on adding into user cache, the new allocated from mm slab
is freed without putting user namespace.
Since the user namespace is already operated by getting, putting has
to be issued.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Acked-by: Serge Hallyn <serge@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 96aebafa63418f447ddc823e40da341cc40553dd
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Fri Dec 24 21:28:56 2010 +0100
gen_init_cpio: Avoid race between call to stat() and call to open()
In usr/gen_init_cpio.c::cpio_mkfile() a call to stat() is made based on
pathname, subsequently the file is open()'ed and then the value of the
initial stat() call is used to allocate a buffer. This is not safe since
the file may change between the call to stat() and the call to open().
Safer to just open() the file and then do fstat() using the filedescriptor
returned by open.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit cd8d60a20a4516016c117ac0f1ac7b06ff606f7e
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Fri Dec 24 09:42:10 2010 -0500
kbuild: create linux-headers package in deb-pkg
Create a linux-headers-$KVER.deb package which can be used to build
external modules without having the source tree around.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 649497d1a3676020802ebba04a3d9bb31253adb5
Author: Avi Kivity <avi@xxxxxxxxxx>
Date: Tue Dec 28 12:09:07 2010 +0200
KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow
We use the physical address instead of the base gfn for the four
PAE page directories we use in unpaged mode. When the guest accesses
an address above 1GB that is backed by a large host page, a BUG_ON()
in kvm_mmu_set_gfn() triggers.
Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=21962
Reported-and-tested-by: Nicolas Prochazka <prochazka.nicolas@xxxxxxxxx>
KVM-Stable-Tag.
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
commit 427aacfe1d0c540bf80e5243d18ba1272f9b756f
Author: Dmitri Belimov <d.belimov@xxxxxxxxx>
Date: Tue Dec 28 21:49:07 2010 -0300
[media] tm6000: Fix mutex unbalance
Hi
Fix never unlocked mutex. No more crash after removing USB stick.
With my best regards, Dmitry.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit aa777a88b2d73f710b86b955e0c738af91e9e452
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:39:13 2010 -0300
[media] gspca - sonixj: Bad clock for om6802 in 640x480
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 71e84ea7f082eb02df6ef40f55d2c4a998f6e1df
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:35:27 2010 -0300
[media] gspca - stv06xx/st6422: Use the new video control mechanism
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7e5f9059a807ce9b7a12b2402f5aeae9557c8049
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:24:18 2010 -0300
[media] gspca - vc032x: Cleanup source
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7fbee99aa2c73bdf47add9de58f646fa7713e7e5
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:17:40 2010 -0300
[media] gspca - zc3xx: The sensor of the VF0250 is a GC0303
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 49fb5e60f7e907126aac10af6577fac6fde684f6
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:09:34 2010 -0300
[media] gspca - zc3xx: Use the new video control mechanism
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7d55a84b0af47b2ec55e16c6dbc8df62a72ac749
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:02:32 2010 -0300
[media] gspca - zc3xx: Keep sorted the device table
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2bbf53bd176e36d1574eeec53bf710d94703535e
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 07:01:04 2010 -0300
[media] gspca: Bad comment
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0aeb5ec74b0a95f1699040f0262a6fd5507d6e8f
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 06:59:04 2010 -0300
[media] gspca - pac7302/pac7311: Fix some warnings
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d85185902fb669a92d4934b926f8016368e1ad06
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Tue Dec 28 06:55:01 2010 -0300
[media] gspca - main: Fix some warnings
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 66832aef0694807f487a8ccc8871cea4e80d78c5
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Mon Dec 27 12:27:50 2010 -0300
[media] bt819: the ioctls in the header are internal to the kernel
Remove bt819.h from ioctl-number.txt and make a note in the header
that these ioctls are for internal use only.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b9218f2f15cdff8991ba041993bf40962c49fdd0
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Mon Dec 27 12:22:46 2010 -0300
[media] saa6588: rename rds.h to saa6588.h
The naming of the media/rds.h header suggested that it was a generic
RDS header, when in fact it is just a saa6588 module API that is
internal to the kernel.
Rename the header and the struct and defines in it to make this clear.
Also removed the header include in radio-si470x.h (not used anymore)
and from ioctl-number.txt (it's internal to the kernel and never called
from userspace).
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a519d70e0cf346e946202ffcbeaf57a1748d0c03
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 19 15:41:49 2010 -0300
[media] media: video: pvrusb2: fix memory leak
Use put_device() instead of kfree() because of device name leak.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Acked-by: Mike Isely <isely@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9028f58f5d7e810a0e88b508ebe6a69daf7e3273
Author: Alexey Chernov <4ernov@xxxxxxxxx>
Date: Mon Dec 6 17:09:53 2010 -0300
[media] support of GoTView PCI-E X5 3D Hybrid in cx23885
Some comments:
1. Everything initialize properly except radio.
2. All analog inputs (TV, composite, S-Video) are tested by myself in several
TV norms (SECAM-D, PAL, NTSC), everything work fine.
So the patch adds general support/detection of the card with working analog
part, DVB part is not supported for now.
Signed-off-by: Alexey Chernov <4ernov@xxxxxxxxx>
Reviewed-by: Steven Toth <stoth@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5f63306d82131371f464c0e5b7ebe6a23a84c768
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 27 21:04:58 2010 -0300
[media] cx231xx: use bitwise negate instead of logical
Bitwise negate was intended here. INPUT_SEL_MASK is 0x30.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Oct 25 17:51:15 2010 -0300
[media] em28xx: Fix audio input for Terratec Grabby
The audio input line was wrong. Fix it.
Cc: stable@xxxxxxxxxx
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b5fff5445a077af897e670e98ea54b9b440f8b63
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Dec 28 08:13:50 2010 -0300
[media] cardlist: Update lists for em28xx and saa7134
PS.: The cardlists are auto-generated via scripts.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b7a0f2e793a52b306e682a0e2e9a0b6f0f0a730e
Author: Ramiro Morales <ramiro@xxxxxxxxxxxx>
Date: Sun Dec 26 18:13:30 2010 -0300
[media] saa7134: Add support for Compro VideoMate Vista M1F
Signed-off-by: Pavel Osnova <pvosnova@xxxxxxxxx>
Signed-off-by: Ramiro Morales <ramiro@xxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 44c6e2a7c2ec76dd495a0f330f9beac572a2fdd7
Author: Ang Way Chuang <wcang@xxxxxxxxxxxxxx>
Date: Fri Dec 24 02:40:46 2010 -0300
[media] cx88-dvb.c: DVB net latency using Hauppauge HVR4000
A Hauppauge HVR 4000 is used on a School On Internet Asia (SOI Asia)
project in order to carry IP traffic over ULE. However, there is an
issue with high latency jitter.
My boss, Husni, identified the problem and provided a patch for it.
The default buffer size of 32 TS frames on cx88 causes the high latency,
so our deployment changes that to 6 TS frames. This patch made the
buffer size tunable, while keeping the default buffer size of 32 TS
frames unchanged.
Signed-off-by: Achmad Husni Thamrin <husni@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit fe04164647588ec55937e6d696da1ebeca04d000
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Thu Dec 23 16:38:53 2010 -0300
[media] cx231xxx: fix typo in saddr_len check
The original code compared "saddr_len" with zero twice in a nonsensical
way. I asked the list, and Andy Walls and Sri Deevi say that the second
check should be if "saddr_len == 1".
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Srinivasa Deevi <Srinivasa.deevi@xxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 50155c25bf346b65fec8e215131df397b0a5ee6e
Author: Anatolij Gustschin <agust@xxxxxxx>
Date: Wed Dec 22 17:31:59 2010 -0300
[media] fsl_viu: add VIDIOC_QUERYSTD and VIDIOC_G_STD support
VIDIOC_QUERYSTD and VIDIOC_G_STD ioctls are currently not
supported in the FSL VIU driver. The decoder subdevice
driver saa7115 extended by previous patch supports QUERYSTD
for saa711x, so we add the appropriate ioctls to the VIU
driver to be able to determine the video input's standard.
Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f9d7d787842e92bc768d282f37fc3056c5441ddb
Author: Anatolij Gustschin <agust@xxxxxxx>
Date: Wed Dec 22 17:31:58 2010 -0300
[media] saa7115: allow input standard autodetection for more chips
Autodetect input's standard using field frequency detection
feature (FIDT in status byte at 0x1F) of the chips saa7111/
saa7111a/saa7113/saa7114/saa7118.
Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 641d21167f66ef4c574ef4f586fec0ae32179acd
Author: Dmitri Belimov <d.belimov@xxxxxxxxx>
Date: Wed Dec 22 05:57:46 2010 -0300
[media] tm6000: rework and fix IR
Hi
This patch didn't kill Stefan's remotes and just for upload my good part of code.
1. Add some code for show IR activity
2. Add filter for IR remotes
3. Split remotes to different types.
4. Fix stop interrupt pipe when isoc pipe started.
When we decide general way of IR I'll add support our remotes.
For our customers I'll made custom temporary patch without this part.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit db9285f79b12286a3b525b41ab275796679c1dfa
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Mon Dec 27 15:45:19 2010 -0300
[media] MEDIA: RC: Provide full scancodes for TT-1500 remote control
Add 0x15 prefix to scancodes for TT-1500 remote control.
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 730726a6f90740a5954ca2fb1c74fad6f44a2c42
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Mon Dec 27 15:41:58 2010 -0300
[media] DVB: Set scanmask for Budget/SAA7146 cards
These devices do not return the full command+address, so set
scanmask accordingly.
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2d5ca76f2b39a31313d7e54224c78b7b311e7dce
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 18:17:12 2010 -0300
[media] dabusb: Move it to staging to be deprecated
dabusb driver were conceived as an experimental driver for a test
device. The driver never supported any shipped product, and, while
there were some updates on it in 2003, for an ancient product,
those changes were never submitted upstream.
Also, there's no DocBook for its API, nor any upstream discussion.
So, better to remove it, on .39. If later needed, we may rescue it
from git logs. For now, let's move it to staging.
Acked-by: Deti Fliegl <deti@xxxxxxxxx>
Cc: Deti Fliegl <deti@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0170f6bcb243cb9e86c953652f8e62fccb8108f1
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 13:00:04 2010 -0300
[media] streamzap: Fix a compilation warning when compiled builtin
drivers/media/rc/streamzap.c: In function â??streamzap_probeâ??:
drivers/media/rc/streamzap.c:460:2: warning: statement with no effect
Cc: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 465a9e3a2f494b0887db63b7b10bb9370145d9bc
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 12:58:02 2010 -0300
[media] af9013: Fix a compilation warning
drivers/media/dvb/frontends/af9013.c: In function â??af9013_update_signal_strength.clone.0â??:
drivers/media/dvb/frontends/af9013.c:967:6: warning: â??retâ?? may be used uninitialized in this function
Cc: Antti Palosaari <crope@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 187e7d3b9b4e0b6b1c171846592e679e58a84cd2
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 12:16:47 2010 -0300
[media] stv090x: Fix some compilation warnings
A few typos at the driver are causing the following warnings:
drivers/media/dvb/frontends/stv090x.c: In function â??stv090x_start_searchâ??:
drivers/media/dvb/frontends/stv090x.c:1486:27: warning: comparison between â??enum stv090x_searchâ?? and â??enum stv090x_delsysâ??
drivers/media/dvb/frontends/stv090x.c:1487:24: warning: comparison between â??enum stv090x_searchâ?? and â??enum stv090x_delsysâ??
drivers/media/dvb/frontends/stv090x.c: In function â??stv090x_optimize_trackâ??:
drivers/media/dvb/frontends/stv090x.c:2943:2: warning: case value â??4â?? not in enumerated type â??enum stv090x_delsysâ??
The first two are due to the lack of using the delsys types
STV090x_DVBS1/STV090x_DSS
instead of
STV090x_SEARCH_DVBS1/STV090x_SEARCH_DSS
The second one is due to the usage of STV090x_UNKNOWN (enum stv090x_modulation)
instead of STV090x_ERROR (enum stv090x_delsys).
Cc: Manu Abraham <abraham.manu@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 95f18be2e4f74255b46fcc23a9718cca9c7375c9
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 12:00:03 2010 -0300
[media] gspca: Fix a warning for using len before filling it
The check for status errors is now before the check for len. That's
ok. However, the error printk's for the status error prints the URB
length. This generates this error:
drivers/media/video/gspca/gspca.c: In function â??fill_frameâ??:
drivers/media/video/gspca/gspca.c:305:9: warning: â??lenâ?? may be used uninitialized in this function
The fix is as simple as moving the len init to happen before the checks.
Cc: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2e94b53c55d00b4d4d4b9e65007566f7fbffab7a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 11:55:07 2010 -0300
[media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K
Fixes several warnings:
drivers/media/dvb/frontends/dib7000m.c: In function â??dib7000m_set_channelâ??:
drivers/media/dvb/frontends/dib7000m.c:808:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000m.c:869:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000m.c: In function â??dib7000m_tuneâ??:
drivers/media/dvb/frontends/dib7000m.c:1023:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000m.c:1033:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000m.c:1043:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000p.c: In function â??dib7000p_set_channelâ??:
drivers/media/dvb/frontends/dib7000p.c:720:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000p.c:773:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000p.c: In function â??dib7000p_tuneâ??:
drivers/media/dvb/frontends/dib7000p.c:997:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000p.c:1007:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
drivers/media/dvb/frontends/dib7000p.c:1017:3: warning: case value â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
The drivers were prepared to support 4K carriers, but as the define were added
later, they were using a "magic" value of 255.
Cc: Patrick Boettcher <pb@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d78aa7292ad38b22ccb9cdba99293cedb52fb342
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 11:47:17 2010 -0300
[media] lirc_zilog: Fix a warning
drivers/staging/lirc/lirc_zilog.c: In function â??send_codeâ??:
drivers/staging/lirc/lirc_zilog.c:886:1: warning: label â??doneâ?? defined but not used
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit fce50ac80e38b1d205939ff7d4777536701263a6
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 11:44:50 2010 -0300
[media] radio-wl1273: Fix two warnings
drivers/media/radio/radio-wl1273.c: In function â??wl1273_fm_upload_firmware_patchâ??:
drivers/media/radio/radio-wl1273.c:675:2: warning: â??nâ?? may be used uninitialized in this function
drivers/media/radio/radio-wl1273.c:675:2: warning: â??iâ?? may be used uninitialized in this function
Those vars are never initialized, and the debug message makes no sense, as it
will show just two random values.
Cc: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9ae2ae35f8a8a13997b9ec719ae7c151a2182e80
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 11:41:14 2010 -0300
[media] dmxdev: Fix a compilation warning due to a bad type
drivers/media/dvb/dvb-core/dmxdev.c: In function â??dvb_dmxdev_start_feedâ??:
drivers/media/dvb/dvb-core/dmxdev.c:583:13: warning: comparison between â??enum dmx_ts_pesâ?? and â??enum <anonymous>â??
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1035758d5bdcd6c2f7308a35185f1d6f3b6b5443
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 11:14:52 2010 -0300
[media] feature_removal_schedule.txt: mark VIDIOC_*_OLD ioctls to die
There are some old broken definitions of ioctl's, where the
read/write arguments were marked wrong. The last one were added
on 2.6.6 kernel. Remove them, in order to cleanup some
copy_from_user/copy_to_user logic done inside V4L core.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0334c8a52a8578f7aef501a14f78004f931efe20
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 09:41:05 2010 -0300
[media] staging/lirc: Fix compilation when LIRC=m
drivers/staging/lirc/lirc_bt829.c:141: undefined reference to `lirc_register_driver'
drivers/built-in.o:(.rodata+0x20f68): undefined reference to `lirc_dev_fop_read'
drivers/built-in.o:(.rodata+0x20f7c): undefined reference to `lirc_dev_fop_poll'
drivers/built-in.o:(.rodata+0x20f8c): undefined reference to `lirc_dev_fop_open'
drivers/built-in.o:(.rodata+0x20f94): undefined reference to `lirc_dev_fop_close'
drivers/built-in.o:(.rodata+0x21030): undefined reference to `lirc_dev_fop_open'
drivers/built-in.o:(.rodata+0x21038): undefined reference to `lirc_dev_fop_close'
This happens when .config is like:
CONFIG_LIRC=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=y
Don't allow that.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 22efe507705a8437255114f98d0d514524460be0
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 08:30:34 2010 -0300
[media] omap_vout: Remove an obsolete comment
This comment mentions a field that doesn't exist, and talks about
videodev.h that got removed. So, it doesn't make any sense to keep
it.
Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 55fe25b418640fad04190103274841b2c907bacd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 08:27:05 2010 -0300
[media] Remove the old V4L1 v4lgrab.c file
This example file uses the old V4L1 API. It also doesn't use libv4l.
So, it is completely obsolete. A good example already exists at
v4l-utils (v4l2grab.c):
http://git.linuxtv.org/v4l-utils.git
Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1fb03673b9eddb55a08174d0952c0a1c2438997e
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 08:24:58 2010 -0300
[media] Fix videodev.h references at the V4L DocBook
Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 38af87869e7a255b6ba0f41bf53d2e7b0a54d13b
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 08:13:12 2010 -0300
[media] Documentation/ioctl/ioctl-number.txt: Remove some now freed ioctl ranges
The V4L1 removal patches removed a few ioctls. Update it at the docspace.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 88ae7624a6fe890e5a8ca57b25420f66e1389f8b
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 07:47:54 2010 -0300
[media] V4L1 removal: Remove linux/videodev.h
There's no sense on keeping it on 2.6.38, as nobody is using it
anymore, at the kernel tree, and installing it at the userspace
API.
As two deprecated drivers still need it, move it to their internal
directories.
Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 58c66df3e38ffb1d59cc5162bb9e07c859288034
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 07:38:48 2010 -0300
[media] Remove VIDEO_V4L1 Kconfig option
There's no sense on keeping VIDEO_V4L1 Kconfig option just because of
two deprecated drivers moved to staging scheduled to die on 2.6.39.
Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 27 07:33:41 2010 -0300
[media] staging: Add TODO files for se401 and usbvideo/vicam
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ddda424999817fbc17adf9013feb066903382ede
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Sun Dec 19 21:59:56 2010 -0300
[media] ivtv: Return EFAULT when copy_from_user() fails in ivtv_write_vbi_from_user()
If write() on a VBI device node fails due to a bad buffer pointer from
userspace, we should notify the application properly with EFAULT, per the
V4L2 API spec.
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b0c45686c8e8aecc7b0cd04d9b6af48d74418d53
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 10:48:17 2010 -0300
[media] ivtv: ivtv_write_vbi() should use copy_from_user() for user data buffers
ivtv_write_vbi() is used for both VBI data that came from the
driver internally and VBI data that came from the user. However,
it did not use copy_from_user() for reading the VBI data from the
user buffers.
This change adds a new version of the function,
ivtv_write_vbi_from_user(), that uses copy_from_user() to read the VBI
data provided via user buffers.
This should resolve a sparse build warning reported by Dave Gilbert.
Reported-by: Dr. David Alan Gilbert <linux at treblig.org>
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 754f9969c323559a12bce1475f3c1e6574129856
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Sat Dec 11 20:38:20 2010 -0300
[media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream
The cx18_stream struct contained a struct cx18_dvb for
every stream object, most of which were for analog capture.
Now we only allocate the cx18_dvb object for the DTV TS stream.
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit fa98447f09641adeeaf02b94133649f03b74d159
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date: Sat Dec 11 12:31:45 2010 -0300
[media] ivtv, cx18: Make ioremap failure messages more useful for users
The error messages these drivers emitted for ioremap() failures
were misleading and not helpful for users. Reworded those messages
to help the user take action to resolve vmalloc address space
exhaustion.
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0a58d713062fb49952b9b082514a48a0c83b269d
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 08:01:38 2010 -0300
[media] stk-webcam: remove V4L1 compatibility code, replace with V4L2 controls
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 439105b122dfa21fbce7201d0f30b5eeac95c918
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:46:56 2010 -0300
[media] feature-removal: update V4L1 removal status
While the V4L1 compatibility module has been removed, we still have
two V4L1 drivers that prevent full V4L1 removal.
Those drivers have been moved to staging and will be removed in 2.6.39,
together with the last V4L1 support.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 39c3d488452ae206cfc8afda0db041ee55d01c3c
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:44:33 2010 -0300
[media] cpia, stradis: remove deprecated V4L1 drivers
Nobody stepped in to convert these drivers to V4L2, so they are now
removed from the kernel.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:36:55 2010 -0300
[media] se401: deprecate driver, move to staging
The se401 driver is deprecated and is moved to staging. If no one will
convert this driver to V4L2, then it will be removed in 2.6.39.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 745da4280f272840976d47afba22ed853f07e1b2
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:27:47 2010 -0300
[media] usbvideo: deprecate the vicam driver
Move usbvideo to staging and mark it deprecated.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5772dcaa790851ec068afcd0d1f160d801b1126e
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:20:34 2010 -0300
[media] usbvideo: remove deprecated drivers
Remove ibmcam, konicawc and ultracam drivers. There are replaced by
gspca drivers.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e4ea644d3e59436f12e43df5d17fdf4fcf7c5fa7
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:15:22 2010 -0300
[media] documentation: update some files to reflect the V4L1 compat removal
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 41d9931c5ae014fbab8bf612c70b8e7ff16f4641
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 07:04:16 2010 -0300
[media] videobuf-dma-sg: remove obsolete comments
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ad1ecf8639e51ab8066cd4f37fd36b6b7cbdd8b3
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sat Dec 25 06:58:01 2010 -0300
[media] zoran: remove V4L1 compat code and zoran custom ioctls
All the functionality is now handled through V4L2.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 08af245de0cf6ab5f4ed008ee2bb99273774fce0
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Dec 24 10:33:19 2010 -0300
[media] V4L: remove V4L1 compatibility mode
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b69a219e0e97441dbeb0262cf85468b61a161399
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 14:01:42 2010 -0300
[media] gspca - ov534_9: Remove an useless instruction
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7a5a414ccb5bfc0fe277ef1a0e9d1e492a6f083c
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 13:58:45 2010 -0300
[media] gspca - ov519: Bad detection of some ov7670 sensors
Tested-by: jim smyth <jsmyth1969@xxxxxxxxx>
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 668f44a603dd4b3468cecd7d8d6dc525207db94e
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 13:46:14 2010 -0300
[media] gspca: Use the global error status for get/set streamparm
Also, in ov534, don't check the parm type.
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 76ebc16b87592350e4ea70681855171adf73f055
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 13:22:21 2010 -0300
[media] gspca - main: Check the isoc packet status before its length
When an error is set for an isochronous packet, the length of the packet
may be null. In this case, the error was not detected and the image
was not discarded as it should be.
Reported-by: Franck Bourdonnec <fbourdonnec@xxxxxxxx>
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f2c5d92ecd4c69a4f86e76d19cb7663f2ebf4781
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 13:19:59 2010 -0300
[media] gspca - sq930x: Fix a bad comment
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit efd3769269f2ef9a0ad452ea8298b3edcb2f5a62
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 13:11:54 2010 -0300
[media] gspca - sq930x: Some detected sensors are not handled yet
These are OmniVision's OV7660 and OV9630.
Don't register the webcam when they are found.
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3ebd17946448df50b9082412d09955c87a112721
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Dec 25 13:07:57 2010 -0300
[media] gspca - sq930x: Don't register a webcam when there are USB errors
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 634b4770539de63581ccdb554426547ced6ded01
Author: Theodore Kilgore <kilgota@xxxxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 24 17:06:04 2010 -0300
[media] gspca - sq905c: Adds the Lego Bionicle
This patch adds the Vendor:Product number of the Lego Bionicle camera to
the existing gspca/sq905c.c and also a line for the camera in gspca.txt.
The camera works "out of the box" with these small changes. So this is
just in time for Christmas. Think of the children.
Signed-off-by: Theodore Kilgore <kilgota@xxxxxxxxxx>
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a19a5cd7b328ae457f79092e711d4bd888e1ca50
Author: Pete Eberlein <pete@xxxxxxxxxxxx>
Date: Mon Dec 20 19:18:59 2010 -0300
[media] s2255drv: remove BKL
Remove BKL ioctl and use unlocked_ioctl with core-assisted locking instead.
Signed-off-by: Pete Eberlein <pete@xxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 07e80305babb27a332ce0f04a3c38ce495cbe711
Author: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Date: Mon Dec 20 14:39:25 2010 -0300
[media] v4l: mem2mem_testdev: remove BKL usage
Remove usage of BKL by usign per-device mutex.
Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
CC: Pawel Osciak <pawel@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit dcd745b723efc875ec5a8f44be028bd0704b12d6
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 20 09:53:16 2010 -0300
[media] timblogiw: too large value for strncpy()
This is a copy and paste error. It should be using sizeof(cap->driver)
instead of sizeof(cap->card).
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Cc: Richard Rojförs <richard.rojfors@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ef330dc2e794c932fcbde3f8abd3f12780d78b47
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sat Dec 18 19:05:02 2010 -0300
[media] saa7164: Remove pointless conditional and save a few bytes in saa7164_downloadfirmware()
Hi,
release_firmware() just does nothing if passed a NULL pointer. So there's
no reason to test before the call in
saa7164-fw.c::saa7164_downloadfirmware().
Removing the pointless conditional also saves a few bytes.
before:
text data bss dec hex filename
7943 112 2144 10199 27d7 drivers/media/video/saa7164/saa7164-fw.o
after:
text data bss dec hex filename
7931 112 2136 10179 27c3 drivers/media/video/saa7164/saa7164-fw.o
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Steven Toth <stoth@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 10304ca65f8871ad9f6725a7480522034184f55f
Author: Sam Doshi <sam@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 12:58:54 2010 -0300
[media] drivers:media:dvb: add USB PIDs for Elgato EyeTV Sat
Adds USB PIDs for the Elgato EyeTV Sat device.
This device is a clone of the Terratec S7.
Signed-off-by: Sam Doshi <sam@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c3353330508aee4390442df2d7f6ce0ef5006185
Author: Anatolij Gustschin <agust@xxxxxxx>
Date: Fri Dec 17 06:40:50 2010 -0300
[media] media: fsl-viu: fix support for streaming with mmap method
Streaming using mmap didn't work in the VIU driver. We need to
start/stop DMA in streamon/streamoff and free the buffers on
release. Add appropriate driver extension now.
Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2a72b39e516bf772e707d5a080d5d07b1c8ac0c0
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Dec 10 09:39:34 2010 -0300
[media] zoran: bit-wise vs logical and
zr->frame_num is a counter and && was intended here instead of &.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 75aecc3af22ae9063c96457d530f281a1e2d3276
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date: Tue Dec 7 19:49:24 2010 -0300
[media] DM04/QQBOX Frontend attach change
On Fri, 2010-12-03 at 09:32 -0200, Mauro Carvalho Chehab wrote:
> Em 27-11-2010 11:13, Malcolm Priestley escreveu:
> > Driver Version v1.73 - Frontend attach change.
> > To stop double rc registration in multi tuner environment or firmware change.
> >
> > Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
> >
> >
> > +static int lme_name(struct dvb_usb_adapter *adap)
> > +{
> > + struct lme2510_state *st = adap->dev->priv;
> > + const char *desc = adap->dev->desc->name;
> > + char *fe_name[] = {"", " LG TDQY-P001F", " SHARP:BS2F7HZ7395"};
> > + char *name = adap->fe->ops.info.name;
> > +
> > + strcpy(name, desc);
> > + strcat(name, fe_name[st->tuner_config]);
>
> Please use, instead, strlcpy/strlcat, to avoid writing outside the buffer size.
>
Driver Version v1.74
Amended patch with change to strlcpy/strlcat.
Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c59a9bfabfc2a6359f046652c6bfa0a82fb17a05
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Tue Dec 7 15:50:09 2010 -0300
[media] media: fix em28xx build, needs hardirq.h
Fix em28xx build by adding hardirq.h header file:
drivers/media/video/em28xx/em28xx-vbi.c:49: error: implicit declaration of function 'in_interrupt'
Reported-by: Zimny Lech <napohybelskurwysynom2010@xxxxxxxxx>
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4c8b8698053c986f5f5249878eab70cb028a1023
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 26 14:06:35 2010 -0300
[media] rc: ir-lirc-codec: fix potential integer overflow
'n' may be bigger than MAX_INT*sizeof(int), if so checking of truncated
(int)(n/sizeof(int)) for LIRCBUF_SIZE overflow and then using nontruncated 'count'
doesn't make sense. Also n may be up to sizeof(int)-1 bytes bigger than expected,
so check value of (n % sizeof(int)) too.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 87d1a50ce45168cbaec10397e876286a398052c1
Author: Matti Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Date: Fri Dec 10 11:41:34 2010 -0300
[media] V4L2: WL1273 FM Radio: TI WL1273 FM radio driver
This module implements V4L2 controls for the Texas Instruments
WL1273 FM Radio and handles the communication with the chip.
Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 383268a8e282fb549dabe3a33ccafc9434ab6006
Author: Matti Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Date: Fri Dec 10 11:41:33 2010 -0300
[media] MFD: WL1273 FM Radio: MFD driver for the FM radio
This is the core of the WL1273 FM radio driver, it connects
the two child modules. The two child drivers are
drivers/media/radio/radio-wl1273.c and sound/soc/codecs/wl1273.c.
The radio-wl1273 driver implements the V4L2 interface and communicates
with the device. The ALSA codec offers digital audio, without it only
analog audio is available.
Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 00765f16f116b45aa67de306ac923ed4ba262bf9
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Sun Dec 12 15:55:03 2010 -0300
[media] gspca_sonixb: Add support for 0c45:602a
Add support for cameras with the HV7131D sensor, such as the 0c45:602a
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2b3e284a89dfa53eb42b6470e4c03e5ddfdb24c5
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Sun Dec 12 08:55:04 2010 -0300
[media] gspca_sonixb: Rewrite start of frame detection
Our old start of frame detection code wrongly assumes that the sof
marker always lives at the beginning of the frame. At least for the
0c45:602a camera this is not the case. This patch also improves
the framerate from 28 fps to 30 fps with the 0c45:6005 and 0c45:6007
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d6746d55da0819edbe913a1447b1ab0e7b440241
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Fri Dec 10 12:28:15 2010 -0300
[media] gspca_sonixb: Make sonixb handle 0c45:6007 instead of sn9c102
I've a 0c45:6007 camera and it works fine with the gspca_sonixb driver,
so make that handle it instead of the deprecated sn9c102 driver.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 788e5d4dc825ffc2eb863272d9a57fb93490dd92
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Fri Dec 17 14:47:27 2010 -0300
[media] cx231xx: Fix IR keymap for Pixelview SBTVD Hybrid
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 12007419b766b316998499bd07c6586928230729
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Fri Dec 17 14:39:29 2010 -0300
[media] Add a keymap for Pixelview 002-T remote
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e330289ed40f76819d6a13e682203c6fc9a86304
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Fri Dec 17 14:22:09 2010 -0300
[media] cx231xx: Fix inverted bits for RC on PV Hybrid
At Pixelview SBTVD Hybrid, the bits sent by the IR are inverted. Due to that,
the existing keytables produce wrong codes.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 49aefd2bcda80d33497f0f26702c67e372cacef3
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon Nov 22 23:35:17 2010 -0300
[media] timblogiw: const and __devinitdata do not mix
This fixes the following error in PowerPC builds:
drivers/media/video/timblogiw.c: In function 'timblogiw_probe':
drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d162e7aac24bfd8b96881582368f976e7e464c25
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Dec 7 19:39:33 2010 -0300
[media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor
Support for mt9m001 (mi1300) is broken:
- Table is incomplete;
- Only one resolution is currently supported by the driver;
- Resolution is incomplete;
- it complains about broken JPEG headers.
Use the same init found on em28xx driver, and properly report the
output format as 8-bits GRAY.
Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d4b416f26279bbbe07faaff1c9cd19d6b3709b2e
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Dec 7 17:19:09 2010 -0300
[media] gspca core: Fix regressions gspca breaking devices with audio
Changeset 35680ba broke several devices:
- Sony Playstation Eye (1415:2000);
- Gigaware model 25-234 (0c45:628f);
- Logitech Messenger Plus (046d:08f6).
Probably more devices were broken by this change.
What happens is that several devices don't need to save some bandwidth
for audio.
Also, as pointed by Hans de Goede <hdegoede@xxxxxxxxxx>, the logic
that implements the bandwidth reservation for audio is broken, since
it will reduce the alt number twice, on devices with audio.
So, let's just revert the broken logic, and think on a better solution
for usb 1.1 devices with audio that can't use the maximum packetsize.
Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 86701c1d6a3ecae2f0e6771c730364d334d5a142
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Dec 7 14:47:10 2010 -0300
[media] gspca/sn9c20x: Get rid of scale "magic" numbers
Use macros for the supported scales, instead of using magic numbers
from 0 to 3.
Code become cleaner by using macros for it.
Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e78567d227ecd40543508342ba39a3dfba5af14f
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Dec 6 06:53:05 2010 -0300
[media] gspca/sn9c20x: Test if sensor is a OV sensor
Instead of just assuming a ov9650 sensor based on USB ID,
double-check it, by reading the sensor ID.
Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit dd89aec47325a251eeaf39ee4b84adb521270cba
Author: Richard Zidlicky <rz@xxxxxxxxxxxxxx>
Date: Wed Dec 1 20:52:49 2010 -0300
[media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick
Add kycodes for DSR-0112 remote that comes together with
Haupauge MiniStick
http://lirc.sourceforge.net/remotes/hauppauge/DSR-0112.jpg
[mchehab@xxxxxxxxxx: Fix KEY_PREVIOUS to match the definition for the other model]
Signed-off-by: Richard Zidlicky <rz@xxxxxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8350e1551c27ee784ded579fd224846972d4b0d3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 30 18:42:07 2010 -0300
[media] media: Remove unnecessary casts of usb_get_intfdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9124544320bd36d5aa21769d17a5781ba729aebf
Author: Philippe Bourdin <richel@xxxxxxxxxxxxxx>
Date: Sun Oct 31 09:57:58 2010 -0300
[media] Terratec Cinergy Hybrid T USB XS
I found that the problems people have reported with the USB-TV-stick
"Terratec Cinergy Hybrid T USB XS" (USB-ID: 0ccd:0042)
are coming from a wrong header file in the v4l-sources.
Attached is a diff, which fixes the problem (tested successfully here).
Obviously the USB-ID has been associated with a wrong chip: EM2880
instead of EM2882, which would be correct.
Reported-by: Philippe Bourdin <richel@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b395cbac36e58a55729fe7e6262a3f0b1691bced
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 26 14:06:41 2010 -0300
[media] media: rc: lirc_dev: check kobject_set_name() result
kobject_set_name() may fail with -ENOMEM, check for it.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 801c73c04ad57689dc9b47baf62cbb23f954d987
Author: David Härdeman <david@xxxxxxxxxxx>
Date: Thu Nov 25 18:36:27 2010 -0300
[media] rc-core: add loopback driver
This patch adds a loopback driver to rc-core which I've found useful for
running scripted tests of different parts of rc-core without having to
fiddle with real hardware.
Basically it emulates hardware with a learning and a non-learning
receiver and two transmitters (which correspond to the two
receivers). TX data that is sent is fed back as input on the
corresponding receiver, which allows for debugging of IR decoders,
keymaps, etc.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit dea8a39fb569c23084c857ccdbf70a95ea3bf7dc
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Nov 29 07:46:13 2010 -0300
[media] rc-core: Initialize return value to zero
At ir_setkeycode, if INPUT_KEYMAP_BY_INDEX is used, the routine may return
an invalid value if not error.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b7c7a4bed8d695933ae172031556de9de30ae598
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sun Nov 28 11:48:26 2010 -0300
[media] bttv: remove custom_irq and gpioq from bttv struct
The RC5 old decoder used custom_irq to indicate the need of handling
the IRQ on a different way. Instead of doing it, let the core just call the
bttv input IRQ handler, and add the code there to call the legacy decoder.
While here, remove the gpioq waitqueue, as this is not used anywhere, and
add a debug msg to help removing the legacy RC5 code.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Thu Nov 18 00:56:37 2010 -0300
[media] cx231xx: stray unlock on error path
The lock isn't held here and doesn't need to be unlocked. The code has
been like this since the driver was merged.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5ad1a55542dd69d2c6aa7db5ca79073d693bbfed
Author: Paul Bender <pebender@xxxxxxxxx>
Date: Wed Nov 17 16:56:17 2010 -0300
[media] rc: fix sysfs entry for mceusb and streamzap
When trying to create persistent device names for mceusb and streamzap
devices, I noticed that their respective drivers are not creating the rc
device as a child of the USB device. Rather it creates it as virtual
device. As a result, udev cannot use the USB device information to
create persistent device names for event and lirc devices associated
with the rc device. Not having persistent device names makes it more
difficult to make use of the devices in userspace as their names can
change.
Forward-ported to media_tree staging/for_v2.6.38 and tested with
both streamzap and mceusb devices:
$ ll /dev/input/by-id/
...
lrwxrwxrwx. 1 root root 9 Nov 17 17:06 usb-Streamzap__Inc._Streamzap_Remote_Control-event-if00 -> ../event6
lrwxrwxrwx. 1 root root 9 Nov 17 17:05 usb-Topseed_Technology_Corp._eHome_Infrared_Transceiver_TS000BzY-event-if00 -> ../event5
Previously, nada.
Signed-off-by: Paul Bender <pebender@xxxxxxxxx>
Tested-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5df465df7bd9c352289ca63d4d9f78299be72c7d
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Fri Nov 19 17:42:40 2010 -0300
[media] drivers/media: nuvoton: fix chip id probe v2
Make sure we have a matching chip id high and one or the other
of the chip id low values.
Print the values if the probe fails.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ecfc95eb7410c04c23f59b02931e8f8b3aa4a5b3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 17:13:54 2010 -0300
[media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b1dc614a81258eb7ff482892e7bc894f1089c144
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 00:04:28 2010 -0300
[media] drivers/media/video: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a363436396ad68509db4513c886055cc067a184c
Author: Alexey Chernov <4ernov@xxxxxxxxx>
Date: Thu Oct 28 18:12:02 2010 -0300
[media] Patch for cx18 module with added support of GoTView PCI DVD3 Hybrid tuner
I've got code which adds support of GoTView PCI DVD3 Hybrid tuner in
cx18 module and Andy Walls in ivtv mailing-list gave me some advice on
making a patch and sending it here. So here's the patch against
staging/2.6.37-rc1 branch (the tutorial recommends to include it as
plain text but if it's the case I can surely send as an attachment):
Several comments on the patch:
1. Both users on the official Gotview forum and support said that PCI
DVD3 is very similar to Yuan MPC718 card so the main part of code is
taken from Yuan configuration. Some users reported it to work properly.
2. Everything is being initialized correctly including analog, dvb,
radio and alsa parts. Analogue part and alsa virtual card is tested by
myself using original Gotview card.
[mchehab@xxxxxxxxxx: Whitespace cleanups]
Signed-off-by: Alexey Chernov <4ernov@xxxxxxxxx>
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 97108cf682566a79ad49f165435bddbb91844d9a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Nov 22 15:50:51 2010 -0300
[media] Fix parameter description for disable_ir
It seems that a wrong cut-and-paste error were done here.
Reported-by: Jeremy Kerr <jeremy.kerr@xxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit eac8ae087ac66b21de94fee3e920210b43d43076
Author: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
Date: Mon Nov 15 15:50:13 2010 -0300
[media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core
The patch fixes the rc-tbs-nec table after converting
drivers/media/video/cx88 to ir-core
(commit ba7e90c9f878e0ac3c0614a5446fe5c62ccc33ec).
It is also adds two missing buttons (10- and 10+) with
its definition (KEY_10CHANNELSUP and KEY_10CHANNELSDOWN).
[mchehab@xxxxxxxxxx: move keycode numbers to 0x1b8/0x1b9 as requested by the input Maintainer]
Signed-off-by: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0e835087dfe7db19f1f072046f5e116d4ec6662b
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Wed Nov 17 02:13:39 2010 -0300
[media] lirc_dev: add some __user annotations
Sparse complains because there are no __user annotations.
drivers/media/rc/lirc_dev.c:156:27: warning:
incorrect type in initializer (incompatible argument 2 (different address spaces))
drivers/media/rc/lirc_dev.c:156:27: expected int ( *read )( ... )
drivers/media/rc/lirc_dev.c:156:27: got int ( extern [toplevel] *<noident> )( ... )
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 829ba9fe34246f1f5e813b6bf84171d36e776734
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:43:27 2010 -0300
[media] rc-core: fix some leftovers from the renaming patches
Fix some minor comments etc which are leftover from the old naming scheme.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:43:17 2010 -0300
[media] bttv: merge ir decoding timers
Similarly to saa7134, bttv_ir has two timers, only one of which is used
at a time and which serve the same purpose. Merge them.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit edb4c25ca3a7997660500692eca3510eac9726e5
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:43:12 2010 -0300
[media] bttv: rename struct card_ir to bttv_ir
bttv_ir is more consistent with all other structs used in the same driver.
Also, clean up the struct to remove commented out members and the work_struct
which is unused.
[mchehab@xxxxxxxxxx: fix a warning at bttv_rc5_timer_end]
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7c8352d18ddbe37cff8ad71175a11739662ef899
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:42:57 2010 -0300
[media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end
Both timers are used for a similar purpose. Merging them allows for some
minor simplifications.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 651c7a5f7f2f7277f8fc4fb38e89c79845ec9bf9
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:42:51 2010 -0300
[media] saa7134: some minor cleanups
Mostly using appropriate data types and constants (e.g. int -> bool).
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b0ddb0f364f926785f50a8cea8a399ba63e3c227
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:42:46 2010 -0300
[media] saa7134: use full keycode for BeholdTV
Using the full keycode for BeholdTV hardware makes another module
parameter unnecessary.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a29df8579ab2779605b181a38ac7fb99796666df
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Nov 19 20:42:41 2010 -0300
[media] saa7134: remove unused module parameter
ir_rc5_remote_gap is a leftover from ir-common, remove it.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 622d9f5d302e99dc7a06cb442e9d9ff2bb0f59b5
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Nov 16 12:32:09 2010 -0300
[media] pwc: failure to submit an urb is a fatal error
Failure to submit an urb is a fatal error, make isoc_init return an
error when this happens rather then only log it.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c7d18867c82657a97f0bdb90ba1151b251b6a29b
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Nov 16 12:26:00 2010 -0300
[media] pwc: Also set alt setting to alt0 when no error occured
isoc_cleanup contains a check to not set the altsetting to alt0 when
the device was unplugged, but the check currently is buggy, and causes
the alt setting to only be set to 0 if an error occured while streaming.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3751e288bcf3d77652ef979edc0b3ea8b21d8b97
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Nov 16 11:39:25 2010 -0300
[media] pwc: do not start isoc stream on /dev/video open
pwc was starting streaming on /dev/video# open rather then on STREAM_ON. Now
that the v4l1 compat code is removed from the pwc driver there is no reason
left to do this. So this patch changes the pwc driver to delay starting
the isoc stream (and thus using valuable usb bandwidth) until the application
does a STREAM_ON
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a931910d3be6f63464befb2dde94ec58a6eaf5c1
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Nov 22 13:22:37 2010 -0300
[media] stb6100: warning cleanup
drivers/media/dvb/frontends/stb6100.c:120: warning: â??stb6100_normalise_regsâ?? defined but not used
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 03c9a806e30c3904e5b5702874eebc1a4f2082bd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 16:05:05 2010 -0300
[media] rc: Rename IR raw interface to ir-raw.c
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d100e659b61a735c3343b3d82c1c009b04072cdd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 15:56:53 2010 -0300
[media] rc: use rc_map_ prefix for all rc map tables
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2f4f58d689dd71dea67407b74405a3c43e797cb1
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 15:46:09 2010 -0300
[media] rc: Name RC keymap tables as rc_map_table
Remote keytables had different names all over the place. Part of the fault
is due to a bad naming when rc subsystem was created, but there were lots
of old names that were still here.
Use a common standard for everything.
Patch generated by this script:
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode,rc_map_table,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_codes_,rc_map_,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_key_map,rc_map_table,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_map_table_size,rc_map_size,g <$i >a && mv a $i; done
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b088ba658b3438056dab4d744701364db3f08b9a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 14:28:27 2010 -0300
[media] rc: Properly name the rc_map struct
The struct that describes a rc mapping had an weird and long name.
We should properly name it, to make easier for developers to work
with it, and to avoid confusion.
Basically, generated by this script:
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode_table,rc_map,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_tab,rc_map,g <$i >a && mv a $i; done
(and manually fixed where needed)
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 52b661449aecc47e652a164c0d8078b31e10aca0
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 14:20:52 2010 -0300
[media] rc: Rename remote controller type to rc_type instead of ir_type
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 29e3ec19d5c88d534ced219d3962d67243e4d310
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 14:12:46 2010 -0300
[media] cx231xx: Properly name rc_map name
rc_map is confusing, as it may be understood as another thing. Properly
rename the field to indicate its usage.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 13:53:11 2010 -0300
[media] Rename all public generic RC functions from ir_ to rc_
Those functions are not InfraRed specific. So, rename them to properly
reflect it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6bda96447cef24fbf97a798b1ea664224d5fdc25
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 13:28:38 2010 -0300
[media] rc: rename the remaining things to rc_core
The Remote Controller subsystem is meant to be used not only by Infra Red
but also for similar types of Remote Controllers. The core is not specific
to Infra Red. As such, rename:
- ir-core.h to rc-core.h
- IR_CORE to RC_CORE
- namespace inside rc-core.c/rc-core.h
To be consistent with the other changes.
No functional change on this patch.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a6e3b81f6198654207c4e972e7ed91931e53e93c
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 10:05:29 2010 -0300
[media] rc: Remove ir-common.h
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Nov 17 09:58:09 2010 -0300
[media] rc: remove ir-common module
Something weird happened with commit 740069e6e043403199dbe2b42256722fb814f6ae.
Instead of dong the right thing, it got somehow corrupted and reverted the
rc changes.
Thanks to David Härdeman for pointing me about the problem.
This patch should be merged with 740069e6e04 before sending upstream.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1697c8dfba72fd182d670a68dca157f64dd3b1f2
Author: Manu Abraham <abraham.manu@xxxxxxxxx>
Date: Sun Nov 14 16:01:47 2010 -0300
[media] stb0899: fix diseqc messages getting lost
- Some badly written applications in conjuction with certain SEC devices
do send too many messages causing the DiSEqC bus to get congested. As
a result, the end devices do get confused and hence do not respond.
The issue was found by Julian Scheel.
Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f14bfe94e459cb070a489e1786f26d54e9e7b5de
Author: Manu Abraham <abraham.manu@xxxxxxxxx>
Date: Sun Nov 14 15:52:10 2010 -0300
[media] stb6100: Improve tuner performance
- Reduce the amount of white noise present, which causes the
demodulator a significant time to acquire a frontend lock
on a whole. Frontend shows a large significant improvement in
performance.
Thanks to Peter Nayler for helping to identify the potential
hotspots and fixing them.
Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3037fd14302d635426996fb7f6fcf7cb98dc15b9
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Sun Nov 14 14:56:00 2010 -0300
[media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits
This function is declared extern and exported, and should not be given
a generic name which may conflict with gpiolib in future.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a22407faba57c3624beea1a9fad7cbdcf5a19a1a
Author: Bjørn Mork <bjorn@xxxxxxx>
Date: Sun Nov 14 14:24:36 2010 -0300
[media] Mantis: use dvb_attach to avoid double dereferencing on module removal
Convert the driver to use the dvb_attach macro to avoid the hard dependency
on the frontend drivers. The hard dependecy will result in loading a
number of unused frontends, and unwanted automatic dereferencing.
This fixes a bug where unloading the mantis driver will derefence any
attached frontend twice, which will cause an oops if the same frontend is
used by another driver.
Signed-off-by: Bjørn Mork <bjorn@xxxxxxx>
Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9c81496a88b04206d0607b23b298b6529da1fcb0
Author: Marko Ristola <marko.ristola@xxxxxxxxxxx>
Date: Sun Nov 14 14:09:04 2010 -0300
[media] Mantis: append tasklet maintenance for DVB stream delivery
After dvb-core has called mantis-fe->stop_feed(dvbdmxfeed)
the last time (count to zero), no data should ever be copied
with dvb_dmx_swfilter() by a tasklet: the target structure
might be in an unusable state. Caller of mantis_fe->stop_feed()
assumes that feeding is stopped after stop_feed() has been
called, ie. dvb_dmx_swfilter() isn't running, and won't be called.
There is a risk that dvb_dmx_swfilter() references freed resources
(memory or spinlocks or ???) causing instabilities. Thus
tasklet_disable(&mantis->tasklet) must be called inside of
mantis-fe->stop_feed(dvbdmxfeed) when necessary.
Signed-off-by: Marko Ristola <marko.ristola@xxxxxxxxxxx>
Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 116d588ea21cf0278a4de1e3272e9c3220a647e7
Author: Manu Abraham <abraham.manu@xxxxxxxxx>
Date: Thu Feb 11 04:11:05 2010 -0300
[media] Mantis, hopper: use MODULE_DEVICE_TABLE
use the macro to make modules auto-loadable
Thanks to Ozan Ã?aÄ?layan <ozan@xxxxxxxxxxxxx> for pointing it out
Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e6f199f3e7e10112adfa80700ecc00b056b5a62e
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Nov 10 09:28:19 2010 -0300
[media] i2c: Remove obsolete cleanup for clientdata
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit. This is obsolete meanwhile, so fix it and hope the word will spread.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c0ff9f4c24a2571943c0d0991c2cb9ac90dc1915
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Nov 10 11:14:13 2010 -0300
[media] media: video: do not clear 'driver' from an i2c_client
The i2c-core does this already.
Reported-by: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9a9dcb4a19c29ec01e7d249e3dae2d589af86480
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Mon Nov 8 20:08:41 2010 -0300
[media] cx231xx-417: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/media/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9c0147b6941e082f52dcbb9688d0e6e5f359744f
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Wed Nov 24 16:41:09 2010 -0300
[media] timblogiw: fix kconfig & build error
timblogiw uses dma() interfaces and it selects TIMB_DMA for that
support. However, drivers/dma/ is not built unless
CONFIG_DMA_ENGINE is enabled, so select/enable that symbol also.
drivers/built-in.o: In function `timblogiw_close':
timblogiw.c:(.text+0x4419fe): undefined reference to `dma_release_channel'
drivers/built-in.o: In function `buffer_release':
timblogiw.c:(.text+0x441a8d): undefined reference to `dma_sync_wait'
drivers/built-in.o: In function `timblogiw_open':
timblogiw.c:(.text+0x44212b): undefined reference to `__dma_request_channel'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c091575c8b35b39b8f271e0d4b692329a705240a
Author: Richard R�¶jfors <richard.rojfors@xxxxxxxxxxxxxx>
Date: Mon Nov 8 10:45:48 2010 -0300
[media] mfd: Add timberdale video-in driver to timberdale
This patch defines platform data for the video-in driver
and adds it to all configurations of timberdale.
Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9eae42e5a216059a146b3fbbe24b4fdc0b10c723
Author: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Date: Mon Nov 8 10:45:44 2010 -0300
[media] media: Add timberdale video-in driver
This patch adds the timberdale video-in driver.
The video IP of timberdale delivers the video data via DMA.
The driver uses the DMA api to handle DMA transfers, and make use
of the V4L2 video buffers to handle buffers against user space.
If available the driver uses an encoder to get/set the video standard
Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 36d89f7de4a4937848de86d9b35cb03a9f0357e1
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 7 17:48:21 2010 -0300
[media] drivers/staging/cx25821: Use pr_fmt and pr_<level>
Fix several defects with bad line continuation uses that
introduce whitespace.
Fix several defects with lines missing "\n".
Standardize prefixes via pr_fmt.
Remove internal cx25821 prefixes.
Standardize :%s():" ... __func__ uses.
Coalesce long formats.
Add KERN_<level> prefixes via pr_<level> to printks.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 13d28e4917fb6cf6898e8998f01ab83b3f468aeb
Author: Matthias Schwarzott <zzam@xxxxxxxxxx>
Date: Sun Nov 7 10:57:13 2010 -0300
[media] IX2505V: i2c transfer error code ignored
It seems that ix2505v driver ignores a i2c error in ix2505v_read_status_reg.
This looks like a typing error using (ret = 1) instead of correct (ret == 1).
Acked-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Signed-off-by: Matthias Schwarzott <zzam@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 62c7cdd8a16025e4d5596b8e61352960745f3707
Author: Jean Delvare <khali@xxxxxxxxxxxx>
Date: Sun Nov 7 12:54:39 2010 -0300
[media] TM6000: Drop unused macro
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Michel Ludwig <michel.ludwig@xxxxxxxxx>
Cc: Stefan Ringel <stefan.ringel@xxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7bd444ede7285cad4ed5047ff954432325fe7f95
Author: Jean Delvare <khali@xxxxxxxxxxxx>
Date: Sun Nov 7 12:53:44 2010 -0300
[media] TM6000: Clean-up i2c initialization
Usage of templates for large structures is a bad idea, as it wastes a
lot of space. Manually initializing the few fields we need is way more
efficient.
Also set the algorithm data const, use strlcpy instead of strcpy, fix
a small race (device data must always be set before registering said
device) and properly return error on adapter registration failure.
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Michel Ludwig <michel.ludwig@xxxxxxxxx>
Cc: Stefan Ringel <stefan.ringel@xxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8ea43d0a2f87b8460f46ddb7b42b5eb17c5385d2
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sat Nov 13 16:49:10 2010 -0300
[media] rc: Remove ir-common module
Now, just one old bttv board uses the old RC5 raw decoding routines.
Its conversion to rc-core requires the generation of IRQ data for both
positive and negative transitions at the IRQ line. I'm not sure if
bttv driver supports it or if the transitions will be reliable enough.
So, due to the lack of hardware for testing, the better for now is to
just move the legacy routines to bttv driver, and wait for someone with
a Nebula Digi could help to port it to use also rc-core raw decoders.
Acked-by: Hermann Pitton <hermann-pitton@xxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6c7e653ff668d939174aa7023736f4a40fd2be08
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sat Nov 13 16:19:54 2010 -0300
[media] saa7134: Remove legacy IR decoding logic inside the module
The only IR left still using the old raw decoders on saa7134 is ENCORE
FM 5.3. As it is now using the standard rc-core raw decoders, lots
of old code can be removed from saa7134.
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 70de39183a8b5ba0a0cd884ff46c1d81dbe939db
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sat Nov 13 16:23:06 2010 -0300
[media] saa7134: use rc-core raw decoders for Encore FM 5.3
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c1937f8e3490fedec2c75383df07cd8a7154c545
Author: Stefan Ringel <stefan.ringel@xxxxxxxx>
Date: Tue Nov 9 13:50:28 2010 -0300
[media] tm6000: add revision check
adding chip revision check
Signed-off-by: Stefan Ringel <stefan.ringel@xxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 101b25b55ec48354bc40b9102b4f7922c9ad9eae
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 5 00:07:39 2010 -0300
[media] drivers/media: Use vzalloc
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 42e142f6b72493b5daec9950c4c83d20ccf56a0d
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Nov 13 05:10:27 2010 -0300
[media] gspca - ov519: New sensor ov7660 with bridge ov530 (ov519)
[mchehab@xxxxxxxxxx: Some CodingStyle fixes]
Tested-by: Anca Emanuel <anca.emanuel@xxxxxxxxx>
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7491f785dd02bc35551e0463d798959b15644c1d
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Sat Nov 13 03:56:41 2010 -0300
[media] gspca - ov519: Re-initialize the webcam at resume time
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b4e96ea30a211c0979e9e0ea10f39dfa50afb8fa
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 16:13:17 2010 -0300
[media] gspca - ov519: Initialize the ov519 snapshot register
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5927abcb21d0dd10c960517453e37302acf2269e
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 15:32:29 2010 -0300
[media] gspca - ov519: Change the ov519 start and stop sequences
- start and stop streaming are done via the FRAR
- streaming suspend (for control change) is done by video reset
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a23acec4bca79f2168a5aeacc8d85386b70ae522
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 15:07:35 2010 -0300
[media] gspca - ov519: Simplify the LED control functions
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e2817029b3f139bd85360536153467bd8f7f863b
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 13:59:48 2010 -0300
[media] gspca - ov519: Check the disabled controls at start time only
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 858ea5e941fad6a2f38d0c9722bbb842d46662fb
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 13:53:10 2010 -0300
[media] gspca - ov519: Clearer debug and error messages
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f8f20188e863dfb43ac53364da0b8865d37c97e2
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 07:54:02 2010 -0300
[media] gspca - ov519: Propagate errors to higher level
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 83db76886c0b0a32a0c8d35b4dc3dc1d8f1287d4
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 07:14:08 2010 -0300
[media] gspca - ov519: Define the disabled controls in a table
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 218678032589895f29f4ee01b9c330caaab44274
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 06:12:09 2010 -0300
[media] gspca - ov519: Set their numbers in the ov519 and ov7670 register names
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 87bae740fd50df49337017b3ccbed9dbaeaad610
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Nov 12 05:31:34 2010 -0300
[media] gspca - ov519: Cleanup source
- move hexadecimal value to lowercase
- remove/add empty lines and spaces
- comment unused macros
- change some comments
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9be1d6cde936dcf9a325eeee01ed64005c98d456
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Fri Nov 12 04:32:35 2010 -0300
[media] gspca - cpia1: Fix error check
It looks to me like it was intended to check the return value
at this point.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7bbe6b8d1f63c2f7482c93d8cd986b1774e6436d
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Thu Nov 11 08:27:24 2010 -0300
[media] gspca - ov519: Define the sensor types in an enum
This patch also checks if the sensor is well detected at connection time.
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d6fa66384b38165126ce2866b4bdff756c6fc761
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Thu Nov 11 08:05:50 2010 -0300
[media] gspca - ov519: Reduce the size of some variables
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9d1593a84c09e57a9565baab931a6cf116120e05
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Thu Nov 11 08:04:06 2010 -0300
[media] gspca - ov519: Change types '__xx' to 'xx'
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d65174c06f2bf4ff73d1c71960be317b89561c06
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Thu Nov 11 06:20:42 2010 -0300
[media] gspca - ov519: Don't do USB exchanges after disconnection
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 14653e64e9db48e91cbd00fba335a6a459e66cc9
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Thu Nov 11 06:17:01 2010 -0300
[media] gspca - ov519: Handle the snapshot on capture stop when CONFIG_INPUT=m
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c0b33bdc5b8d9c1120dece660480d4dd86b817ee
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Wed Oct 27 09:12:30 2010 -0300
[media] gspca-stv06xx: support bandwidth changing
stv06xx devices have only one altsetting, but the actual used
bandwidth can be programmed through a register. We were already
setting this register lower then the max packetsize of the altsetting
indicates. This patch makes the gspca-stv06xx update the usb descriptor
for the alt setting to reflect the actual packetsize in use, so that
the usb subsystem uses the correct information for scheduling usb transfers.
This patch also tries to fallback to lower speeds in case a ENOSPC error
is received when submitting urbs, but currently this is only supported
with stv06xx cams with the pb0100 sensor, as this is the only one for
which we know how to change the framerate.
This patch is based on an initial incomplete patch by
Lee Jones <lee.jones@xxxxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxxxxx>
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit bc25068495b110fcdf35a22f43d32637e99fd018
Author: Steven Toth <stoth@xxxxxxxxxxxxxx>
Date: Fri Nov 12 18:32:36 2010 -0300
[media] saa7164: Checkpatch compliance cleanup
Checkpatch compliance cleanup across files in the saa7164 driver.
Signed-off-by: Steven Toth <stoth@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0e72cc8b8d48ba05e705f432fb99aaa0ea6737c6
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Tue Nov 2 00:22:23 2010 -0300
[media] saa7164: make buffer smaller
This isn't a runtime bug, it's just to make static checkers happy.
In vidioc_querycap() we copy a saa7164_dev ->name driver array into a
v4l2_capability -> driver array. The ->driver array is only 16 chars
long so ->name also can't be more than 16 characters.
The ->name gets set in v4l2_capability() and it always is less than 16
characters so we can easily make the buffer smaller.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 76e4a9a7164263d8ffe816920f84a91e7dfee444
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 1 06:25:39 2010 -0300
[media] tea6415c: return -EIO if i2c_check_functionality fails
If the adapter does not support I2C_FUNC_SMBUS_WRITE_BYTE,
return -EIO instead of 0.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1ce6a1433572c650247480e1bbbca6bd61db7874
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 18:08:31 2010 -0300
[media] drivers/media/video: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9e21ccaa69674e1b0aa887722801258f7de842db
Author: VDR User <user.vdr@xxxxxxxxx>
Date: Sat Oct 30 15:49:49 2010 -0300
[media] dvb-usb-gp8psk: get firmware and fpga versions
This patch adds retrieval of firmware and FPGA versions of Genpix devices.
That information is useful for users who experience performance differences
with the various firmware versions, and may want to use a specific firmware
that best suits their needs.
Example dmesg output:
gp8psk: FW Version = 2.09.4 (0x20904) Build 2009/04/02
gp8psk: FPGA Version = 1
Signed-off-by: Derek Kelly <user.vdr@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 141bb0dc2d0ad03202aef7c070555cd970ca6bf9
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Nov 11 08:14:16 2010 -0300
[media] cx231xx: Fix i2c support at cx231xx-input
There was a bug at cx231xx-input, where it were registering the remote
controls twice, one via ir-kbd-i2c and another directly.
Also, the patch that added rc_register_device() broke compilation for it.
This patch fixes cx231xx-input by fixing the depends on, to point to the
new symbol, and initializing the scanmask via platform_data.
While here, also fix Kconfig symbol change for IR core dependencies.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2eb258327722de3ed4d84ce1b9add2bad21a0ec4
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Fri Nov 12 09:02:40 2010 -0300
[media] ir-kbd-i2c: add rc_dev as a parameter to the driver
There are several fields on rc_dev that drivers can benefit. Allow drivers
to pass it as a parameter to the driver.
For now, the rc_dev parameter is optional. If drivers don't pass it, create
them internally. However, the best is to create rc_dev inside the drivers,
in order to fill other fields, like open(), close(), driver_name, etc.
So, a latter patch making it mandatory and changing the caller drivers is
welcome.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5b2e303f6df1e0b1a903950c5d613a20c8c71a37
Author: David Härdeman <david@xxxxxxxxxxx>
Date: Fri Oct 29 16:08:28 2010 -0300
[media] rc-core: convert winbond-cir
Move winbond-cir from drivers/input/misc/ into drivers/media/rc/
and convert it to use rc-core.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d8b4b5822f51e2142b731b42c81e3f03eec475b2
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Oct 29 16:08:23 2010 -0300
[media] ir-core: make struct rc_dev the primary interface
This patch merges the ir_input_dev and ir_dev_props structs into a single
struct called rc_dev. The drivers and various functions in rc-core used
by the drivers are also changed to use rc_dev as the primary interface
when dealing with rc-core.
This means that the input_dev is abstracted away from the drivers which
is necessary if we ever want to support multiple input devs per rc device.
The new API is similar to what the input subsystem uses, i.e:
rc_device_alloc()
rc_device_free()
rc_device_register()
rc_device_unregister()
[mchehab@xxxxxxxxxx: Fix compilation on mceusb and cx231xx, due to merge conflicts]
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Tested-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4c7b355df6e7f05304e05f6b7a286e59a5f1cc54
Author: David Härdeman <david@xxxxxxxxxxx>
Date: Wed Nov 10 11:04:19 2010 -0300
[media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main
[mchehab@xxxxxxxxxx: this patch were originally bundled with some renaming
stuff and with the file merges, as seen at:
https://patchwork.kernel.org/patch/291092/.
Instead of using the original approach, I wrote the rename patches and the
code merge as separate changes, then applied the difference on this patch.
This way, it is easier to see the real changes at the code, and will be easier
to merge upstream, especially if some conflict rises on the renaming patches]
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Tested-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 631493ecacd81f1af74de459c1d16f7ffa6c82c0
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Nov 9 23:44:27 2010 -0300
[media] rc-core: merge rc-map.c into rc-main.c
With this change, all rc-core functions are into just one file, except
for the rc-raw specific functions.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit bc2a6c5719efd74ce841ad0f0c9b6ea2590da6da
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Nov 9 23:18:24 2010 -0300
[media] rc-core: Merge rc-sysfs.c into rc-main.c
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f62de675f796a992011c598c405a3d6fada9aa20
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Nov 9 23:09:57 2010 -0300
[media] Rename rc-core files from ir- to rc-
As protocol decoders are specific to InfraRed, keep their names as-is.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 32cf86f6d16367db5a10039c1dd938a2427d697c
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Nov 9 23:00:14 2010 -0300
[media] rename drivers/media/IR to drives/media/rc
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Oct 29 16:08:12 2010 -0300
[media] ir-core: more cleanups of ir-functions.c
cx88 only depends on VIDEO_IR because it needs ir_extract_bits().
Move that function to ir-core.h and make it inline.
Lots of drivers had dependencies on VIDEO_IR when they really
wanted IR_CORE.
The only remaining drivers to depend on VIDEO_IR are bt8xx and
saa7134 (ir_rc5_timer_end is the only function exported by
ir-functions).
Rename VIDEO_IR -> IR_LEGACY to give a hint to anyone writing or
converting drivers to IR_CORE that they do not want a dependency
on IR_LEGACY.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 62c6503125389763a74911408d984c5dd09eeb97
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date: Fri Oct 29 16:08:07 2010 -0300
[media] ir-core: remove remaining users of the ir-functions keyhandlers
This patch removes the remaining usages of the ir_input_nokey() and
ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c
by using the corresponding functionality in ir-core instead.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2997137be8eba5bf9c07a24d5fda1f4225f9ca7d
Author: David Härdeman <david@xxxxxxxxxxx>
Date: Fri Oct 29 16:08:02 2010 -0300
[media] ir-core: convert drivers/media/video/cx88 to ir-core
This patch converts the cx88 driver (for sampling hw) to use the
decoders provided by ir-core instead of the separate ones provided
by ir-functions (and gets rid of those).
The value for MO_DDS_IO had a comment saying it corresponded to
a 4kHz samplerate. That comment was unfortunately misleading. The
actual samplerate was something like 3250Hz.
The current value has been derived by analyzing the elapsed time
between interrupts for different values (knowing that each interrupt
corresponds to 32 samples).
Thanks to Mariusz Bialonczyk <manio@xxxxxxxxxx> for testing my patches
(about one a day for two weeks!) on actual hardware.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 00df055ae315c9c8792dc4d012e6ad9c4d527e87
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Fri Oct 29 11:31:39 2010 -0300
[media] radio-si4713: Add regulator framework support
Convert the driver to use regulator framework instead of set_power callback.
This with gpio_reset platform data provide cleaner way to manage chip VIO,
VDD and reset signal inside the driver.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit bf797165f099296b622bcdcea1126a113e0aaac4
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Sat Oct 9 15:09:17 2010 -0300
[media] au0828: enable VBI timeout when calling read() without streamon()
Because some clients (e.g. tvtime) will just open the filehandle and call
read() instead of explicitly calling streamon first, we need to make sure the
VBI timeout routine gets enabled in this case.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 78ca500559b5a4f16a95c198b3e7bdfac8455bf8
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Sat Oct 9 14:43:53 2010 -0300
[media] au0828: fixes for timeout on no video
The first pass of fixes to cause the driver to continue streaming even when
there is no video arriving over the ITU656 bus were not adequate. Continue
the work from the previous patch.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6e04b7b95a5bd2da0aa5df05fc09a1f0d6615666
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Wed Sep 1 22:03:43 2010 -0300
[media] au0828: continue video streaming even when no ITU-656 coming in
We need the au0828 to continue delivering frames even when the device is not
delivering video, or else applications such as tvtime will block indefinitely.
Unfortunately, the au8522 doesn't have any sort of free-running mode or "blue
screen on no video" like some other decoders.
This work was sponsored by GetWellNetwork Inc.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 301c9f26d7ded6e274a99c3a447a9a36790a3f3e
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Sun Jun 27 18:12:42 2010 -0300
[media] au8522: Handle differences in comb filter config for s-video input
Tweak the comb filter config when in s-video mode to match the Hauppauge
Windows driver values (based on register dumps).
This work was sponsored by GetWellNetwork Inc.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d2c194ce4781d62bf671aa6b65a2fccb39feb50e
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Sun Jun 27 18:01:40 2010 -0300
[media] au8522: fix clamp control for different video modes
Straighten out the clamp control configurations for the various video modes,
based off of register diffs done against the Hauppauge Windows driver.
This work was sponsored by GetWellNetwork Inc.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2428a2ed6a7cbc7be6db5c70c3838a4bf0de9f48
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Sun Jun 27 17:40:42 2010 -0300
[media] au8522: cleanup code which disables audio decoder
Cleanup the routine which disables the audio decoder. In particular, the i2s
output was being shut off but the audio processor itself was not, resulting
in more power being consumed than needed.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit bde3bb9a67d2cd260df6be9726c9c360a0e3cee9
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Mon Jul 5 13:05:16 2010 -0300
[media] au0828: Fix field alignment for video frames delivered by driver
Fix the alignment of fields being delivered by the driver, which was
resulting in jerky video when there was horizontal motion (since the bottom
field of the frame was being sent with the top field of the previous frame)
This work was sponsored by GetWellNetwork Inc.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 83f859c5a6d6e01d671f002c0ade3498b4a4b245
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Fri Jun 25 01:33:39 2010 -0300
[media] au0828: set max packets per URB to match Windows driver
We had the max packets per URB set to an incredibly low "10" as opposed to
the Windows driver which has it as 128. Set the value to match the
Windows driver, which will reduce interrupts considerably.
This work was sponsored by GetWellNetwork Inc.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 88464106f97fe1c143bda2b4019b07c3069d454c
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date: Sun Jun 13 17:31:22 2010 -0300
[media] au8522: Properly set default brightness
The chip's default value for the brightness didn't match what we were sending
back in the queryctrl ioctl(), so if the application actually set the
brightness to the "default", it would actually end up being way too bright.
This work was sponsored by GetWellNetwork Inc.
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1d00d6c1ff13607974fcd9469aa9466fcd253c3a
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Oct 29 13:58:22 2010 -0300
[media] gspca: Convert some uppercase hexadecimal values to lowercase
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a79cc7b9182abb2e3936a26064dec414b417f1d1
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Oct 29 08:10:37 2010 -0300
[media] gspca - sonixj: Simplify and clarify the hv7131r probe function
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d581bcd78be567af7026e3d13b54ec7df8db8b82
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Oct 29 08:01:01 2010 -0300
[media] gspca - zc3xx: Bad clocksetting for mt9v111_3 with 640x480 resolution
The bad value prevented the autogain to work correctly
and some images were truncated.
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a23c1947f4da31d9aac9bfc05ef22d8148b2f106
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Oct 29 07:57:03 2010 -0300
[media] gspca - main: Fix a small code error
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 0b8851b6c3934a56eb1a4ff284ab5133065e0cb8
Author: Jean-François Moine <moinejf@xxxxxxx>
Date: Fri Oct 29 07:56:06 2010 -0300
[media] gspca - main: Version change
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 614d06917de2823d598a4b231256d08074044235
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Wed Oct 27 07:42:28 2010 -0300
[media] gspca_ov519: generate release button event on stream stop if needed
Generate a release button event when the button is still pressed when the
stream stops.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e0657be5615f666f261206ed62c3f0dc2527956e
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Wed Oct 27 06:38:07 2010 -0300
[media] gspca_xirlink_cit: Add support camera button
gspca_xirlink_cit: Add support camera button
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2c4e776aa370a7a1619c7ada0604e9003fe1d92a
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Oct 26 17:21:33 2010 -0300
[media] gspca_xirlink_cit: Frames have a 4 byte footer
At least on the ibm netcam pro frames have a 4 byte footer, take this
into account when calculating sizeimage.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit bc46bae6373c87897959c7aa8fb9f6c4218695b8
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Oct 26 11:18:59 2010 -0300
[media] gspca_xirlink_cit: various usb bandwidth allocation improvements / fixes
The following usb bandwidth allocation changes were made to the ibm netcam
pro code:
- Don't restart negotiation at max packet size on stop0, as that gets called
by gspca_main during negotiation. Move this to sd_isoc_init.
- Don't ask for full bandwidth when running at 160x120, that does not need
full bandwidth
- Make minimum acceptable bandwidth depend upon resolution
[mchehab@xxxxxxxxxx: Fix CodingStyle problems at switch statements]
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2661da47daefd4f22f9fdc7e9294a1cb9edf515b
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Oct 26 05:16:32 2010 -0300
[media] gspca: only set gspca->int_urb if submitting it succeeds
Currently alloc_and_submit_int_urb() is setting gspca->int_urb
as soon as the allocation has succeeded, but if the subsequent
submit fails, the urb gets destroyed. And then later will
get destroyed again in gspca_input_destroy_urb() because
gspca->int_urb is set, leading to a double free.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 314b3e0881c6acb4f40e07565ac1a7798c7698a3
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date: Tue Oct 26 05:15:46 2010 -0300
[media] gspca: submit interrupt urbs *after* isoc urbs
Currently gspca supported usb-1.1 webcams for which we support the input
button through an interrupt endpoint won't stream (not enough bandwidth
error) when used through an USB-2.0 hub.
After much debugging I've found out that the cause for this is that the
ehci-sched.c schedeling code does not like it when there are already urb's
scheduled when (large) isoc urbs are queued. By moving the submission
of the interrupt urbs to after submitting the isoc urbs the camera
starts working again through usb-2.0 hubs.
Note that this does not fix isoc. streaming through a usb-hub while another
1.1 usb device (like the microphone of the same cam) is also active
at the same time :(
I've spend a long time analyzing the linux kernel ehci scheduler code,
resulting in this (long) mail:
http://www.spinics.net/lists/linux-usb/msg37982.html
The conclusion of the following mail thread is that yes there are several
issues when using usb-1.1 devices through a usb-2.0 hub, but these are not
easily fixable in the current code. Fixing this in ehci-sched.c requires
an almost full rewrite, which is not bound to happen anytime soon.
So with this patch gspca driven usb-1.1 webcams will atleast work when
connected through an usb-2.0 hub when the microphone is not used.
As an added bonus this patch avoids extra destroy/create input urb cycles
when we end up falling back to a lower speed alt setting because of bandwidth
limitations.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 25ad9847ca09f744b4cfea362d339c8b5b49765c
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date: Thu Nov 4 17:17:51 2010 -0300
[media] lmedm04: change USB Timeouts to avoid troubles
DM04/QQBOX USB Timing change.
Improved timing to avoid USB corruptions on some systems.
Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit afcd0806094d9ae0d944f30776edc075e4584b96
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date: Tue Nov 2 18:02:08 2010 -0300
[media] Documentation/lmedm04: Fix firmware extract information
Corrected Firmware Information for LG on LME2510.
Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f23e6616ac2dc560db0ee8733024ebe90de9161a
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date: Wed Oct 27 19:50:36 2010 -0300
[media] lmed04: Improve frontend handling
Improved frontend handling.
Frontend now remains open at all times, with signal lock, snr & signal level
polled from Interupt.
Updated driver for DM04/QQBOX USB DVB-S BOXES to version 1.70.
Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ea7c681e899bda3fceb37815d63d201c3b4be920
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Wed Oct 27 10:55:00 2010 -0300
[media] cafe_ccic: fix colorspace corruption on resume
If you suspend and resume during video capture, the video colours
are corrupted on resume. This is because the sensor is being unconditionally
powered off during the resume path.
Only power down during resume if the camera is not in use, and correctly
reconfigure the sensor during resume.
Fixes http://dev.laptop.org/ticket/10190
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Acked-by: Jonathan Corbet <corbet@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c429e7b62a54bf34c1995b45faeaeb84104f1705
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Oct 25 23:44:25 2010 -0300
[media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses
Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) dprintk(...)
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1bc25f7d6c0f353d3c73252048fe03a3d8f0e6b8
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sat Oct 23 13:35:58 2010 -0300
[media] cx231xx: Add IR support for Pixelview Hybrid SBTVD
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9ab66912e0cd671fbea1b99e8a37d11b14d50baf
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sat Oct 23 13:28:33 2010 -0300
[media] cx231xx: Add a driver for I2C-based IR
Although cx231xx has a very good IR support, already supported by
mceusb driver, some designs decided to add a separate I2C
microcontroller chip in order to handle IR.
Due to that, add a glue to ir-kbd-i2c is needed, in order to support
those devices.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit f0551efc77b0f34a93a14d2bf96051612e352a39
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sun Oct 3 07:01:26 2010 -0300
[media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 68541cdaadecbc280cd50122f11fdbb249a2ae29
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sun Oct 3 05:27:59 2010 -0300
[media] Add support for Kworld SBTVD board
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 7572f9c5575c721f43b575a71fda1ecd896e0327
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sun Oct 3 16:48:49 2010 -0300
[media] mb86a20s: add support for serial streams
By comparing the traffic between Pixelview (cx23102-based and Kworld
(saa7134-based), the only difference is at register 0xd5. After some
tests, It seems that it is used to change mode between serial and parallel.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 55fa288deca4b17e539ba49a9b0d0ed474afa6f8
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed Sep 29 11:07:08 2010 -0300
[media] cx231xx: use callback to set agc on PixelView
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ede676c72d0b18f1c15300f7874370e771489a1c
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Sep 27 23:44:27 2010 -0300
[media] add digital support for PV SBTVD hybrid
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 9417bc6dd9de85944501f8f4ce8dd0e64135ca82
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Sun Sep 26 20:44:31 2010 -0300
[media] Add analog support for Pixelvied Hybrid SBTVD
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b9ede79ada766eec535e1230970bd885489d5990
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Mon Sep 27 20:52:43 2010 -0300
[media] add a driver for mb86a20s
This adds the trivial bits to mb86a20s. As the driver won't touch
at the channel/layer parameters, this may not be enough for
receiving all channels, especially ISDB-Tsb, but the driver worked
properly for receiving video channels on my tests.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ca3dfd6a6f8364c1d51e548adb4564702f1141e9
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Fri Sep 10 17:29:14 2010 -0300
[media] em28xx: Add support for Leadership ISDB-T
This device uses an em2874B + Sharp 921 One Seg frontend.
Signed-off-by: Douglas Schilling Landgraf <dougsland@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3a509bb11acded0dfebbfcc740d85e0774b0769a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Fri Sep 10 16:49:47 2010 -0300
[media] Re-write the s921 frontend
On our tests with Leadership ISDBT, the s921 frontend were not work. As its
design contained some weird things, it ended to be easier to just re-write
it, getting another frontend as an example (cx24123).
As the old s921 driver weren't used, there's no regression. Some info from
the old frontend were used as a way to double check the behavior that were
noticed on the USB dumps retrieved from Leadership driver.
Signed-off-by: Douglas Schilling Landgraf <dougsland@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 94a544a4e8d05a027613443c529c399c39cc3371
Merge: 496a2e360a34e1f41c336d23947f800216cb9bdf 21486af0f34d03b813b023d7a2b887b329f60486
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Wed Dec 29 01:05:14 2010 -0700
Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
* 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
spi/pxa2xx: register driver properly
spi/pxa2xx: add support for shared IRQ handler
spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
arm/pxa2xx: reorgazine SSP and SPI header files
spi/pxa2xx: Add CE4100 support
spi/pxa2xx: Consider CE4100's FIFO depth
spi/pxa2xx: Add chipselect support for Sodaville
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
spi/pxa2xx: pass of_node to spi device and set a parent device
commit 496a2e360a34e1f41c336d23947f800216cb9bdf
Merge: 5aa68b85951aec91d6a955d1de861325fc9a3ba1 23ce17adb7fc33a4353abe4b57a03f555cced57b
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Wed Dec 29 00:47:29 2010 -0700
Merge branch 'for-grant' of git://arago-project.org/git/projects/linux-davinci into spi/next
* 'for-grant' of git://arago-project.org/git/projects/linux-davinci into spi/next
spi: davinci: fix checkpatch errors
spi: davinci: whitespace cleanup
spi: davinci: remove unused variable 'pdata'
spi: davinci: set chip-select mode in SPIDEF only once
spi: davinci: enable both activation and deactivation of chip-selects
spi: davinci: remove unnecessary data transmit on CS disable
spi: davinci: enable GPIO lines to be used as chip selects
spi: davinci: simplify prescalar calculation
spi: davinci: remove 'wait_enable' platform data member
spi: davinci: make chip-slect specific parameters really chip-select specific
spi: davinci: consolidate setup of SPIFMTn in one function
spi: davinci: setup chip-select timers values only if timer enabled
spi: davinci: add support for wait enable timeouts
spi: davinci: remove unused members of davinci_spi_slave
spi: davinci: eliminate the single member structure davinci_spi_slave
spi: davinci: eliminate unnecessary update of davinci_spi->count
spi: davinci: simplify calculation of edma acount value
spi: davinci: check for NULL buffer pointer before using it
spi: davinci: remove unnecessary disable of SPI
spi: davinci: remove unnecessary 'count' variable in driver private data
spi: davinci: remove unnecessary completion variable initialization
spi: davinci: remove non-useful interrupt mode support
spi: davinci: simplify poll mode transfers
spi: davinci: add support for interrupt mode
spi: davinci: configure the invariable bits in spipc0 only once
spi: davinci: remove unnecessary function davinci_spi_bufs_prep()
spi: davinci: remove unnecessary call to davinci_spi_setup_transfer()
spi: davinci: do not store DMA channel information per chip select
spi: davinci: always start transmit DMA
spi: davinci: do not use temporary buffer if no transmit data provided
spi: davinci: always start receive DMA
spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot
spi: davinci: fix DMA event generation stoppage
spi: davinci: fix EDMA CC errors at end of transfers
spi: davinci: handle DMA completion errors correctly
spi: davinci: remove usage of additional completion variables for DMA
spi: davinci: let DMA operation be specified on per-device basis
spi: davinci: remove non-useful "clk_internal" platform data
spi: davinci: enable and power-up SPI only when required
spi: davinci: setup the driver owner
spi: davinci: add additional comments
spi: davinci: add EF Johnson Technologies copyright
spi: davinci: removed unused #defines
spi: davinci: remove unnecessary typecast
spi: davinci: do not treat Tx interrupt being set as error
spi: davinci: do not allocate DMA channels during SPI device setup
spi: davinci: remove unnecessary private data member 'region_size'
spi: davinci: shorten variable names
spi: davinci: kconfig: add manufacturer name to prompt string
commit 387c31c7e5c9805b0aef8833d1731a5fe7bdea14
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 28 17:05:48 2010 -0800
Linux 2.6.37-rc8
commit 6f7f41851cc4508b672ab71dd48a154712faf15c
Merge: 82cd19cd93727d494c530ddd6a7338033c3fd86e e1e359273576ee8fe27021356b064c772ed29af3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 28 15:54:24 2010 -0800
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page
commit 82cd19cd93727d494c530ddd6a7338033c3fd86e
Merge: b52e2a6d6d05421dea6b6a94582126af8cd5cca2 5cdd2de0a76d0ac47f107c8a7b32d75d25768dc1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 28 15:53:54 2010 -0800
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()
commit 776065e36de1d5eb9e33ff908352fef4050ab38d
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:38:03 2010 +0100
ASoC: codecs: wm8753: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm8753 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Furthermore the generic cache uses zero-based numbering while the wm8753 cache
uses one-based numbering.
Thus we end up with two from each other incoherent caches, which leads to undefined
behaviour and crashes.
This patch fixes the issue by changing the wm8753 driver to use the generic
register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit da280f51d0b341282b4181eb3235f774b0446584
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:38:02 2010 +0100
ASoC: codecs: wm9090: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm9090 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the wm9090 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit 7f87e30ef29951f4509a7f86acf00e1ba48af54a
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:38:01 2010 +0100
ASoC: codecs: wm8962: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm8962 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the wm8962 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit 715920d04c787ed718327da53cf51689e51ef3ce
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:38:00 2010 +0100
ASoC: codecs: wm8955: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm8955 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the wm8955 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit f578a188e8b21be623b48bb0eb3a92174c2e5b82
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:37:59 2010 +0100
ASoC: codecs: wm8904: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm8904 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the wm8904 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: Ian Lartey <ian@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit 52ca353bc8597dcc1d6d7abc03eecc1b452d79c9
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:37:58 2010 +0100
ASoC: codecs: wm8741: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm8741 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the wm8741 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: Ian Lartey <ian@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit beebca312009e9567d5e0229ea6b82bdf9a864cf
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:37:57 2010 +0100
ASoC: codecs: wm8523: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the wm8523 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the wm8523 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: Ian Lartey <ian@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit d24eb0db9c8a7ceecae860bdc636ed1e8a86943a
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:37:56 2010 +0100
ASoC: codecs: max98088: Fix register cache incoherency
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the max98088 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the max98088 driver to use the
generic register cache in its private functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: Peter Hsiang <Peter.Hsiang@xxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit 7f984b55acb6530bf854bfcac13104228f3336c1
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Tue Dec 28 21:08:57 2010 +0100
ASoC: codecs: Add missing control_type initialization
Some codec drivers do not initialize the control_type field in their private
device struct, but still use it when calling snd_soc_codec_set_cache_io.
This patch fixes the issue by properly initializing it in the drivers probe
functions.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx (for 2.6.37 only)
commit e7d282535c94cddc208c03b7cd0815f70d676a0e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 9 23:16:55 2010 -0800
[IA64] Remove unlikely from cpu_is_offline
cpu_is_offline already uses unlikely internally.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
commit 409e590572d980c314e989e94176bcb060130fae
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Mon Nov 22 10:41:19 2010 +0100
[IA64] irq_ia64, use set_irq_chip
Don't access desc->chip directly, because them chip member will
disappear some time later.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
commit e21763dbce76d3a07ead438f8811b3e4bce0825b
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sat Oct 30 21:35:58 2010 +0200
[IA64] perfmon: Change vmalloc to vzalloc and drop memset.
vzalloc() nicely zeroes memory for us, so we don't have to do a vmalloc()
and then manually memset() the returned memory when all we want is for it
to be zero. Patch changes this for pfm_rvmalloc().
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
commit 75c1c91cb92806f960fcd6e53d2a0c21f343081c
Author: Dimitri Sivanich <sivanich@xxxxxxx>
Date: Tue Dec 28 13:34:42 2010 -0600
[IA64] eliminate race condition in smp_flush_tlb_mm
A race condition exists within smp_call_function_many() when called from
smp_flush_tlb_mm(). On rare occasions the cpu_vm_mask can be cleared
while smp_call_function_many is executing, occasionally resulting in a
hung process.
Make a copy of the mask prior to calling smp_call_function_many().
Signed-off-by: Dimitri Sivanich <sivanich@xxxxxxx>
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
commit a7dd6027e55992dd7c409a71a4a2b576fda2f7c2
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Thu Dec 23 20:15:39 2010 +0000
vxge: remove duplicated part of check
This is just a cleanup to make the static checkers happy. We don't need
to check "own" twice.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4a5fc4e179d79c79ad87bfc12a2d7e9b2371e40c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Thu Dec 23 19:17:34 2010 +0000
skfp: testing the wrong variable in skfp_driver_init()
The intent here was to test if the allocation failed but we tested
"SharedMemSize" instead of "SharedMemAddr" by mistake.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Reviewed-by: Jiri Pirko <jpirko@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d39cd5e99a0ad88aba6793fb5e5f34e29cda6e6f
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Dec 20 17:58:33 2010 +0000
ppp: allow disabling multilink protocol ID compression
Linux would not connect to other router running old version Cisco IOS (12.0).
This is most likely a bug in that version of IOS, since it is fixed
in later versions. As a workaround this patch allows a module parameter
to be set to disable compressing the protocol ID.
See: https://bugzilla.vyatta.com/show_bug.cgi?id=3979
RFC 1990 allows an implementation to formulate MP fragments as if protocol
compression had been negotiated. This allows us to always send compressed
protocol IDs. But some implementations don't accept MP fragments with
compressed protocol IDs. This parameter allows us to interoperate with
them. The default value of the configurable parameter is the same as the
current behavior: protocol compression is enabled. If protocol compression
is disabled we will not send compressed protocol IDs.
This is based on an earlier patch by Bob Gilligan (using a sysctl).
Module parameter is writable to allow for enabling even if ppp
is already loaded for other uses.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c4711786986af0cce654f493426ee0a1055e4b17
Author: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:02:37 2010 +0000
ehea: Avoid changing vlan flags
This patch avoids disabling the vlan flags using ethtool.
Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 12f188f2e59394ec1f1c8c0a4439f48ec16bc336
Author: Dan Williams <dcbw@xxxxxxxxxx>
Date: Sun Dec 19 08:17:50 2010 +0000
ueagle-atm: fix PHY signal initialization race
A race exists when initializing ueagle-atm devices where the generic atm
device may not yet be created before the driver attempts to initialize
it's PHY signal state, which checks whether the atm device has been
created or not. This often causes the sysfs 'carrier' attribute to be
'1' even though no signal has actually been found.
uea_probe
usbatm_usb_probe
driver->bind (uea_bind)
uea_boot
kthread_run(uea_kthread) uea_kthread
usbatm_atm_init uea_start_reset
atm_dev_register UPDATE_ATM_SIGNAL
UPDATE_ATM_SIGNAL checks whether the ATM device has been created and if
not, will not update the PHY signal state. Because of the race that
does not always happen in time, and the PHY signal state remains
ATM_PHY_SIG_FOUND even though no signal exists.
To fix the race, just create the kthread during initialization, and only
after initialization is complete, start the thread that reboots the
device and initializes PHY state.
[ 3030.490931] uea_probe: calling usbatm_usb_probe
[ 3030.490946] ueagle-atm 8-2:1.0: usbatm_usb_probe: trying driver ueagle-atm with vendor=1110, product=9031, ifnum 0
[ 3030.493691] uea_bind: setting usbatm
[ 3030.496932] usb 8-2: [ueagle-atm] using iso mode
[ 3030.497283] ueagle-atm 8-2:1.0: usbatm_usb_probe: using 3021 byte buffer for rx channel 0xffff880125953508
<kthread already started before usbatm_usb_probe() has returned>
[ 3030.497292] usb 8-2: [ueagle-atm] (re)booting started
<UPDATE_ATM_SIGNAL checks whether ATM device has been created yet before setting PHY state>
[ 3030.497298] uea_start_reset: atm dev (null)
<and since it hasn't been created yet PHY state is not set>
[ 3030.497306] ueagle-atm 8-2:1.0: usbatm_usb_probe: using 3392 byte buffer for tx channel 0xffff8801259535b8
[ 3030.497374] usbatm_usb_probe: about to init
[ 3030.497379] usbatm_usb_probe: calling usbatm_atm_init
<atm device finally gets created>
[ 3030.497384] usbatm_atm_init: creating atm device!
Signed-off-by: Dan Williams <dcbw@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b52e2a6d6d05421dea6b6a94582126af8cd5cca2
Merge: bec41d5b8417ccb98e4752affa24e1dc563d99f9 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 28 11:23:50 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
commit bec41d5b8417ccb98e4752affa24e1dc563d99f9
Merge: 92a8cd42673f119896df7e964976c18952eb9970 24d8c0293b04ad207648bb2a0dbfebff8b47d166
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 28 11:23:30 2010 -0800
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] v4l: soc-camera: fix multiple simultaneous user case
commit 92a8cd42673f119896df7e964976c18952eb9970
Merge: 88a58101608f1416f4c1ec81d88faed258a34b3d 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 28 11:22:58 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: Fix re-probing with PM_POST_RESTORE notification
mmc: atmel-mci: fix multiblock SDIO transfers
mmc: at91_mci: fix multiblock SDIO transfers
commit 88a58101608f1416f4c1ec81d88faed258a34b3d
Author: Imre Kaloz <kaloz@xxxxxxxxxxx>
Date: Mon Dec 27 22:59:57 2010 +0100
ARM: fix IXP4xx build failure
arm: export dma_set_coherent_mask
While a regression was fixed with commit 710224fa2750cf (arm: fix
"arm: fix pci_set_consistent_dma_mask for dmabounce devices"), a
new one was introduced as dma_set_coherent_mask wasn't exported
for modules. This patch takes care for this issue.
Signed-off-by: Imre Kaloz <kaloz@xxxxxxxxxxx>
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 1873bb8115e678ad9fd0aac9dbbc68383bc36e06
Author: Ahmed S. Darwish <darwish.07@xxxxxxxxx>
Date: Sat Dec 25 11:57:09 2010 +0200
RAMOOPS: Don't overflow over non-allocated regions
The current code mis-calculates the ramoops header size, leading to an
overflow over the next record at best, or over a non-allocated region at
worst. Fix that calculation.
Signed-off-by: Ahmed S. Darwish <darwish.07@xxxxxxxxx>
Acked-by: Marco Stornelli <marco.stornelli@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 202b6ca149dc90d3d81772413e1e1c0b65e83012
Author: Ping Cheng <pinglinux@xxxxxxxxx>
Date: Fri Dec 24 13:13:25 2010 -0800
Input: wacom_w8001 - use __set_bit to set keybits
This makes code safer and easier to read.
Signed-off-by: Ping Cheng <pingc@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 5c461b913a16aed8afa285a1d00414791a9afe33
Merge: ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Mon Dec 27 17:33:20 2010 -0800
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
commit ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219
Author: David Sterba <dsterba@xxxxxxx>
Date: Mon Dec 27 17:20:01 2010 -0800
Input: bu21013_ts - fix misuse of logical operation in place of bitop
Signed-off-by: David Sterba <dsterba@xxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit a06a09c802c869426cfe8c405c381c985c3b25b2
Author: Pali Rohár <pali.rohar@xxxxxxxxx>
Date: Mon Dec 27 17:21:45 2010 -0800
Input: i8042 - add Acer Aspire 5100 to the Dritek list
This patch adds notebook Acer Aspire 5100 to the list of Dritek HW. Acer
Aspire 5100 needs Dritek keyboard extension to support all Fn keys.
Signed-off-by: Pali Rohár <pali.rohar@xxxxxxxxx>
Tested-by: Pali Rohár <pali.rohar@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 731ece41fb1047816303295a0cdfed90a528137e
Author: Olof Johansson <olof@xxxxxxxxx>
Date: Fri Dec 10 02:09:23 2010 -0600
modpost: Fix address calculation in reloc_location()
This patch fixes a segfault in modpost that is observed when the gold
linker is used to link the input objects.
The problem is that reloc_location (modpost.c) is computing the
address of the relocation target incorrectly. Here, elf->hdr points
to the beginning of the ELF file in memory, sechdr points to the
relocation section header, section is the index of the section
being relocated, and sechdrs[section].sh_offset would be the offset
of that section, relative to the beginning of the ELF file. Adding
elf->hdr + sechdrs[section].sh_offset gives you the address of the
beginning of the section, and adding r->r_offset to that gives you the
address of the location to be relocated. You do not need to subtract
sechdrs[section].sh_addr from that -- the result of this is an address
outside the file, and causes the segfault when addend_386_rel tries to
dereference it.
This bug is not observed when GNU ld is used to link the inputs. The
object file ubuntu/omnibook/omnibook.o is the result of an ld -r of
several other files. When GNU ld does an ld -r, it sets the vaddr
field for each section to 0, but gold lays out the section addresses
sequentially instead:
Section Headers:
[Nr] Name Type Addr Off Size ES Flg Lk Inf Al
[ 0] NULL 00000000 000000 000000 00 0 0 0
[ 1] .text PROGBITS 00000000 000034 004794 00 AX 0 0 4
[ 2] .data PROGBITS 0000b9d0 0047c8 0009c0 00 WA 0 0 4
[ 3] .bss NOBITS 000162f8 005188 00013c 00 WA 0 0 4
[ 4] .rodata.str1.1 PROGBITS 00004f2d 0052c4 001b1a 01 AMS 0 0 1
[ 5] .init.text PROGBITS 00004794 006dde 0005fa 00 AX 0 0 1
[ 6] .exit.text PROGBITS 00004d8e 0073d8 00018a 00 AX 0 0 1
...
So the bug in the tool remained undiscovered because the section's vaddr
always happened to be 0.
Signed-off-by: Raymes Khoury <raymes@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit c8217b8305e5e75c23617f2f4cd262527d952c0a
Author: Cliff Wickman <cpw@xxxxxxx>
Date: Mon Dec 13 10:51:57 2010 -0600
x86, paravirt: Use native_halt on a halt, not native_safe_halt
halt() should use native_halt()
safe_halt() uses native_safe_halt()
If CONFIG_PARAVIRT=y, halt() is defined in arch/x86/include/asm/paravirt.h as
static inline void halt(void)
{
PVOP_VCALL0(pv_irq_ops.safe_halt);
}
Otherwise (no CONFIG_PARAVIRT) halt() in arch/x86/include/asm/irqflags.h is
static inline void halt(void)
{
native_halt();
}
So it looks to me like the CONFIG_PARAVIRT case of using native_safe_halt()
for a halt() is an oversight.
Am I missing something?
It probably hasn't shown up as a problem because the local apic is disabled
on a shutdown or restart. But if we disable interrupts and call halt()
we shouldn't expect that the halt() will re-enable interrupts.
Signed-off-by: Cliff Wickman <cpw@xxxxxxx>
LKML-Reference: <E1PSBcz-0001g1-FM@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 32ae2ade462146729580117d9886cc9efd83dfbe
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Thu Dec 23 16:04:23 2010 +0100
perf probe: Fix short file name probe location reporting
After adding probes, perf-probe(1) reports the probes locations which include
filenames for certain cases.
But for short file names (whose length < 32), perf-probe didn't display the
name correctly. It actually skipped the first character.
Here's an example where 'icmp.c' was screwed:
$ perf probe -n -a "icmp.c;sk=*"
Add new events:
probe:icmp_push_reply (on @cmp.c)
probe:icmp_reply (on @cmp.c)
probe:icmp_reply_1 (on @cmp.c)
probe:icmp_send (on @cmp.c)
probe:icmp_send_1 (on @cmp.c)
probe:icmp_error (on @cmp.c)
probe:icmp_error_1 (on @cmp.c)
probe:icmp_error_2 (on @cmp.c)
probe:icmp_error_3 (on @cmp.c)
This patch fixes this bug in synthesize_perf_probe_point().
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <m31v588r9k.fsf@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 0597fcd08b858df83b9f20afd6035311d92c48f8
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Thu Dec 23 03:25:16 2010 -0500
kconfig: fix warning
In file included from scripts/kconfig/zconf.tab.c:2502:
scripts/kconfig/expr.c:1033: warning: no previous prototype for 'expr_simplify_unmet_dep'
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit ffc96d628b651b69b39909fc3e9e8f465df1eed3
Merge: c816d7c64e82cae69fa5c7365474d37444a97ccf 29c185e5c681ca00d863d161eda7eadb93e32ee5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 27 10:36:27 2010 -0800
Merge branch 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6
* 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6:
nommu: Provide stubbed alloc/free_vm_area() implementation.
nommu: Fix up vmalloc_node() symbol export regression.
commit c816d7c64e82cae69fa5c7365474d37444a97ccf
Merge: b094a870ae33426442b0cbcf8025f1ef919d1def 30f2ba38011247ad95bffbf0743a0dc0656a5eb7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 27 10:34:09 2010 -0800
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: intc: Initialize radix tree gfp mask explicitly.
sh: Fix up SH7201 clkfwk build.
sh: mach-se: Fix up SE7206 build.
sh: Fix up SH4-202 clkfwk build.
commit b094a870ae33426442b0cbcf8025f1ef919d1def
Merge: 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094 cb59bfc59024115279de0d7612558caa72ec95f1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 27 10:33:30 2010 -0800
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
video: imxfb: Fix the maximum value for yres
fb: fix overlapping test off-by-one.
fbdev: sh-mobile: retrieve and propagate display sizes from EDID
fbdev: sh-mobile: restore display size configuration
commit 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094
Merge: bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad ff5dd32b997a5a5ce3f4256257991133d694da0b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 27 10:25:02 2010 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_cs5536: avoid implicit MSR API inclusion on x86-64
commit 86280a208825d55ba988420b6b0ed2d6b9ec80f8
Author: David Sterba <dsterba@xxxxxxx>
Date: Mon Dec 27 16:27:43 2010 +0100
HID: picolcd: fix misuse of logical operation in place of bitop
CC: Bruno Prémont <bonbons@xxxxxxxxxxxxxxxxx>
CC: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit cb59bfc59024115279de0d7612558caa72ec95f1
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Nov 4 11:06:06 2010 +0000
fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
LCDC hardware can support 1920x1080 formats, adjust the driver to cover them.
Besides, instead of guessing some "reasonable" validity checks, only verify
values in .fb_check_var(), that we are sure, we cannot support.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 60328917e6019c7f8a2e70c08d433a05ba9fcfb7
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Fri Dec 24 10:28:24 2010 -0200
video: imxfb: Fix the maximum value for yres
MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register.
Fix the maximum value for yres.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5cdd2de0a76d0ac47f107c8a7b32d75d25768dc1
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sat Dec 25 19:57:41 2010 +0100
x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()
In arch/x86/kernel/microcode_intel.c::generic_load_microcode()
we have this:
while (leftover) {
...
if (get_ucode_data(mc, ucode_ptr, mc_size) ||
microcode_sanity_check(mc) < 0) {
vfree(mc);
break;
}
...
}
if (mc)
vfree(mc);
This will cause a double free of 'mc'. This patch fixes that by
just removing the vfree() call in the loop since 'mc' will be
freed nicely just after we break out of the loop.
There's also a second change in the patch. I noticed a lot of
checks for pointers being NULL before passing them to vfree().
That's completely redundant since vfree() deals gracefully with
being passed a NULL pointer. Removing the redundant checks
yields a nice size decrease for the object file.
Size before the patch:
text data bss dec hex filename
4578 240 1032 5850 16da arch/x86/kernel/microcode_intel.o
Size after the patch:
text data bss dec hex filename
4489 240 984 5713 1651 arch/x86/kernel/microcode_intel.o
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: Tigran Aivazian <tigran@xxxxxxxxxxxxxxxxxxxx>
Cc: Shaohua Li <shaohua.li@xxxxxxxxx>
LKML-Reference: <alpine.LNX.2.00.1012251946100.10759@xxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 17f7f4d9fcce8f1b75b5f735569309dee7665968
Merge: 041110a439e21cd40709ead4ffbfa8034619ad77 d7c1255a3a21e98bdc64df8ccf005a174d7e6289
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 26 22:37:05 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
commit ff5dd32b997a5a5ce3f4256257991133d694da0b
Author: Jeff Garzik <jeff@xxxxxxxxxx>
Date: Sun Dec 26 19:42:15 2010 -0500
pata_cs5536: avoid implicit MSR API inclusion on x86-64
We don't need or want MSR usage here, on x86-64.
x86-64 was disabled intentionally in Kconfig, but commit
9272dcc232b84ccb027d6861077934055d42764d changed that.
drivers/ata/pata_cs5536.c:47:1: warning: "rdmsr" redefined
In file included from arch/x86/include/asm/irqflags.h:60,
from include/linux/irqflags.h:15,
from arch/x86/include/asm/system.h:11,
from arch/x86/include/asm/processor.h:17,
from include/linux/prefetch.h:14,
from include/linux/list.h:7,
from include/linux/module.h:9,
from drivers/ata/pata_cs5536.c:33:
arch/x86/include/asm/paravirt.h:146:1: warning: this is the location of the previous definition
drivers/ata/pata_cs5536.c:48:1: warning: "wrmsr" redefined
arch/x86/include/asm/paravirt.h:154:1: warning: this is the location of the previous definition
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad
Merge: d7c1255a3a21e98bdc64df8ccf005a174d7e6289 5acdb1af907d5908b4942d425c0983f353dd8fc5 cde44d1740bcb3dcfecbf792a71826431e61686e
Author: Len Brown <len.brown@xxxxxxxxx>
Date: Sun Dec 26 17:05:07 2010 -0500
Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release
commit 5acdb1af907d5908b4942d425c0983f353dd8fc5
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sun Dec 26 12:47:06 2010 +0100
ACPI / ACPICA: Disable GPEs during initialization
GPEs with corresponding _Lxx/_Exx control methods need to be disabled
during initialization in case they have been enabled by the BIOS, so
that they don't fire up until they are enabled by acpi_update_gpes().
References: https://bugzilla.kernel.org/show_bug.cgi?id=25412
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit d7c1255a3a21e98bdc64df8ccf005a174d7e6289
Merge: d3c7e1ab043abd7706db4fbccf327df9e62f7990 fc75fc8339e7727167443469027540b283daac71
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 26 12:06:56 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
ipv4: dont create routes on down devices
epic100: hamachi: yellowfin: Fix skb allocation size
sundance: Fix oopses with corrupted skb_shared_info
Revert "ipv4: Allow configuring subnets as local addresses"
USB: mcs7830: return negative if auto negotiate fails
irda: prevent integer underflow in IRLMP_ENUMDEVICES
tcp: fix listening_get_next()
atl1c: Do not use legacy PCI power management
mac80211: fix mesh forwarding
MAINTAINERS: email address change
net: Fix range checks in tcf_valid_offset().
net_sched: sch_sfq: fix allot handling
hostap: remove netif_stop_queue from init
mac80211/rt2x00: add ieee80211_tx_status_ni()
typhoon: memory corruption in typhoon_get_drvinfo()
net: Add USB PID for new MOSCHIP USB ethernet controller MCS7832 variant
net_sched: always clone skbs
ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.
netlink: fix gcc -Wconversion compilation warning
asix: add USB ID for Logitec LAN-GTJ U2A
...
commit 003ea98195eebdfcf476317b517e8c29a25b9d10
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Dec 15 08:06:23 2010 -0800
iwlwifi: remove reference to Gen2
The correct name should be used for the newer devices, remove
reference to Gen2
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit bdb84fec61aab7047b1b108b6b6824c003bc4d11
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 15 06:07:56 2010 -0800
iwlagn: fix FH error
# iw wlan0 interface add moni0 type monitor flags control
# ip link set moni0 up
causes a continuous spew of FH_ERROR from the
device. Fix this by not setting the CTL2HOST
filter by itself -- CTL + promisc works fine.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit e88735d711948a580741fd337afd4ec11c395174
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Sat Dec 11 08:46:56 2010 -0800
iwlwifi: remove extra string
For "led_mode" module parameters, string "led_mode" is duplicated twice,
remove one.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit fc75fc8339e7727167443469027540b283daac71
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 22 04:39:39 2010 +0000
ipv4: dont create routes on down devices
In ip_route_output_slow(), instead of allowing a route to be created on
a not UPed device, report -ENETUNREACH immediately.
# ip tunnel add mode ipip remote 10.16.0.164 local
10.16.0.72 dev eth0
# (Note : tunl1 is down)
# ping -I tunl1 10.1.2.3
PING 10.1.2.3 (10.1.2.3) from 192.168.18.5 tunl1: 56(84) bytes of data.
(nothing)
# ./a.out tunl1
# ip tunnel del tunl1
Message from syslogd@shelby at Dec 22 10:12:08 ...
kernel: unregister_netdevice: waiting for tunl1 to become free.
Usage count = 3
After patch:
# ping -I tunl1 10.1.2.3
connect: Network is unreachable
Reported-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Reviewed-by: Octavian Purdila <opurdila@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7a36df8a857edee8cd8967cbe99a85574d22f482
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Sat Dec 25 07:39:59 2010 +0000
epic100: hamachi: yellowfin: Fix skb allocation size
Joel Soete reported oopses during pppoe over sundance NIC, caused by
a bug in skb allocation and dma mapping code, where skb_reserve()
bytes weren't taken into account. As a followup to the patch:
"sundance: Fix oopses with corrupted skb_shared_info" very similar
code is fixed here for three other drivers.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Cc: Joel Soete <soete.joel@xxxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 78a36f25478432835f2f1e46202b71ff3ae454ff
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Sat Dec 25 05:12:17 2010 +0000
sundance: Fix oopses with corrupted skb_shared_info
Joel Soete reported oopses at the beginning of pppoe connections since
v2.6.35. After debugging the bug was found in sundance skb allocation
and dma mapping code, where skb_reserve() bytes aren't taken into
account. This is an old bug, only uncovered by some change in 2.6.35.
Initial debugging patch by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Reported-by: Joel Soete <soete.joel@xxxxxxxxxx>
Tested-by: Joel Soete <soete.joel@xxxxxxxxxx>
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 041110a439e21cd40709ead4ffbfa8034619ad77
Merge: a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f 2316aa2aee254c126e688b53a3a105b82bc3f368
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sat Dec 25 19:20:38 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
commit a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:10 2010 +0000
bna: Update the driver version to 2.3.2.3
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d32f7696286eef9e5644eb57e79a36756274357
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:09 2010 +0000
bna: IOC failure auto recovery fix
Change Details:
- Made IOC auto_recovery synchronized and not timer based.
- Only one PCI function will attempt to recover and reinitialize
the ASIC on a failure, that too after all the active PCI
functions acknowledge the IOC failure.
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aad75b66f1d3784514351f06bc589c55d5325bc8
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:08 2010 +0000
bna: Restore VLAN filter table
Change Details:
- Retrieve the VLAN configuration from the networking stack
and apply it to the base interface during ifconfig up
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ce9b9f383775e6de74ca4c93d5c643dc3d76dd3c
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:07 2010 +0000
bna: Removed unused code
Change Details:
- Remove unused APIs and code cleanup
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2c7d38210ff8e65f8961699bce92c273c77d113c
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:06 2010 +0000
bna: IOC uninit check and misc cleanup
Change Details:
- Added a check in ioc firmware lock function to see if IOC is
in BFI_IOC_UNINIT state or not. If it is not in UNINIT state
and the last IOC boot was not done by OS driver, force IOC state
to BFI_IOC_UNINIT
- Unused macro and API cleanup
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f7c0fa4cd5dcf58dd95b216d2c33444a3b4a44e0
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:05 2010 +0000
bna: Fix for TX queue
Change Details:
- Call netif_wake_queue() if we have freed up sufficient elements
at the end of completion processing
- Add netif_queue_stopped counter back to bnad_drv_stats {}
- Get netif_queue_stopped value from stack
- Remove BUG_ON() on value returned by pci_unmap_addr()
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 886f7fedb0cee56acca7620d89186669273d3d56
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:04 2010 +0000
bna: Enable pure priority tagged packet reception and rxf uninit cleanup fix
Change Details:
- Enable reception of pure priority tagged packets by default by
turning on VLAN Id = 0
- Clear the promiscuous mode, all multicast mode flags when
bna_rxf_uninit is called
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 815f41e74031d6dc6d6dd988f58c03a1d72d02b9
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:03 2010 +0000
bna: Fix ethtool register dump and reordered an API
Change Details:
- Removed semaphore register dump from ethtool
- Moved netif_carrier_off() call to before calling bna_init()
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0613ecfc94b13e86c9ff1252fd63e35a94475cd6
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:02 2010 +0000
bna: Port enable disable sync and txq priority fix
Change Details:
- Fixed port enable/disable sync through a change in LL port state
machine
- Change txq->priority masking to 0x7 (3 bits) from 0x3 (2 bits)
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit be7fa3263a15d3f278c3bfbf606ec169aaa3a920
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date: Thu Dec 23 21:45:01 2010 +0000
bna: TxRx and datapath fix
Change Details:
- Check HW ready condition before accessing h/w register in data-path
- Postpone clean-up of data buffers to the data-path restart path and
wait in the cleanup routines for in-flight DMA to complete
- Separate out Tx completion processing from Rx poll routine
Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 24d8c0293b04ad207648bb2a0dbfebff8b47d166
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Sat Dec 25 18:29:52 2010 -0300
[media] v4l: soc-camera: fix multiple simultaneous user case
A recent patch has introduced a regression, whereby a second open of an
soc-camera video device breaks the running capture. This patch fixes this bug
by guaranteeing, that video buffers get initialised only during the first open
of the device node.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ce0ac9e1851364fa67c991659ce1db05ab82c6ae
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Sat Dec 25 18:33:12 2010 -0200
perf script: Fix event ordering settings to work with older kernels
If we don't use .ordering_requires_timestamps we'll end up trying to order
events with no timestamps when running on older kernels.
Problem introduced in eac23d1c.
After the last three fixes, perf scripting is back working, tested with
new perf userspace on old and new (with sample_id_all) kernels.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
Cc: Torok Edwin <edwintorok@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 3ae22e8c8ac39daf88ae32f047fb23825be7c646
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 25 15:32:27 2010 +0100
spi / PM: Support dev_pm_ops
Allow SPI drivers to use runtime PM and other dev_pm_ops features by
implementing dev_pm_ops for the bus. The existing bus specific suspend
and resume functions will be called if a driver does not provide dev_pm_ops
allowing for transition to the new model.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit a43d3f08c64125edbdfdc3d3aa512d3e37321f37
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Sat Dec 25 12:12:25 2010 -0200
perf record: Fix use of sample_id_all userspace with !sample_id_all kernels
Check if parse_single_tracepoint_event has already asked for PERF_SAMPLE_TIME.
This is kludgy but short term fix for problems introduced by eac23d1c that
broke 'perf script' by having different sample_types when using multiple
tracepoint events when we use a perf binary that tries to use sample_id_all on
an older kernel.
We need to move counter creation to perf_session, support different
sample_types, etc.
Ongoing work on the perf test infrastructure needs this so that we can create
counters to monitor threads generating specific events, etc.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
Cc: Torok Edwin <edwintorok@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 765532c8aaac624b5f8687af6d319c6a1138a257
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Thu Dec 23 13:10:22 2010 -0200
perf script: Finish the rename from trace to script
The scripts have calls to 'perf trace' that need to be converted to 'perf script', do it.
This problem was introduced in 133dc4c.
Reported-by: Torok Edwin <edwintorok@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
Cc: Torok Edwin <edwintorok@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 2316aa2aee254c126e688b53a3a105b82bc3f368
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Thu Dec 2 07:12:26 2010 +0000
ixgbevf: Add X540 VF device support to the ixgbevf driver
The X540 introduces a new Virtual Function device ID so that the X540
VF device can be distinguished from the 82599 VF device. The X540 VF
device will have additional capability over the 82599 VF device so it
is necessary to be able to discern the difference.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit a985b6c31ff230a1246d921afbfc0f6a1386be83
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Thu Nov 18 03:02:52 2010 +0000
ixgbe: Add anti-spoofing feature support
Add support for the anti-spoofing feature in the HW. Packets from
VF devices with spoofed MAC addresses or VLAN tags will be blocked
and a counter incremented. During the watchdog timer the spoofed
packet dropped counter is read and if it is non-zero then a warning
message is displayed on the host VMM's console.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 3377eba79e15671799876f82d30446e656aac5ad
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Tue Dec 7 08:16:45 2010 +0000
ixgbe: Add SR-IOV feature support to X540
Add X540 specific feature support to X540
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit d3306c2974481ff9c539de22a37bb667e8694be2
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Thu Nov 18 03:03:23 2010 +0000
ixgbe: Warn on VF attempt to override Administratively set MAC/VLAN
Print warnings to the system log when the VF attempts to override
MAC/VLAN settings that were configured by the VMM Host administrator
using the ip link set commands.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 031d7952ee63e1aa679f7e87700e3281f4de4ba2
Author: Williams, Mitch A <mitch.a.williams@xxxxxxxxx>
Date: Thu Dec 9 03:23:56 2010 +0000
igbvf: add support for i350 VF device
Add support to igbvf for the new i350 virtual function device.
Signed-off-by: Mitch Williams <mitch.a.williams@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 0e512bfc2c0cd6072387092f8d1ac8e1a758965b
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Thu Nov 18 03:12:30 2010 +0000
igbvf: force link checking when mailbox timeout has occurred
This change forces the link down when a mailbox timeout has occurred.
Previously it was possible for a mailbox timeout to occur but for the
interface to stay up. The problem with this was that it became possible
for an interface to stay up and miss multiple requests resulting in a
possible issue since the interface will be running in an unknown state.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 13800469d40bf4dc9fbed17f4692b2ebe94d4526
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Sat Nov 6 02:08:26 2010 +0000
igb: Add Anti-spoofing feature support
Add support for the anti-spoofing feature in the HW. Packets from
VF devices with spoofed MAC addresses or VLAN tags will be blocked
and an event generated. When the watchdog task runs it will call a
function to check if any spoof events occurred. If an event was
detected then a warning message is dumped to the system log.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 1b5dda331ff8646a70d247cace45a60035937a9b
Author: Gasparakis, Joseph <joseph.gasparakis@xxxxxxxxx>
Date: Thu Dec 9 01:41:01 2010 +0000
igb: Some fine tuning
This patch does the following:
1. Changes the existing supported device id's so now DH89xxCC is not supported when EEPROM is not read.
2. Adds two more device ids for DH89xxCC in backplane mode and SFP.
3. Driver now initializes previously possibly uninitialized value in igb_reset_mdicnfg_82580().
Signed-off-by: Joseph Gasparakis <joseph.gasparakis@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit a6b5ea353845b3f3d9ac4317c0b3be9cc37c259b
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Sat Nov 6 05:42:59 2010 +0000
igb: Warn on attempt to override administratively set MAC/VLAN
Print a warning message to the system log when the VF attempts to
override administratively set MAC/VLAN configuration.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 8fa7e0f739b70db14e788efba4960bfc1873d550
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Sat Nov 6 05:43:21 2010 +0000
igb: Fix overwrite of the VF's flags
The vf flags were being overwritten causing the flag that indicates
that the PF has set the VF MAC address to get cleared. This would
allow the VF to override the MAC address assigned by the Host VMM
using the ip link set command.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit b1cdfead0e532d7614b5d5b97044df94cc8945ae
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Sat Dec 11 05:53:47 2010 +0000
e1000e: checkpatch warnings - braces
WARNING: braces {} are not necessary for any arm of this statement
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 6480641eb741cabbba8e196d4f17db7fb80d101c
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Sat Dec 11 05:53:42 2010 +0000
e1000e: checkpatch error - open braces
ERROR: that open brace { should be on the previous line
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 184125a389cf2c81980de5d5f365c786cc76d229
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Sat Dec 11 05:53:37 2010 +0000
e1000e: checkpatch error - trailing statements
ERROR: trailing statements should be on next line
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit f0f1a172b2a9e26319b9aa95fa6c322ebb01089d
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Sat Dec 11 05:53:32 2010 +0000
e1000e: checkpatch error - macro panethesis
ERROR: Macros with complex values should be enclosed in parenthesis
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 68f20d948c86bd6bbc075052f6b6c45b8f56957e
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Fri Dec 17 12:14:34 2010 +0000
Documentation/networking: Update Intel Wired LAN docs
- Update the Intel Wired LAN documentation with the latest
URL for ethtool.
- replace "Ethtool" with "ethtool"
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
commit cde44d1740bcb3dcfecbf792a71826431e61686e
Author: Len Brown <len.brown@xxxxxxxxx>
Date: Fri Dec 24 21:43:16 2010 -0500
Revert "ACPI battery: update status upon sysfs query"
This reverts commit 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b.
as it caused a crash upon battery removal:
https://bugzilla.kernel.org/show_bug.cgi?id=25302
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit d3c7e1ab043abd7706db4fbccf327df9e62f7990
Merge: dfe80f63293ece364795c2e87805882c9ec3a266 4bdac7da5237170b1392f39ebee99d235043fad8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 24 13:00:37 2010 -0800
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
spi/mpc52xx-spi: fix annotation for remove()-pointer
spi/fsl_espi: fix wrong setting of the address in the command buffer
spi/fsl_espi: change the read behaviour of the SPIRF
of/i2c: Fix request module by alias
powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
commit dfe80f63293ece364795c2e87805882c9ec3a266
Merge: a4790c9457ae973d598bbd5ce58f9eaa2dd1576b e5005b15c91f3362036067bde5210d5c78af2f0d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 24 13:00:16 2010 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: issue DIPM enable commands with LPM state updated
libata: no special completion processing for EH commands
pata_mpc52xx: driver needs BMDMA
pata_cs5536: Add support for non-X86_32 platforms
libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()
commit a4790c9457ae973d598bbd5ce58f9eaa2dd1576b
Merge: 08da5a32b7789289f48f3037b64df2945b5dafc2 bcbea798f8f1492052c23ceb4fbc2a96013a3865
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 24 12:59:09 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: print out alloc information with KERN_DEBUG instead of KERN_INFO
kthread_work: make lockdep happy
commit 08da5a32b7789289f48f3037b64df2945b5dafc2
Merge: eda4b716ea1f2a647a39cebae66b3fae4c4b80e4 29687512c0b084957112cc2c0743ce34cd0d5055
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 24 12:58:43 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] fix up documentation for change in ->queuecommand to lockless calling
[SCSI] bfa: rename log_level to bfa_log_level
commit e5005b15c91f3362036067bde5210d5c78af2f0d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Thu Dec 9 16:13:15 2010 +0100
libata: issue DIPM enable commands with LPM state updated
Low level drivers may behave differently depending on the current
link->lpm_policy. During ata_eh_set_lpm(), DIPM enable commands are
issued after the successful completion of ap->ops->set_lpm(), which
means that the controller is already in the target state. This causes
DIPM enable commands to be processed with mismatching controller power
state and link->lpm_policy value.
In ahci, link->lpm_policy is used to ignore certain PHY events if LPM
is enabled; however, as DIPM commands are issued with stale
link->lpm_policy, they sometimes end up triggering these conditions
and get aborted leading to LPM configuration failure.
Fix it by updating link->lpm_policy before issuing DIPM enable
commands.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit f08dc1ac6b15c681f4643d8da1700e06c3855608
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Thu Dec 9 15:59:32 2010 +0100
libata: no special completion processing for EH commands
ata_qc_complete() contains special handling for certain commands. For
example, it schedules EH for device revalidation after certain
configurations are changed. These shouldn't be applied to EH
commands but they were.
In most cases, it doesn't cause an actual problem because EH doesn't
issue any command which would trigger special handling; however, ACPI
can issue such commands via _GTF which can cause weird interactions.
Restructure ata_qc_complete() such that EH commands are always passed
on to __ata_qc_complete().
stable: Please apply to -stable only after 2.6.38 is released.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 869934adfc8391ec2e198ed81260e1a42cd9c575
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Dec 22 16:50:10 2010 +0100
pata_mpc52xx: driver needs BMDMA
Found by this build-error if BMDMA is disabled:
drivers/ata/pata_mpc52xx.c: In function 'mpc52xx_ata_init_one':
drivers/ata/pata_mpc52xx.c:662: error: 'ata_bmdma_interrupt' undeclared (first use in this function)
...
Move the Kconfig entry to the proper location as needed since
9a7780c9acb821fe1c2b6fc53f74cc2556ff5364 (libata-sff: make BMDMA optional)
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 9272dcc232b84ccb027d6861077934055d42764d
Author: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Date: Fri Dec 24 21:39:08 2010 +0800
pata_cs5536: Add support for non-X86_32 platforms
pata_cs5536 does work on the other platforms(e.g. Loongson, a MIPS
variant), so, remove the dependency of X86_32 and fix the building
errors under the other platforms via only reserving the X86_32 specific
parts for X86_32.
pata_amd also supports cs5536 IDE controller, but this one saves about
33k for the compressed kernel image(vmlinuz for MIPS).
Signed-off-by: Zhang Le <r0bertz@xxxxxxxxxx>
Signed-off-by: Chen Jie <chenj@xxxxxxxxxx>
Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 687a993339c4f3a63654746230da3aab8bbdbffd
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 3 15:19:13 2010 +0100
libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()
While separating out BMDMA irq handler from SFF, commit c3b28894
(libata-sff: separate out BMDMA irq handler) incorrectly made
__ata_sff_port_intr() consider an IRQ to be an idle one if the host
state was transitioned to HSM_ST_ERR by ata_bmdma_port_intr().
This makes BMDMA drivers ignore IRQs reporting host bus error which
leads to timeouts instead of triggering EH immediately. Fix it by
making __ata_sff_port_intr() consider the IRQ to be an idle one iff
the state is HSM_ST_IDLE. This is equivalent to adding HSM_ST_ERR to
the "break"ing case but less error-prone.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-by: Antonio Toma <antonio.toma@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
commit 5aa68b85951aec91d6a955d1de861325fc9a3ba1
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Fri Dec 17 15:44:00 2010 +0100
spi/mpc52xx-psc-spi: move probe/remove to proper sections
Probe/remove should be in __devinit/__devexit. Found by a section-mismatch
warning. Also, copy do_remove() over to remove().
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit dc69d1af9e8d9cbbabff88bb35a6782187a22229
Author: Ben Gamari <bgamari.foss@xxxxxxxxx>
Date: Fri Dec 24 02:48:09 2010 +0000
omap2: Make OMAP2PLUS select OMAP_DM_TIMER
It appears that arch/arm/mach-omap2/timer-gp.o is needed by OMAP2PLUS.
Since timer-gp.o has direct dependencies on omap_dm_timer_*, it seems
correct for the architecture to depend upon OMAP_DM_TIMER, otherwise
unsuspecting integrators will be faced with a whole bunch of linker
errors at the end of their kernel build:
arch/arm/mach-omap2/built-in.o: In function `omap2_gp_timer_set_mode':
/home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:84: undefined reference to `omap_dm_timer_stop'
/home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:88: undefined reference to `omap_dm_timer_get_fclk'
/home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:90: undefined reference to `omap_dm_timer_set_load_start'
...
Signed-off-by: Ben Gamari <bgamari.foss@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit fe13471c4b546e07ddbaf5fb2209b50c14b99b20
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Thu Dec 23 22:30:32 2010 +0000
OMAP4: hwmod data: Fix alignment and end of line in structurefields
In order to be fully aligned with the Python generator output,
change a couple of fields.
- Add tab in class structures to align attributes
- Add a comma at the end of the following line to simplify
the generation by having always the same eol:
".pre_shutdown = &omap2_wd_timer_disable,"
- Add a blank line before the first entry of the
omap44xx_hwmods array.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit d7cf5f33fc68573d7bb9d4fc244ea1a3ed0b011b
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Thu Dec 23 22:30:31 2010 +0000
OMAP4: hwmod data: Move the DMA structures
The merge of the DMA series on top of the already modified
omap_hwmod_data_44xx.c put the dma_system structures at
the wrong position in the file.
Re-order it properly.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 1f6a717f1c000bb6184fe09c5ae99bad5965cadf
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Thu Dec 23 22:30:30 2010 +0000
OMAP4: hwmod data: Move the smartreflex structures
The merge of the SR series on top of the already modified
omap_hwmod_data_44xx.c moved the smartreflex structures at the wrong
position in the file.
- Re-order the structures properly.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Thara Gopinath <thara@xxxxxx>
Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 4d218826ad9ba5ab0b2d7e0a2b14f2a1e48a5e0b
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Thu Dec 23 22:30:29 2010 +0000
OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
Add the missing SIDLE_SMART_WKUP flag in idlemodes field of
the smartreflex sysconfig structure.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Thara Gopinath <thara@xxxxxx>
Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:14:20 2010 +0100
usb: don't use flush_scheduled_work()
flush_scheduled_work() is being deprecated. Directly flush or cancel
work items instead.
* u_ether, isp1301_omap, speedtch conversions are straight-forward.
* ochi-hcd should only flush when quirk_nec() is true as otherwise the
work wouldn't have been initialized.
* In oti6858, cancel_delayed_work() + flush_scheduled_work() ->
cancel_delayed_work_sync().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: Duncan Sands <duncan.sands@xxxxxxx>
Cc: linux-usb@xxxxxxxxxxxxxxx
commit 37c95bfe944babae817bfcf02c996729c9a3335d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:14:20 2010 +0100
speedtch: don't abuse struct delayed_work
speedtch directly uses the internal timer and work members of a struct
delayed_work. Use a separate work item and timer instead.
* Nicolas Kaiser discovered that timer init was missing. Fixed.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Tested-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Cc: Duncan Sands <duncan.sands@xxxxxxx>
Cc: linux-usb@xxxxxxxxxxxxxxx
commit 8c71778cbf2c8beaefaa2dee5478aa0622d96682
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:14:20 2010 +0100
media/video: don't use flush_scheduled_work()
This patch converts the remaining users of flush_scheduled_work() in
media/video.
* bttv-input.c and cx23885-input.c don't use workqueue at all. No
need to flush.
* Make omap24xxcam.c and saa7134-empress.c flush the used work
directly.
* In fd_defio.c, replace cancel_delayed_work() +
flush_scheduled_work() with cancel_delayed_work_sync(). While at
it, replace the deprecated cancel_rearming_delayed_work() with
cancel_delayed_work_sync().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
commit 707bcf326bd50c875d82bd2e7c31dcfb92b7e813
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:14:20 2010 +0100
media/video: explicitly flush request_module work
Video drivers request submodules using a work during probe and calls
flush_scheduled_work() on exit to make sure the work is complete
before being unloaded. This patch makes these drivers flush the work
directly instead of using flush_scheduled_work().
While at it, relocate request_submodules() call in saa7134_initdev()
right right before successful return as in other drivers to avoid
failing after the work is scheduled and returning failure without the
work still active.
This is in preparation for the deprecation of flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
commit 883624a08cb4144343e7362d9fff0e2c69613ebf
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:14:20 2010 +0100
ioc4: use static work_struct for ioc4_load_modules()
There is no reason to dynamically allocate work_struct for
ioc4_load_modules(). It makes the code more complex and makes it
impossible to flush the work directly. Use static work
ioc4_load_modules_work instead and flush it directly on exit.
This removes the use of flush_scheduled_work() which is being
deprecated.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Brent Casavant <bcasavan@xxxxxxx>
commit ee4569a3a75e1a5ed53b0c4ff4d9fc456aa98ef1
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:14:20 2010 +0100
init: don't call flush_scheduled_work() from do_initcalls()
The call to flush_scheduled_work() in do_initcalls() is there to make
sure all works queued to system_wq by initcalls finish before the init
sections are dropped.
However, the call doesn't make much sense at this point - there
already are multiple different workqueues and different subsystems are
free to create and use their own. Ordering requirements are and
should be expressed explicitly.
Drop the call to prepare for the deprecation and removal of
flush_scheduled_work().
Andrew suggested adding sanity check where the workqueue code checks
whether any pending or running work has the work function in the init
text section. However, checking this for running works requires the
worker to keep track of the current function being executed, and
checking only the pending works will miss most cases. As a violation
will almost always be caught by the usual page fault mechanism, I
don't think it would be worthwhile to make the workqueue code track
extra state just for this.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
commit 6dca467a76bb0ed71d65143b235e0ef80e44436f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:00:18 2010 +0100
s390: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
* tape_3590: Create and use tape_3590_wq instead of the system_wq.
* tape_block: Directly flush requeue_task on cleanup instead of using
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: linux390@xxxxxxxxxx
Cc: linux-s390@xxxxxxxxxxxxxxx
commit 9db8995be5e1869b5effa117909bc285e06fc09b
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:00:17 2010 +0100
rtc: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. On
removal, directly cancel the work, and flush the uie_task in
rtc-dev.c::clear_uie().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: rtc-linux@xxxxxxxxxxxxxxxx
commit 0d9ee5b2e9aac981fa063339daf04320eac610d1
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:00:17 2010 +0100
mmc: update workqueue usages
Workqueue creation API has been updated and flush_scheduled_work() is
deprecated and scheduled to be removed.
* core/core.c: Use alloc_ordered_workqueue() instead of
create_singlethread_workqueue(). This removes an unnecessary
rescuer.
* host/omap.c: Create, use and flush mmc_omap_wq instead of the
system_wq.
* Flush host->mmc_carddetect_work directly on removal instead of using
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Chris Ball <cjb@xxxxxxxxxx>
Cc: linux-mmc@xxxxxxxxxxxxxxx
commit afdb32f2e463a195c104555ac9a8cdd39a2b6561
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:00:17 2010 +0100
mfd: update workqueue usages
flush_scheduled_work() is deprecated and scheduled to be removed.
* In menelaus, flush menelaus->work directly on probe failure. Also,
make sure the work isn't running on removal.
* In tps65010, cancel_delayed_work() + flush_scheduled_work() ->
cancel_delayed_work_sync(). While at it, remove unnecessary (void)
casts on return value, and use schedule_delayed_work() and
to_delayed_work() instead of using delayed_work's internal work
field.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
commit 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 16:00:17 2010 +0100
dvb: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
* Flush the used works directly.
* Replace the deprecated cancel_rearming_delayed_work() +
flush_scheduled_work() -> cancel_delayed_work_sync().
* Make sure mantis->uart_work isn't running on exit.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Cc: linux-media@xxxxxxxxxxxxxxx
commit 99ef21216b4f85c56392ed41500d2f07f58cc360
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
leds-wm8350: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush led->work on removal instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
commit 0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
mISDN: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush ch->workq when freeing channel and cancel it on
release.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Karsten Keil <isdn@xxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit d9c612eb6e9ccb8192e6c4d609dbbf178020c672
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
macintosh/ams: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush ams_info.worker on detach instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit a6665944ef83b6a2db8fc5b323c9fca92375a643
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
vmwgfx: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush info->deferred_work on removal instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Thomas Hellstrom <thellstrom@xxxxxxxxxx>
commit 2e5c44c92046c41607794666ffc0d6945945acb0
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
tpm: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush chip->work instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Debora Velarde <debora@xxxxxxxxxxxxxxxxxx>
Cc: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
commit 3514870f06a7907bc46361aebc3daf5ea4e97eeb
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
sonypi: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush sonypi_device.input_work on removal instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Mattia Dongili <malattia@xxxxxxxx>
commit 42565999d1e0b8a0c5b4a0d475c26cf3d567e85e
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:07 2010 +0100
hvsi: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly cancel hp->writer and flush hp->handshaker instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
commit 30d65030fd14fd3696d927c5e452bee84c589b09
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
xen: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush info->work instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
commit 0ead5c86ac4c9903da93c76716135bc29d9cd83b
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
gdrom: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush work on removal instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
commit 8aa0f413848708bca329c52358ae7a1a0e395b4e
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
floppy: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush floppy_work instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
commit 539253f6e13feedfa7bb6a3112c6707ebdf11e74
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
sh: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush psw->work on removal instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: linux-sh@xxxxxxxxxxxxxxx
commit fe413ec322e26179c788c678f24434b94cca34f0
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
arm/sharpsl: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush toggle_charger and sharpsl_bat works on suspend
instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
commit 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
ncpfs: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush the used works on stop instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Petr Vandrovec <petr@xxxxxxxxxxxxxx>
commit f094cfc6c382cec7b2c77dd7798576684153acbb
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
drm/ttm: use cancel_delayed_work_sync() in ttm_bo
Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync()
instead of calling cancel_delayed_work() followed by
flush_scheduled_work().
This is to prepare for the deprecation and removal of
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc:: Thomas Hellstrom <thellstrom@xxxxxxxxxx>
Cc:: Dave Airlie <airlied@xxxxxxxxxx>
commit 404437efc713b6c6fc8e2dc02978624bf4586e2d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
pcmcia/ipwireless: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush the used works instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Jiri Kosina <jkosina@xxxxxxx>
Acked-by: David Sterba <dsterba@xxxxxxx>
commit 9b00a8182987e8b7028d97c2bee3319ef383b57a
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
ocfs2: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
* cancel_delayed_work() + flush_schedule_work() ->
cancel_delayed_work_sync().
* flush qs->qs_work directly on exit instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Joel Becker <joel.becker@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
commit 7f6b0db9f63ba423d989e29f6318fe7e68760421
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
net/dsa: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush dst->link_poll_work on remove instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
commit 158fa67753e1eb3edfa5a2d1868666d89d1cf09f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:06 2010 +0100
isdn/capi: make kcapi use a separate workqueue
flush_scheduled_work() is deprecated and will be removed. Because
kcapi uses fire-and-forget type works, it's impossible to flush each
work explicitly. Create and use a dedicated workqueue instead.
Please note that with recent workqueue changes, each workqueue doesn't
reserve a lot of resources and using it as a flush domain is fine.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Jan Kiszka <jan.kiszka@xxxxxx>
commit 7fa5e85a0ab9ed5d2d8b77eec7976c88a5911bda
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 24 15:59:05 2010 +0100
isdn/capi: unregister capictr notifier after init failure
capidrv_init() could leave capictr notifier dangling after init
failure. Fix it.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Jan Kiszka <jan.kiszka@xxxxxx>
commit 62bcb91573425975d6ad2389d7ab1d8feca88ab4
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 24 15:04:41 2010 +0100
PM: Prototype the pm_generic_ operations
The pm_generic_ operations are all exported but are not prototyped in any
header file for direct use. Do so.
[rjw: Added extern.]
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 24 15:04:06 2010 +0100
PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
The __pm_generic_resume() function changes the given device's runtime
PM status to RPM_ACTIVE if its driver's callback returns 0, but it
only should do that if the rumtime PM is enabled for the device.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 24 15:03:34 2010 +0100
PM: Use dev_name() in core device suspend and resume routines
Use dev_name() wherever applicable in drivers/base/power/main.c.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit b64959e6158d6dcb640fc22d7f43b94ad1c91135
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Dec 16 17:11:45 2010 +0100
PM: Permit registration of parentless devices during system suspend
The registration of a new parentless device during system suspend
will not lead to any complications affecting the PM core (the device
will be effectively seen after the subsequent resume has completed),
so remove the code used for detection of such events.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit b8c76f6aed0ab7df73a6410f3f82de2c831bb144
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Dec 16 00:51:21 2010 +0100
PM: Replace the device power.status field with a bit field
The device power.status field is too complicated for its purpose
(storing the information about whether or not the device is in the
"active" state from the PM core's point of view), so replace it with
a bit field and modify all of its users accordingly.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 5b219a51fdceaf76e0e18da57c7efb9e5586e567
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Dec 16 00:51:08 2010 +0100
PM: Remove redundant checks from core device resume routines
Since a separate list of devices is used to link devices that have
completed each stage of suspend (or resume), it is not necessary to
check dev->power.status in the core device resume routines any more.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 8a43a9ab7b329aa8590f8a064df9bf8c80987507
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Dec 16 00:50:30 2010 +0100
PM: Use a different list of devices for each stage of device suspend
Instead of keeping all devices in the same list during system suspend
and resume, regardless of what suspend-resume callbacks have been
executed for them already, use separate lists of devices that have
had their ->prepare(), ->suspend() and ->suspend_noirq() callbacks
executed. This will allow us to simplify the core device suspend and
resume routines.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 2cbb3ce1ad19e66858a4284dd6c4bb958162c483
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Wed Dec 15 00:17:29 2010 +0100
PM: Avoid compiler warning in pm_noirq_op()
The compiler complains that calltime may be uninitialized in
pm_noirq_op(), so add extra initialization for that variable to
avoid the warning.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit d83f905e126f8cbc5e4addc5d1a64aea785b732e
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 3 23:14:26 2010 +0100
PM: Use pm_wakeup_pending() in __device_suspend()
Before starting to suspend a device in __device_suspend() check if
there's a request to abort the power transition and return -EBUSY
in that case.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 3 22:58:31 2010 +0100
PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
To avoid confusion with the meaning and return value of
pm_check_wakeup_events() replace it with pm_wakeup_pending() that
will work the other way around (ie. return true when system-wide
power transition should be aborted).
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 1e75227ef0571031cd18536ab768ee35667ec5b9
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 3 22:58:05 2010 +0100
PM: Prevent dpm_prepare() from returning errors unnecessarily
Currently dpm_prepare() returns error code if it finds that a device
being suspended has a pending runtime resume request. However, it
should not do that if the checking for wakeup events is not enabled.
On the other hand, if the checking for wakeup events is enabled, it
can return error when a wakeup event is detected, regardless of its
source.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 7ac4dcabdb482d4e74c9d36782d00bc6c4c01619
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Wed Dec 1 00:14:55 2010 +0100
PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
basic-pm-debugging.txt is located in Documentation/power/ not
Documents/power/. Change the references in
Documentation/power/drivers-testing.txt to reflect the location.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit c7b61de5b7b17f0df34dc7d2f8b9576f8bd36fce
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 00:14:42 2010 +0100
PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
This patch (as1431c) makes the synchronous runtime-PM interface
suitable for use in interrupt handlers. Subsystems can call the new
pm_runtime_irq_safe() function to tell the PM core that a device's
runtime_suspend and runtime_resume callbacks should be invoked with
interrupts disabled and the spinlock held. This permits the
pm_runtime_get_sync() and the new pm_runtime_put_sync_suspend()
routines to be called from within interrupt handlers.
When a device is declared irq-safe in this way, the PM core increments
the parent's usage count, so the parent will never be runtime
suspended. This prevents difficult situations in which an irq-safe
device can't resume because it is forced to wait for its non-irq-safe
parent.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 5262a47502adcfc3a64403120768f528418a3b79
Author: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Date: Fri Nov 26 23:07:56 2010 +0100
PM / Hibernate: When failed, in_suspend should be reset
When hibernation failed due to an error in swsusp_write() called by
hibernate(), it skips calling "power_down()" and returns. When
hibernate() is called again (probably after fixing up so that
swsusp_write() wouldn't fail again), before "in_suspend = 1" of
create_image is called, in_suspend should be 0. However, because
hibernate() did not reset "in_suspend" after a failure, it's already 1.
This patch fixes such inconsistency of "in_suspend" value.
Signed-off-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 5729c63a51f0f8a351e0f1dc7b3250ebac12c309
Author: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Date: Fri Nov 26 23:07:48 2010 +0100
PM / Hibernate: hibernation_ops->leave should be checked too
Because hibernate calls hibernation_ops->leave() without checking
whether hibernation_ops->leave is NULL or not, hiberantion_set_ops
should WARN_ON if hibernation_ops->leave is NULL.
This patch added one more condition to check hibernation_ops->leave.
Signed-off-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 8cfe400ca54fd1ed96f962bea5f7e20b09b6d69f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Nov 26 23:07:27 2010 +0100
Freezer: Fix a race during freezing of TASK_STOPPED tasks
After calling freeze_task(), try_to_freeze_tasks() see whether the
task is stopped or traced and if so, considers it to be frozen;
however, nothing guarantees that either the task being frozen sees
TIF_FREEZE or the freezer sees TASK_STOPPED -> TASK_RUNNING
transition. The task being frozen may wake up and not see TIF_FREEZE
while the freezer fails to notice the transition and believes the task
is still stopped.
This patch fixes the race by making freeze_task() always go through
fake_signal_wake_up() for applicable tasks. The function goes through
the target task's scheduler lock and thus guarantees that either the
target sees TIF_FREEZE or try_to_freeze_task() sees TASK_RUNNING.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 133f1128b2bf178a1976b17c54bd14ce6feb90bf
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Thu Nov 25 23:41:29 2010 +0100
PM: Use proper ccflag flag in kernel/power/Makefile
Use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched. According to
(documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 6675bc056790b403d198a173498d377187754142
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 25 23:41:19 2010 +0100
PM / Runtime: Fix comments to match runtime callback code
Commit 05aa55dddb9ee4045c320661068bea78dad6a6e5 changed routines to
succeed if the driver handler is not defined. Comments were not updated.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 30f2ba38011247ad95bffbf0743a0dc0656a5eb7
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 19:38:37 2010 +0900
sh: intc: Initialize radix tree gfp mask explicitly.
Presently the root node is initialized by way of kzalloc on the parent
data structure, which by chance happens to do the bulk of what an
explicit initialization does with GFP_NOWAIT semantics. This however is
more by luck than by design, and as we ideally want to permit radix node
allocations access to the emergency pools anyways, add in the proper
initializer with the desired mask.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1dee92bba36b491dbcc15e2cba40501403237f96
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 19:19:23 2010 +0900
sh: Tidy up SH-4A unaligned load support.
The current implementation was rather tied to the packed_struct.h
definitions, which immediately began to clash when the packed_struct.h
types changed and drivers began to include packed_struct.h directly.
In order to support this sort of use it's necessary to get out of the way
with regards to namespace collisions, and at the same time we can also
kill off some duplicate code now that the unaligned headers are a bit
more broken out.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3d29005ab8d828e36108ecc2338612ce3acdd86f
Author: Shiraz Hashim <shiraz.hashim@xxxxxx>
Date: Thu Dec 23 11:32:41 2010 +0100
ARM: 6541/1: move sev definition to common system.h include file
sev is used to send wakeup event to other cores in ARMv6K and above.
This has been moved from platform specific part to standard common
ARM header file (asm/system.h). Also introduced wfi() and wfe().
Signed-off-by: Shiraz Hashim <shiraz.hashim@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 78368c79944b12f91bcacb0b0b030c36016264e8
Author: Srinidhi Kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
Date: Wed Dec 22 13:18:58 2010 +0100
ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 67cfa23ac9df810d1fbf3a06b7f408243350ecfe
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Dec 21 10:42:20 2010 +0000
Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"
This reverts commit 06c1088, as promised in the warning message.
commit dec12e62c03d26bbc7a142f067215a3a43cce7d0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Dec 16 13:49:34 2010 +0000
ARM: provide an early platform initialization hook
This allows platforms to hook into the initialization early to setup
things like scheduler clocks, etc.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 8ff1443c5439ecee7472b80cf12ecfc337e6ee98
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 20 10:18:36 2010 +0000
ARM: simplify early machine init hooks
Rather than storing each machine init hook separately, store a
pointer to the machine description record and dereference this
instead. This pointer is only available while the init sections
are present, which is not a problem as we only use it from init
code.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cd544ce754ac2432ffcc0626ea802d2b30876b50
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Dec 22 13:20:08 2010 +0100
ARM: 6538/1: Subarch IRQ handler macros V3
Per subarch interrupt handler macros V3.
This patch breaks out code from the irq_handler macro
into arch_irq_handler and arch_irq_handler_default.
The macros are put in the header file "entry-macro-multi.S"
The arch_irq_handler_default macro is designed to be
used by irq_handler in entry-armv.S while arch_irq_handler
is suitable for per-subarch use.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 521086412ee423fbdfc7da81f257239c43f707b4
Author: eric miao <eric.y.miao@xxxxxxxxx>
Date: Mon Dec 13 09:42:34 2010 +0100
ARM: 6532/1: Allow machine to specify it's own IRQ handlers at run-time
Normally different ARM platform has different way to decode the IRQ
hardware status and demultiplex to the corresponding IRQ handler.
This is highly optimized by macro irq_handler in entry-armv.S, and
each machine defines their own macro to decode the IRQ number.
However, this prevents multiple machine classes to be built into a
single kernel.
By allowing each machine to specify thier own handler, and making
function pointer 'handle_arch_irq' to point to it at run time, this
can be solved. And introduce CONFIG_MULTI_IRQ_HANDLER to allow both
solutions to work.
Comparing with the highly optimized macro of irq_handler, the new
function must be written with care not to lose too much performance.
And the IPI stuff on SMP is expected to move to the provided arch
IRQ handler as well.
The assembly code to invoke handle_arch_irq is optimized by Russell
King.
Signed-off-by: Eric Miao <eric.miao@xxxxxxxxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d13e5edd7284bedcf5952e1b6490e39ad843cb91
Author: Todd Android Poynor <toddpoynor@xxxxxxxxxx>
Date: Thu Dec 23 01:52:44 2010 +0100
ARM: 6540/1: Stop irqsoff trace on return to user
If the irqsoff tracer is in use, stop tracing the interrupt disable
interval when returning to userspace. Tracing userspace execution time
as interrupts disabled time is not helpful for kernel performance
analysis purposes. Only do so if the irqsoff tracer is enabled, to
avoid overhead for lockdep, which doesn't care.
Signed-off-by: Todd Poynor <toddpoynor@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 875728807ff001b67a1e0535de5ad2cd3c41d47c
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Wed Dec 22 09:18:29 2010 +0100
ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers
Adding in self as maintainer for Nomadik and Ux500, I'm running
an active -next tree for that stuff now. Extend file matchers to
cover a few more relevant drivers and add git references.
Cc: Alessandro Rubini <rubini@xxxxxxxx>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 537de3a67c0c86586eacffde40673b727242dc3a
Author: Stephen Warren <swarren@xxxxxxxxxx>
Date: Wed Dec 22 04:52:05 2010 +0100
ARM: 6536/1: Add missing SZ_{32,64,128}
... and also remove misleading comment stating that this header is
auto-generated.
Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Uwe Kleine-Knig <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 206323c181371f3d5fab36c6d33e1fac09b61082
Merge: 25cf0398bdf365d027e171116aa4a281e9cd3c1c 28bd2c341120db346f30b3ba11b4eac06b2cc981
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Dec 24 09:36:37 2010 +0000
Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable
commit 55271024a735d0c3234e6ca7e0914b05aab7fbac
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Nov 17 13:00:50 2010 +0100
powerpc/pcm{030,032}: add pagesize to dts
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 45efe847971e6274a04eea75a0745d8015b54d37
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Nov 17 13:00:49 2010 +0100
misc/at24: add more sanity checks for parameters
Side-effects happen when passing 0 to either io_limit or page_size. Give
an error in case of this misconfiguration.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 9ed030d728f3bd03b6e869357da02725afda19a7
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Nov 17 13:00:48 2010 +0100
misc/at24: parse device tree data
Information about the pagesize and read-only-status may also come from
the devicetree. Parse this data, too, and act accordingly. While we are
here, change the initialization printout a bit. write_max is useful to
know to detect performance bottlenecks, the rest is superfluous.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 4bdac7da5237170b1392f39ebee99d235043fad8
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Fri Dec 17 15:33:58 2010 +0100
spi/mpc52xx-spi: fix annotation for remove()-pointer
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 0dd2c96f19b0cffaeb437e50fa5da195920c6e78
Author: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Date: Tue Dec 21 09:27:02 2010 +0800
spi/fsl_espi: fix wrong setting of the address in the command buffer
Or else we can't operate on the right address when the trans length
is greater than 65535.
Signed-off-by: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit e6289d63a6f39237a027dcee46366ba158cb8406
Author: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Date: Tue Dec 21 09:26:07 2010 +0800
spi/fsl_espi: change the read behaviour of the SPIRF
The user must read N bytes of SPIRF (1 <= N <= 4) that do not exceed the
amount of data in the receive FIFO, so read the SPIRF byte by byte when
the data in receive FIFO is less than 4 bytes.
On Simics, when read N bytes that exceed the amount of data in receive
FIFO, we can't read the data out, that is we can't clear the rx FIFO,
then the CPU will loop on the espi rx interrupt.
Signed-off-by: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 020862648445d7c1b12ea213c152f27def703f3b
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 16 14:42:14 2010 -0800
of/i2c: Fix request module by alias
If we are registering an i2c device that has a device tree node like
this real-world example:
rtc@68 {
compatible = "dallas,ds1337";
reg = <0x68>;
};
of_i2c_register_devices() will try to load a module called ds1337.ko.
There is no such module, so it will fail. If we look in modules.alias
we will find entries like these:
.
.
.
alias i2c:ds1339 rtc_ds1307
alias i2c:ds1338 rtc_ds1307
alias i2c:ds1337 rtc_ds1307
alias i2c:ds1307 rtc_ds1307
alias i2c:ds1374 rtc_ds1374
.
.
.
The module we want is really called rtc_ds1307.ko. If we request a
module called "i2c:ds1337", the userspace module loader will do the
right thing (unless it is busybox) and load rtc_ds1307.ko. So we add
the I2C_MODULE_PREFIX to the request_module() string.
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 194588604765ac803f98fb9d19a36f6b835f4620
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Wed Oct 27 18:03:47 2010 -0700
of/mdio: Fix some endianness problems.
In of_mdiobus_register(), the __be32 *addr variable is dereferenced.
This will not work on little-endian targets. Also since it is
unsigned, checking for less than zero is redundant.
Fix these two issues.
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
[grant.likely@xxxxxxxxxxxx: removed goto]
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 7063c0d942a1af2993531fbe52b4c74c1db818c4
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Dec 24 13:59:11 2010 +0800
spi/dw_spi: add DMA support
dw_spi driver in upstream only supports PIO mode, and this patch
will support it to cowork with the Designware dma controller used
on Intel Moorestown platform, at the same time it provides a general
framework to support dw_spi core to cowork with dma controllers on
other platforms
It has been tested with a Option GTM501L 3G modem and Infenion 60x60
modem. To use DMA mode, DMA controller 2 of Moorestown has to be enabled
Also change the dma interface suggested by Linus Walleij.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
[Typo fix and renames to match intel_mid_dma renaming]
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 79290a2aa2fd1c179a285218472092475630dc0e
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Dec 24 13:59:10 2010 +0800
spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit ebf45b7d029eb065819bfede8b30455630d76c68
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Dec 24 13:59:09 2010 +0800
spi/dw_spi: Fix too short timeout in spi polling loop
The SPI polling loop timeout only works with HZ=100 as the loop was
actually too short.
Also add appropriate cpu_relax() in the busy wait loops...
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 5e8b821de333f472d33e3052a8dd1c43bf3ce433
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Wed Dec 22 23:13:59 2010 +0100
spi/pl022: convert running variable
This variable is a bool but defined an int and defined completely
backwards. This makes the code more readable.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit dec5a581eb5b7d1abc90885d897d2468f1e60b21
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Wed Dec 22 23:13:48 2010 +0100
spi/pl022: convert busy flag to a bool
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 082086f2ce53c69260396e977d29972128def1d7
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Wed Dec 22 23:13:37 2010 +0100
spi/pl022: pass the returned sglen to the DMA engine
The sglen return by the dma_map_sg() should be passed to the DMA
engine, not the one passed in. If we one day have a DMA mapper
that can coalesce entries, this will bug due to a too large
number of entries being passed in.
Reported-by: Russell King <linux@xxxxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit b729889686afb7d4366e07fe9c2f7a2737166462
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Wed Dec 22 23:13:07 2010 +0100
spi/pl022: map the buffers on the DMA engine
The struct device for the DMA engine is the apropriate one to use
when mapping/unmapping buffers. This is because the memory which
is addressable by DMA is determined by the DMA engine rather than
the device.
Reported-by: Russell King <linux@xxxxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit acd0acb65ec907a9e872bbaa7ad811a518b49b45
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Tue Dec 21 01:41:15 2010 +0000
fb: fix overlapping test off-by-one.
On my system with a radeon x2, the first GPU was not overlapping vesa
but the test decided it was.
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
Reviewed-by: Michel Dänzer <michel@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9d32af66aa3a0e28d95fc607e208795ef6cc993a
Author: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Fri Dec 24 11:40:50 2010 +0900
spi/topcliff_pch: Fix data transfer issue
It seems spi_topcliff_pch of linux-2.6.37-rc6 degraded by previous patch.
In fact, data transfer fails on evaluation board testing.
I found like the following register miss-setting line.
Using this patch, I have confirmed data transfer can work well.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 27f1acccd4d310e941d2e879445324595e2fe463
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 12:15:57 2010 +0900
sh: Fix up SH7201 clkfwk build.
The master clock initialization for SH7201 was wholly bogus. Users of the
legacy API must initialize the clock rate through the struct clk itself
rather than returning the clock frequency. Given that the init function
itself is void, returning the frequency isn't terribly effective.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 29c185e5c681ca00d863d161eda7eadb93e32ee5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 12:08:30 2010 +0900
nommu: Provide stubbed alloc/free_vm_area() implementation.
Now that these have been introduced in to the vmalloc API, sync up the
nommu side of things. At present we don't deal with VMAs as such, so for
the time being these will simply BUG() out. In the future it should be
possible to support this interface by layering on top of the vm_regions.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9a14f653dfe349c0916e6a78c413effa2fa3f001
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 11:50:34 2010 +0900
nommu: Fix up vmalloc_node() symbol export regression.
Commit e1ca778 ("mm: add vzalloc() and vzalloc_node() helpers") ended up
accidentally deleting the vmalloc_node() symbol export, resulting in:
"vmalloc_node" [net/core/pktgen.ko] undefined!
"vmalloc_node" [net/netfilter/x_tables.ko] undefined!
regressions.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 27434f0af0fecba71fa58407715028d2b9550956
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 11:30:10 2010 +0900
sh: mach-se: Fix up SE7206 build.
With some recent tidying of duplicate register definitions the se7206 IRQ
code broke:
arch/sh/boards/mach-se/7206/irq.c: error: 'INTC_ICR' undeclared (first use in this function)
arch/sh/boards/mach-se/7206/irq.c: error: (Each undeclared identifier is reported only once
arch/sh/boards/mach-se/7206/irq.c: error: for each function it appears in.)
Fix it up.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 638fa4aad5bbb75c8f0d558aa15dcb543de5fc31
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 24 11:27:29 2010 +0900
sh: Fix up SH4-202 clkfwk build.
Some of the SH4-202 code was overlooked in the set_rate() API conversion,
resulting in:
arch/sh/kernel/cpu/sh4/clock-sh4-202.c: error: too many arguments to function 'clk->ops->set_rate'
Fix it up.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 893421745a052100b981401b7c5c6dc8708fb8a0
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 24 10:05:46 2010 +0100
spi/imx: remove autodetection
There are no machines in-tree that still use the driver
name as device name. So save a few bytes and remove it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Acked-by: Jason Wang <jason77.wang@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit eda4b716ea1f2a647a39cebae66b3fae4c4b80e4
Merge: 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5 7d8f98769e7f4bc29c38789daeb416c6a7d7c241
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 16:36:48 2010 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Fix system inodes cache overflow.
ocfs2: Hold ip_lock when set/clear flags for indexed dir.
ocfs2: Adjust masklog flag values
Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.
ocfs2/dlm: Migrate lockres with no locks if it has a reference
commit 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5
Merge: 08861c713c1314d5b7329a290b5d53ad711112c3 8a7411a24350bac141271755c66f40c56b0535ae
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 16:25:31 2010 -0800
Merge branch 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix on-line resizing regression
commit 08861c713c1314d5b7329a290b5d53ad711112c3
Merge: e82bb314eab2e25a7657f34450665160a5a6cc2b 7693457547b729d9010a6014bbb8572b085f58d4
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 16:04:32 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix GPIO2-fixup for Sony laptops
ALSA: hda - Try to find an empty control index when it's occupied
ALSA: hda - Fix conflict of d-mic capture volume controls
ALSA: hda - Don't apply ALC269-specific initialization to ALC275
ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
ALSA: pcm: remember to always call va_end() on stuff that we va_start()
ALSA: HDA: Add auto-mute for Thinkpad SL410/SL510
commit e82bb314eab2e25a7657f34450665160a5a6cc2b
Merge: 79534f237f05cac7f728cc957efdcc17603e38cd 501aaa110a4269c99eff9736a81b5f93bb8b59be
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 15:59:23 2010 -0800
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (21 commits)
[media] mceusb: set a default rx timeout
[media] mceusb: fix inverted mask inversion logic
[media] mceusb: add another Fintek device ID
[media] lirc_dev: fixes in lirc_dev_fop_read()
[media] lirc_dev: stray unlock in lirc_dev_fop_poll()
[media] rc: fix sysfs entry for mceusb and streamzap
[media] streamzap: merge timeout space with trailing space
[media] mceusb: fix keybouce issue after parser simplification
[media] IR: add tv power scancode to rc6 mce keymap
[media] mceusb: buffer parsing fixups for 1st-gen device
[media] mceusb: fix up reporting of trailing space
[media] nuvoton-cir: improve buffer parsing responsiveness
[media] mceusb: add support for Conexant Hybrid TV RDU253S
[media] s5p-fimc: Fix output DMA handling in S5PV310 IP revisions
[media] s5p-fimc: Use correct fourcc code for 32-bit RGB format
[media] s5p-fimc: Convert m2m driver to unlocked_ioctl
[media] s5p-fimc: Explicitly add required header file
[media] s5p-fimc: Fix vidioc_g_crop/cropcap on camera sensor
[media] s5p-fimc: BKL lock removal - compilation fix
[media] soc-camera: fix static build of the sh_mobile_csi2.c driver
...
commit 79534f237f05cac7f728cc957efdcc17603e38cd
Merge: 3fc5e98d8cf85e0d77fc597b49e9268dff67400e 2ce494a3dac331fdbb2590e5fa0598956dd21b8b 7f8595bfacef279f06c82ec98d420ef54f2537e0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 15:39:40 2010 -0800
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf probe: Fix to support libdwfl older than 0.148
perf tools: Fix lazy wildcard matching
perf buildid-list: Fix error return for success
perf buildid-cache: Fix symbolic link handling
perf symbols: Stop using vmlinux files with no symbols
perf probe: Fix use of kernel image path given by 'k' option
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, kexec: Limit the crashkernel address appropriately
commit 3fc5e98d8cf85e0d77fc597b49e9268dff67400e
Author: David Howells <dhowells@xxxxxxxxxx>
Date: Wed Dec 22 16:24:13 2010 +0000
KEYS: Don't call up_write() if __key_link_begin() returns an error
In construct_alloc_key(), up_write() is called in the error path if
__key_link_begin() fails, but this is incorrect as __key_link_begin() only
returns with the nominated keyring locked if it returns successfully.
Without this patch, you might see the following in dmesg:
=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
mount.cifs/5769 is trying to release lock (&key->sem) at:
[<ffffffff81201159>] request_key_and_link+0x263/0x3fc
but there are no more locks to release!
other info that might help us debug this:
3 locks held by mount.cifs/5769:
#0: (&type->s_umount_key#41/1){+.+.+.}, at: [<ffffffff81131321>] sget+0x278/0x3e7
#1: (&ret_buf->session_mutex){+.+.+.}, at: [<ffffffffa0258e59>] cifs_get_smb_ses+0x35a/0x443 [cifs]
#2: (root_key_user.cons_lock){+.+.+.}, at: [<ffffffff81201000>] request_key_and_link+0x10a/0x3fc
stack backtrace:
Pid: 5769, comm: mount.cifs Not tainted 2.6.37-rc6+ #1
Call Trace:
[<ffffffff81201159>] ? request_key_and_link+0x263/0x3fc
[<ffffffff81081601>] print_unlock_inbalance_bug+0xca/0xd5
[<ffffffff81083248>] lock_release_non_nested+0xc1/0x263
[<ffffffff81201159>] ? request_key_and_link+0x263/0x3fc
[<ffffffff81201159>] ? request_key_and_link+0x263/0x3fc
[<ffffffff81083567>] lock_release+0x17d/0x1a4
[<ffffffff81073f45>] up_write+0x23/0x3b
[<ffffffff81201159>] request_key_and_link+0x263/0x3fc
[<ffffffffa026fe9e>] ? cifs_get_spnego_key+0x61/0x21f [cifs]
[<ffffffff812013c5>] request_key+0x41/0x74
[<ffffffffa027003d>] cifs_get_spnego_key+0x200/0x21f [cifs]
[<ffffffffa026e296>] CIFS_SessSetup+0x55d/0x1273 [cifs]
[<ffffffffa02589e1>] cifs_setup_session+0x90/0x1ae [cifs]
[<ffffffffa0258e7e>] cifs_get_smb_ses+0x37f/0x443 [cifs]
[<ffffffffa025a9e3>] cifs_mount+0x1aa1/0x23f3 [cifs]
[<ffffffff8111fd94>] ? alloc_debug_processing+0xdb/0x120
[<ffffffffa027002c>] ? cifs_get_spnego_key+0x1ef/0x21f [cifs]
[<ffffffffa024cc71>] cifs_do_mount+0x165/0x2b3 [cifs]
[<ffffffff81130e72>] vfs_kern_mount+0xaf/0x1dc
[<ffffffff81131007>] do_kern_mount+0x4d/0xef
[<ffffffff811483b9>] do_mount+0x6f4/0x733
[<ffffffff8114861f>] sys_mount+0x88/0xc2
[<ffffffff8100ac42>] system_call_fastpath+0x16/0x1b
Reported-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Reviewed-and-Tested-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 44658a11f312fb9217674cb90b1a11cbe17fd18d
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Tue Dec 21 13:04:52 2010 -0800
cs5535-gpio: handle GPIO regs where higher (clear) bits are set
The default for non-READ_BACK GPIO regs is to have the clear bits set;
this means that our original errata fix was too simplistic. This
changes it to the following behavior:
- when setting GPIOs, ignore the higher order bits (they're for
clearing, we don't need to care about them).
- when clearing GPIOs, keep all the bits, but unset (via XOR) the
lower order bit that negates the clear bit that we care about. That
is, if we're clearing GPIO 26 (val = 0x04000000), we first XOR what's
currently in the register with 0x0400 (GPIO 26's SET bit), and then
OR that with the GPIO 26's CLEAR bit.
Tested-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 001851659354cce436b749a793f3512a53394d80
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Tue Dec 21 13:04:42 2010 -0800
cs5535-gpio: don't apply errata #36 to edge detect GPIOs
The edge detect status GPIOs function differently from the other atomic
model CS5536 GPIO registers; writing 1 to the high bits clears the GPIO,
but writing 1 to the lower bits also clears the bit.
This means that read-modify-write doesn't actually work for it, so don't
apply the errata here. If a negative edge status gets lost after
resume.. well, we tried our best!
Tested-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 0131d8973c8b9bd9d40fee8fae24eab24821efdb
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Wed Dec 1 10:54:46 2010 +0100
of/address: use proper endianess in get_flags
This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and
such. Those variables are pointing to the device tree which contains
integers in big endian format.
Most functions are doing it right because of_read_number() is doing the
right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and
of_bus_isa_map() were accessing the data directly and were doing it wrong.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit aa5cbf8a70f57c5360ce1bfef692b357c866ae7f
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date: Tue Dec 21 16:00:27 2010 -0800
[SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 900a36e3277ac9109fe364a6a1420c71265f9377
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date: Tue Dec 21 16:00:26 2010 -0800
[SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 0ce87911491d4167198b863c102c7e4d09202561
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date: Tue Dec 21 16:00:25 2010 -0800
[SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit bc5c2aad17b045ea28ab69e6149c8130ab20731e
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date: Tue Dec 21 16:00:24 2010 -0800
[SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7a44b86e777fc5d7a267df984d12b05fca59f487
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date: Tue Dec 21 16:00:23 2010 -0800
[SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
The semantics we employ now in the driver, performing a
BIG_HAMMER in the event of Get-ID (0x20) mailbox command
failing, should only be done for FC. On FC configurations, it
makes sense since advertising is only really performed once,
so a BIG_HAMMER to reinitiate the process is needed to
restart. Under FCoE, this is not needed, as there's a
continous stream of advertisements/ACks at the protocol layer
to initiate a relogin/reinitialization process.
Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f2019cb117f29ffaff961b5f6d5b3148d473de1d
Author: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
Date: Tue Dec 21 16:00:22 2010 -0800
[SCSI] qla2xxx: Remove redundant module parameter permission bits
For driver module parameters that have permission bits set to
(S_IRUGO|S_IRUSR), remove the second term since it is already
included in the first term.
S_IRUGO comes defined as (S_IRUSR|S_IRGRP|S_IROTH).
Signed-off-by: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 794a5691147652387f4a2ffa890c5c1983e38849
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date: Tue Dec 21 16:00:21 2010 -0800
[SCSI] qla2xxx: Add sysfs node for displaying board temperature.
Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 10fbb7dd36eb3014fe4b928e596d89e036ee6210
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date: Tue Dec 21 16:00:20 2010 -0800
[SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Signed-off-by: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 710fc04da1abe48a33d54afb1ba33dbeceafb6e1
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Wed Dec 22 11:57:29 2010 -0800
microblaze/of: Use generic rule to build dtb's
Modify arch/powerpc/boot/Makefile to use dtc command in
scripts/Makefile.lib
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 63849340621f7f5f963e4a9b9ba76add3ad54612
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Wed Dec 22 11:57:28 2010 -0800
of/powerpc: Use generic rule to build dtb's
Modify arch/powerpc/boot/Makefile to use dtc command in
scripts/Makefile.lib
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit c9e8fd5cfb7de50139a8aa0f70f9fe03311cdd01
Author: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Date: Tue Dec 21 16:00:19 2010 -0800
[SCSI] qla2xxx: Fix for memory wedge on fw halt for ISP82XX
Signed-off-by: Swapnil Nagle <swapnil.nagle@xxxxxxxxxx>
Signed-off-by: Karen Higgins <karen.higgins@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 21090cbe95189d4ce6135fc8fec2f416b3eb227f
Author: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Date: Tue Dec 21 16:00:18 2010 -0800
[SCSI] qla2xxx: Update FCP priority information to firmware before sending IOs
The FCP priority info was not being updated properly in certain situations.
Here are the changes that needs to be done to take care of this issue:
1. No need to check fcport->state for FCS_UNCONFIGURED in
qla24xx_update_fcport_fcp_prio(), since an invalid loop id check is
already performed which is sufficient.
2. Add the missing qla24xx_update_fcport_fcp_prio() function call
within qla2x00_update_fcport() function, so that the priority info
is updated on every port addition or change.
3. Perform proper adapter types checking.
4. Other changes, associated with DEBUG/printk's and parameter passing.
Signed-off-by: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 4052bd57234f119cef13b8997fcc852e2b2ce992
Author: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
Date: Tue Dec 21 16:00:17 2010 -0800
[SCSI] qla2xxx: Fixed zero test on new_config in qla2x00_process_loopback().
Fixed the incorrect zero test on array new_config[].
Signed-off-by: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit ff8073fffc708a4959c2dd159c834f2516ce9703
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date: Tue Dec 21 16:00:16 2010 -0800
[SCSI] qla2xxx: Populate FCP_PRIO location for no *FLT* case
Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 8ae598d02517af967685a671303c4ed10cded3c4
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Tue Dec 21 16:00:15 2010 -0800
[SCSI] qla2xxx: list cursors are not null
This is just a cleanup.
The unneeded NULL check annoys static checkers because we already
derefenced it and the we check it and then (if it's not the _safe()
version) we dereference it again without checking. And the static
checker is all, "Wah? Is it null or not?"
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit aab94339cd85d726abeae78fc02351fc1910e6a4
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Wed Dec 22 11:57:26 2010 -0800
of: Add support for linking device tree blobs into vmlinux
This patch adds support for linking device tree blob(s) into
vmlinux. Modifies asm-generic/vmlinux.lds.h to add linking
.dtb sections into vmlinux. To maintain compatiblity with the of/fdt
driver code platforms MUST copy the blob to a non-init memory location
before the kernel frees the .init.* sections in the image.
Modifies scripts/Makefile.lib to add a kbuild command to
compile DTS files to device tree blobs and a rule to create objects to
wrap the blobs for linking.
STRUCT_ALIGNMENT is defined in vmlinux.lds.h for use in the rule to
create wrapper objects for the dtb in Makefile.lib. The
STRUCT_ALIGN() macro in vmlinux.lds.h is modified to use the
STRUCT_ALIGNMENT definition.
The DTB's are placed on 32 byte boundries to allow parsing the blob
with driver/of/fdt.c during early boot without having to copy the blob
to get the structure alignment GCC expects.
A DTB is linked in by adding the DTB object to the list of objects to
be linked into vmlinux in the archtecture specific Makefile using
obj-y += foo.dtb.o
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Acked-by: Michal Marek <mmarek@xxxxxxx>
[grant.likely@xxxxxxxxxxxx: cleaned up whitespace inconsistencies]
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 579d12b58abb4bd1161728f0a4a2524258ecf0a3
Author: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
Date: Tue Dec 21 16:00:14 2010 -0800
[SCSI] qla2xxx: Added support for quiescence mode for ISP82xx.
Support is added for quiescence mode. This feature is for P3P
adapters. Any of the functions can put the firmware into quiescence
state. All the others have to ack that request. During quiescence mode
current commands are processed and all the new incoming I/Os are
blocked. Loop resync is performed after firmware comes out of
quiescence state.
Signed-off-by: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit d3bd058826aa8b79590cca6c8e6d1557bf576ada
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Thu Dec 16 19:09:58 2010 -0800
x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation
Recent Intel new system have different order in MADT, aka will list all thread0
at first, then all thread1.
But SRAT table still old order, it will list cpus in one socket all together.
If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed
to put some cpus apic id to node mapping into apicid_to_node[].
for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash...
[ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS).
[ 9.235021] divide error: 0000 [#1] SMP
[ 9.235315] last sysfs file:
[ 9.235481] CPU 1
[ 9.235592] Modules linked in:
[ 9.245398]
[ 9.245478] Pid: 2, comm: kthreadd Not tainted 2.6.37-rc1-tip-yh-01782-ge92ef79-dirty #274 /Sun Fire x4800
[ 9.265415] RIP: 0010:[<ffffffff81075a8f>] [<ffffffff81075a8f>] select_task_rq_fair+0x4f0/0x623
...
[ 9.645938] RIP [<ffffffff81075a8f>] select_task_rq_fair+0x4f0/0x623
[ 9.665356] RSP <ffff88103f8d1c40>
[ 9.665568] ---[ end trace 2296156d35fdfc87 ]---
So let just parse all cpu entries in SRAT.
Also add apicid checking with MAX_LOCAL_APIC, in case We could out of boundaries of
apicid_to_node[].
it fixes following bug too.
https://bugzilla.kernel.org/show_bug.cgi?id=22662
-v2: expand to 32bit according to hpa
need to add MAX_LOCAL_APIC for 32bit
Reported-and-Tested-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Reported-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Tested-by: Myron Stowe <myron.stowe@xxxxxx>
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <4D0AD486.9020704@xxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 56d91f132c9be66e98cce1b1e77a28027048bb26
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Thu Dec 16 19:09:24 2010 -0800
x86, acpi: Add MAX_LOCAL_APIC for 32bit
We should use MAX_LOCAL_APIC for max apic ids and MAX_APICS as number
of local apics.
Also apic_version[] array should use MAX_LOCAL_APICs.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <4D0AD464.2020408@xxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sat Dec 18 13:29:45 2010 +0100
PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
If pcie_ports_disabled is set, pcie_port_service_register() returns
error code and select_detection_mode() should not attempt to
unregister dummy_driver and use dummy_slots. It should return
PCIEHP_DETECT_ACPI immediately instead.
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Acked-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 6ec1e077e36c5469a6f901ca9abbd9bd5d23e6ae
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 23 12:17:49 2010 -0800
arm: omap: tusb6010: add name for MUSB IRQ
commit fcf173e4511193b1efeccb0f22a8c641b464353b
(add names for IRQs in structure resource)
forgot to take care of tusb6010 making it
fail to probe due to a missing resource.
Fix it.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 840b929680c0d79f5248724d1b6b6d3f2ca3159e
Author: Srinath <srinath@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 12:17:48 2010 -0800
arm: omap: craneboard: Add USB EHCI support
AM3517/05 Craneboard has one EHCI interface on board using port1.
GPIO35 is used as power enable.
GPIO38 is used as port1 PHY reset.
History:
http://marc.info/?l=linux-omap&w=2&r=1&s=Craneboard%253A%2BAdd%2BUSB%2BEHCI%2Bsupport&q=b
Signed-off-by: Srinath <srinath@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit e058464990c2ef1f3ecd6b83a154913c3c06f02a
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 23 12:03:57 2010 -0800
Revert "ipv4: Allow configuring subnets as local addresses"
This reverts commit 4465b469008bc03b98a1b8df4e9ae501b6c69d4b.
Conflicts:
net/ipv4/fib_frontend.c
As reported by Ben Greear, this causes regressions:
> Change 4465b469008bc03b98a1b8df4e9ae501b6c69d4b caused rules
> to stop matching the input device properly because the
> FLOWI_FLAG_MATCH_ANY_IIF is always defined in ip_dev_find().
>
> This breaks rules such as:
>
> ip rule add pref 512 lookup local
> ip rule del pref 0 lookup local
> ip link set eth2 up
> ip -4 addr add 172.16.0.102/24 broadcast 172.16.0.255 dev eth2
> ip rule add to 172.16.0.102 iif eth2 lookup local pref 10
> ip rule add iif eth2 lookup 10001 pref 20
> ip route add 172.16.0.0/24 dev eth2 table 10001
> ip route add unreachable 0/0 table 10001
>
> If you had a second interface 'eth0' that was on a different
> subnet, pinging a system on that interface would fail:
>
> [root@ct503-60 ~]# ping 192.168.100.1
> connect: Invalid argument
Reported-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8a7411a24350bac141271755c66f40c56b0535ae
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Mon Dec 20 22:30:36 2010 -0500
ext4: fix on-line resizing regression
https://bugzilla.kernel.org/show_bug.cgi?id=25352
This regression was caused by commit a31437b85: "ext4: use
sb_issue_zeroout in setup_new_group_blocks", by accidentally dropping
the code which reserved the block group descriptor and inode table
blocks.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
commit e1928c86c4829703b800c81cc9edc939b5634e6f
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:43:04 2010 +0000
cnic: Add FCoE support on 57712
- Connection ID (cid) management
- Slow-path command and response support
- Update version to 2.2.11.
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e21ba414eed8a233eadb79bb6b158ac7ceb35025
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:43:03 2010 +0000
cnic: Add kcq2 support on 57712
The kcq2 (2nd kernel work queue) is used by FCoE on 57712 devices.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 42ecbb8426aa229167d7f9d4b4e20f24bf42cb24
Author: Eddie Wai <waie@xxxxxxxxxxxx>
Date: Thu Dec 23 07:43:02 2010 +0000
cnic: Call cm_connect_complete() immediately on error
If we get a path_resp error from userspace, call cm_connect_complete()
immediately with error so that bnx2i can react to the error faster.
Signed-off-by: Eddie Wai <waie@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit eaaa6e9c222d5c398488ed4216f0fd94e4b81759
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 08:38:30 2010 +0000
cnic: Check device state before reading the kcq pointer in IRQ
If the device is down, the kcq pointer may be NULL.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4aacb7afb6afd78efe26427e74fa56a5fc72fad3
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:43:01 2010 +0000
cnic: Support NIC Partition mode
Add a common function cnic_read_bnx2x_iscsi_mac() to read the iSCSI
MAC address at any specified shared memory location. In NIC Partition
mode, we need to get the MAC address from the MF_CFG area of shared
memory.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5159fdc1e6cb4000f482faebeeba0be91611276d
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:42:59 2010 +0000
cnic: Use proper client and connection IDs on iSCSI ring
Use the IDs specified by the bnx2x driver when initializing the ring.
We don't have to make code changes when these IDs change in the future.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 939b82e5bde56a98c72eccde2e3a88d32bffad4a
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:42:58 2010 +0000
cnic: Improve ->iscsi_nl_msg_send()
1. Change first parameter from cnic_dev to ulp_handle which is the hba
pointer. All other similar upcalls are using hba pointer. The callee
can then directly reference the hba without conversion.
2. Change return value from void to int so that an error code can be
passed back. This allows the operation to be retried.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8adc9240f98a816f7e9b3d93b9446a790110e062
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:42:57 2010 +0000
cnic: Prevent "scheduling while atomic" when calling ->cnic_init()
cnic_dev_list is protected by rtnl_lock and cnic_dev_lock spin_lock during
modifications. When looping on cnic_dev_list and calling ->cnic_init(),
we should just hold rtnl_lock since ->cnic_init() may sleep.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9b09336072796378dac46df63bcd43291b24fd12
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Thu Dec 23 07:42:56 2010 +0000
cnic: Fix iSCSI TCP port endian order.
Pass the TCP port parameter for iSCSI connections to the firmware in
proper endian order.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5e2f55c6aaf4865081c46bf53664c8b5da8dc49e
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Wed Dec 22 16:42:55 2010 +0100
powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
Fix build errors like these (from a randconfig and my defconfig for a custom board):
src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:549: error: dereferencing pointer to incomplete type: 1 errors in 1 logs
src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:636: error: implicit declaration of function 'nonseekable_open': 1 errors in 1 logs
src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:657: error: variable 'mpc52xx_wdt_fops' has initializer but incomplete type: 1 errors in 1 logs
src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:658: error: excess elements in struct initializer: 1 errors in 1 logs
src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:658: error: unknown field 'owner' specified in initializer: 1 errors in 1 logs
...
Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 0e214ad81545a35c5e62a4c2d6cf7275fd7a545f
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Dec 17 03:25:43 2010 +0000
USB: mcs7830: return negative if auto negotiate fails
The original code returns 0 on success and 1 on failure. In fact, at
this point, "ret" is already either zero or a negative error code so
we can just return it directly.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a130883d9528eefb66285728ba6a232d8fff9465
Merge: d9f4fbaf7053af43e6c72909c2aff18654717aed 65a6538a56d4c7ae8465f2a8420ddc65877b6779
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 23 10:13:30 2010 -0800
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit fdac1e0697356ac212259f2147aa60c72e334861
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date: Wed Dec 22 13:58:27 2010 +0000
irda: prevent integer underflow in IRLMP_ENUMDEVICES
If the user-provided len is less than the expected offset, the
IRLMP_ENUMDEVICES getsockopt will do a copy_to_user() with a very large
size value. While this isn't be a security issue on x86 because it will
get caught by the access_ok() check, it may leak large amounts of kernel
heap on other architectures. In any event, this patch fixes it.
Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d9f4fbaf7053af43e6c72909c2aff18654717aed
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Wed Dec 22 23:23:38 2010 +0000
tcp: cleanup of cwnd initialization in tcp_init_metrics()
Commit 86bcebafc5e7f5 ("tcp: fix >2 iw selection") fixed a case
when congestion window initialization has been mistakenly omitted
by introducing cwnd label and putting backwards goto from the
end of the function.
This makes the code unnecessarily tricky to read and understand
on a first sight.
Shuffle the code around a little bit to make it more obvious.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1bde5ac49398a064c753bb490535cfad89e99a5f
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Dec 23 09:32:46 2010 -0800
tcp: fix listening_get_next()
Alexey Vlasov found /proc/net/tcp could sometime loop and display
millions of sockets in LISTEN state.
In 2.6.29, when we converted TCP hash tables to RCU, we left two
sk_next() calls in listening_get_next().
We must instead use sk_nulls_next() to properly detect an end of chain.
Reported-by: Alexey Vlasov <renton@xxxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e1e359273576ee8fe27021356b064c772ed29af3
Author: David Sharp <dhsharp@xxxxxxxxxx>
Date: Wed Dec 22 16:38:24 2010 -0800
ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page
Fix two related problems in the event-copying loop of
ring_buffer_read_page.
The loop condition for copying events is off-by-one.
"len" is the remaining space in the caller-supplied page.
"size" is the size of the next event (or two events).
If len == size, then there is just enough space for the next event.
size was set to rb_event_ts_length, which may include the size of two
events if the first event is a time-extend, in order to assure time-
extends are kept together with the event after it. However,
rb_advance_reader always advances by one event. This would result in the
event after any time-extend being duplicated. Instead, get the size of
a single event for the memcpy, but use rb_event_ts_length for the loop
condition.
Signed-off-by: David Sharp <dhsharp@xxxxxxxxxx>
LKML-Reference: <1293064704-8101-1-git-send-email-dhsharp@xxxxxxxxxx>
LKML-Reference: <AANLkTin7nLrRPc9qGjdjHbeVDDWiJjAiYyb-L=gH85bx@xxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit 7693457547b729d9010a6014bbb8572b085f58d4
Merge: 5058cbf2c45c27e6f56f7a30b0bbe69efbd09936 7039c74cb54652ba6d726ad4d2a42dbac95a97be
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 23 16:37:31 2010 +0100
Merge branch 'fix/hda' into for-linus
commit 7039c74cb54652ba6d726ad4d2a42dbac95a97be
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 23 16:35:34 2010 +0100
ALSA: hda - Fix GPIO2-fixup for Sony laptops
The fix-up entries by the commit 2785591a9760c677a7ee6f541e751c23086f5bfd
ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
weren't applied in the right position. They had to be before the quirk
entry matching to all Sony devices.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 94462ad3b14739d158a1ab87bb30008c1e5a6bc1
Author: Steven Rostedt <rostedt@xxxxxxxxxxx>
Date: Mon Nov 29 13:15:42 2010 -0500
module: Move RO/NX module protection to after ftrace module update
The commit:
84e1c6bb38eb318e456558b610396d9f1afaabf0
x86: Add RO/NX protection for loadable kernel modules
Broke the function tracer with this output:
------------[ cut here ]------------
WARNING: at kernel/trace/ftrace.c:1014 ftrace_bug+0x114/0x171()
Hardware name: Precision WorkStation 470
Modules linked in: i2c_core(+)
Pid: 86, comm: modprobe Not tainted 2.6.37-rc2+ #68
Call Trace:
[<ffffffff8104e957>] warn_slowpath_common+0x85/0x9d
[<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
[<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
[<ffffffff8104e989>] warn_slowpath_null+0x1a/0x1c
[<ffffffff810a9dfe>] ftrace_bug+0x114/0x171
[<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
[<ffffffff810aa0db>] ftrace_process_locs+0x1ae/0x274
[<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
[<ffffffff810aa29e>] ftrace_module_notify+0x39/0x44
[<ffffffff814405cf>] notifier_call_chain+0x37/0x63
[<ffffffff8106e054>] __blocking_notifier_call_chain+0x46/0x5b
[<ffffffff8106e07d>] blocking_notifier_call_chain+0x14/0x16
[<ffffffff8107ffde>] sys_init_module+0x73/0x1f3
[<ffffffff8100acf2>] system_call_fastpath+0x16/0x1b
---[ end trace 2aff4f4ca53ec746 ]---
ftrace faulted on writing [<ffffffffa00026db>]
__process_new_adapter+0x7/0x34 [i2c_core]
The cause was that the module text was set to read only before ftrace
could convert the calls to mcount to nops. Thus, the conversions failed
due to not being able to write to the text locations.
The simple fix is to move setting the module to read only after the
module notifiers are called (where ftrace sets the module mcounts to nops).
Reported-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Acked-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit 104db7ff1d9d01a03a2568a156b19e1fd972e8bf
Merge: 4a7863cc2eb5f9804f1c4e9156619a801cd7f14f 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 23 14:19:45 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 394f4528c523d88daabd50f883a8d6b164075555
Merge: 90a8a73c06cc32b609a880d48449d7083327e11a 3c2dcf2aed5ea22ecf65a9a871c4963faec421b3
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 23 12:57:04 2010 +0100
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
commit 4d3024428f5c3ef5295e6f6fb257ae118b3f93a1
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 19:21:29 2010 +0000
drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 63ee41d794d9c555f84205517a68509848988760
Author: Eric Anholt <eric@xxxxxxxxxx>
Date: Mon Dec 20 18:40:06 2010 -0800
drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
The IPS driver is designed to be able to run detached from i915 and
just not enable GPU turbo in that case, in order to avoid module
dependencies between the two drivers. This means that we don't know
what the load order between the two is going to be, and we had
previously only supported IPS after (optionally) i915, but not i915
after IPS. If the wrong order was chosen, you'd get no GPU turbo, and
something like half the possible graphics performance.
Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit f797d22121404eac7b63f1291409f96bcab51c11
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 23 09:43:48 2010 +0000
drm/i915/sdvo: Add hdmi connector properties after initing the connector
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25012
Reported-by: Tõnu Raitviir <jussuf@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 06f37751af77192b424b2b0ff17dc08de65faba0
Author: Eric Anholt <eric@xxxxxxxxxx>
Date: Tue Dec 14 10:06:46 2010 -0800
drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.
It's required by the specs, but we don't know why. Let's not find out
why.
Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 5058cbf2c45c27e6f56f7a30b0bbe69efbd09936
Merge: 5aad6c5f7733b94e666e3bf8b57beb7bbee15886 87a1c8aaa0bced8acf4cd64672362492460c31ae
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 23 10:28:26 2010 +0100
Merge branch 'fix/misc' into for-linus
commit 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014
Author: Ajay Ramaswamy <ajay@xxxxxxxxxxxxx>
Date: Thu Dec 23 01:19:39 2010 -0800
Input: wacom - add support for digitizer in Lenovo W700
Signed-off-by: Ajay Ramaswamy <ajay@xxxxxxxxxxxxx>
Reviewed-by: Ping Cheng <pingc@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 1afe206ab6998ecd5f5485e02006b0578720a691
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 23 10:17:52 2010 +0100
ALSA: hda - Try to find an empty control index when it's occupied
When a mixer control element was already created with the given name,
try to find another index for avoiding conflicts, instead of breaking
with an error. This makes the driver more robust.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit ef8313bb1a22e7d2125d9d758aa8a81f1de91d81
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Dec 23 01:19:38 2010 -0800
Input: psmouse - disable the synaptics extension on OLPC machines
OLPC has switched to a Synaptics touchpad. It turns out that it's
pretty useless in absolute mode. This patch looks for an OLPC
system (via DMI tables), and refuses to init Synaptics mode in
that scenario (falling back to relative mode).
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 7ee99161a4febe53c906cb9becc596075fd6193e
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Dec 23 01:18:28 2010 -0800
Input: psmouse - fix up Synaptics comment
Minor comment fixup for typos and grammar. Noticed while adding a
separate workaround.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 2d7ec12b902ae00920cee50d98757376b2fa9467
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 23 10:16:05 2010 +0100
ALSA: hda - Fix conflict of d-mic capture volume controls
When the d-mics are assigned to the same purpose of another analog mic
pins, the driver doesn't compute the index properly, resulting in an
error with "existing control". This patch fixes it.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 26e20a108caca6231c6a5ec659f815a866904751
Merge: 691513f70d3957939a318da970987b876c720861 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 23 09:48:41 2010 +0100
Merge commit 'v2.6.37-rc7' into x86/security
commit cfb13c5db08c90311a5defdde9a0328ee788cca5
Merge: 4b6ba8aacbb3185703b797286547d0f8f3859b02 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Thu Dec 23 00:41:14 2010 -0700
Merge commit 'v2.6.37-rc7' into devicetree/next
commit 5f7bb3a439ce51ae8b92ca1dc93b91712224b69a
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 14 19:11:56 2010 -0800
[SCSI] megaraid_sas: Documentation update
The following patch updates the
Documentation/scsi/ChangeLog.megaraid_sas file.
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 9c915a8c99bce637226aa09cb05fc18486b229cb
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 21 13:34:31 2010 -0800
[SCSI] megaraid_sas: Add 9565/9285 specific code
This patch adds MegaRAID 9265/9285 (Device id 0x5b) specific code
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit cd50ba8ede5cd3c4606a8e5d163913da5ff36ad7
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 21 10:23:23 2010 -0800
[SCSI] megaraid_sas: Add struct megasas_instance_template changes
The following patch adds struct megasas_instance_template changes to
the megaraid_sas driver, and changes all code to use the new instance
entries:
irqreturn_t (*service_isr )(int irq, void *devp);
void (*tasklet)(unsigned long);
u32 (*init_adapter)(struct megasas_instance *);
u32 (*build_and_issue_cmd) (struct megasas_instance *, struct scsi_cmnd *);
void (*issue_dcmd) (struct megasas_instance *instance,
struct megasas_cmd *cmd);
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit b6d5d8808b4c563a56414a4c4c6d652b5f87c088
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 14 18:56:07 2010 -0800
[SCSI] megaraid_sas: Use lowest memory bar for SR-IOV VF support
The following patch modifies the megaraid_sas driver to select the
lowest memory bar available so the driver will work in SR-IOV VF
environments where the memory bar mapping changes.
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 80d9da98b4034edd31f6bacdb96c7489c4460173
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 21 10:17:40 2010 -0800
[SCSI] megaraid_sas: Add MSI-X support and msix_disable module parameter
This patch adds MSI-X support and 'msix_disable' module parameter to
the megaraid_sas driver.
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 46081b166415acb66d4b3150ecefcd9460bb48a1
Author: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Date: Mon Dec 20 18:44:45 2010 +0200
[SCSI] st: Increase success probability in driver buffer allocation
Modify allocation to try the minimum possible page order allowed by the HBA
scatter/gather segment limit in allocation of the driver's internal
buffer. This increases the probability of successful allocation. The
allocation may still fail if this minimum order is > 0.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Signed-off-by: Kai Makisara <kai.makisara@xxxxxxxxxxx>
Reported-by: Lukas Kolbe <lkolbe@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 373daacfce9ea0091cb3027572354ddebefb8ebb
Author: Kai Makisara <Kai.Makisara@xxxxxxxxxxx>
Date: Mon Dec 20 18:43:39 2010 +0200
[SCSI] st: Store page order before driver buffer allocation
The order of the pages allocated for the driver buffer must be stored before
allocation because it is used in freeing already allocated pages if
allocation fails.
Signed-off-by: Kai Makisara <kai.makisara@xxxxxxxxxxx>
Reported-by: Lukas Kolbe <lkolbe@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a87e3a67d57472f40da2218793ff6d25c4518498
Author: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
Date: Fri Dec 17 19:16:06 2010 -0500
[SCSI] scsi_debug: set resid to indicate no data-in when medium error
set resid to the requested data-in length when a MEDIUM ERROR is
simulated. This implies no valid data is returned in the data-in
buffer
Signed-off-by: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a8733c7baf457b071528e385a0b7d4aaec79287c
Author: James Bottomley <James.Bottomley@xxxxxxx>
Date: Fri Dec 17 15:36:34 2010 -0500
[SCSI] fix medium error problems with some arrays which can cause data corruption
Our current handling of medium error assumes that data is returned up
to the bad sector. This assumption holds good for all disk devices,
all DIF arrays and most ordinary arrays. However, an LSI array engine
was recently discovered which reports a medium error without returning
any data. This means that when we report good data up to the medium
error, we've reported junk originally in the buffer as good. Worse,
if the read consists of requested data plus a readahead, and the error
occurs in readahead, we'll just strip off the readahead and report
junk up to userspace as good data with no error.
The fix for this is to have the error position computation take into
account the amount of data returned by the driver using the scsi
residual data. Unfortunately, not every driver fills in this data,
but for those who don't, it's set to zero, which means we'll think a
full set of data was transferred and the behaviour will be identical
to the prior behaviour of the code (believe the buffer up to the error
sector). All modern drivers seem to set the residual, so that should
fix up the LSI failure/corruption case.
Reported-by: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
Cc: Stable Tree <stable@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit e819eb8687767cefca7b6abf5ac6d5efcf581eeb
Merge: ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f 0f16830e9f6de0a44cf1e473ffa80cbe612d5beb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 22 19:47:37 2010 -0800
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Include the connector name in the output_poll_execute() debug message
drm/radeon/kms: fix bug in r600_gpu_is_lockup
drm/radeon/kms: reorder display resume to avoid problems
drm/radeon/kms/evergreen: reset the grbm blocks at resume and init
drm/radeon/kms: fix evergreen asic reset
Revert "drm: Don't try and disable an encoder that was never enabled"
drm/radeon: Add early unregister of firmware fb's
drm/radeon: use aperture size not vram size for overlap tests
drm/radeon/kms/evergreen: flush hdp cache when flushing gart tlb
drm/radeon/kms: disable the r600 cb offset checker for linear surfaces
drm/radeon/kms: disable ss fixed ref divide
drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks
agp/intel: Fix missed cached memory flags setting in i965_write_entry()
drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
drm/i915/ringbuffer: Handle wrapping of the autoreported HEAD
drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI converter
commit ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f
Merge: 97dbf37d89b6d387a5fe79ffe3b72c37ec12db43 b93cef556162b0f33399bfe5f307c54f51554e09
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 22 19:47:04 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Support additional parent IDs for wm831x
mfd: Fix ab8500-core interrupt ffs bit bug
mfd: Supply IRQ base for WM832x devices
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
gpio: Fix null pointer dereference while accessing rdc321x platform_data
commit 97dbf37d89b6d387a5fe79ffe3b72c37ec12db43
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Tue Dec 21 17:24:31 2010 -0800
drivers/spi/spi.c: don't release the spi device twice
This was fixed by David Lamparter in v2.6.36-rc5 3486008 ("spi: free
children in spi_unregister_master, not siblings") and broken again in
v2.6.37-rc1~2^2~4 during the merge of 2b9603a0 ("spi: enable
spi_board_info to be registered after spi_master").
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: David Lamparter <equinox@xxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 4be2c95d1f7706ca0e74499f2bd118e1cee19669
Author: Jeff Mahoney <jeffm@xxxxxxxx>
Date: Tue Dec 21 17:24:30 2010 -0800
taskstats: pad taskstats netlink response for aligment issues on ia64
The taskstats structure is internally aligned on 8 byte boundaries but the
layout of the aggregrate reply, with two NLA headers and the pid (each 4
bytes), actually force the entire structure to be unaligned. This causes
the kernel to issue unaligned access warnings on some architectures like
ia64. Unfortunately, some software out there doesn't properly unroll the
NLA packet and assumes that the start of the taskstats structure will
always be 20 bytes from the start of the netlink payload. Aligning the
start of the taskstats structure breaks this software, which we don't
want. So, for now the alignment only happens on architectures that
require it and those users will have to update to fixed versions of those
packages. Space is reserved in the packet only when needed. This ifdef
should be removed in several years e.g. 2012 once we can be confident
that fixed versions are installed on most systems. We add the padding
before the aggregate since the aggregate is already a defined type.
Commit 85893120 ("delayacct: align to 8 byte boundary on 64-bit systems")
previously addressed the alignment issues by padding out the pid field.
This was supposed to be a compatible change but the circumstances
described above mean that it wasn't. This patch backs out that change,
since it was a hack, and introduces a new NULL attribute type to provide
the padding. Padding the response with 4 bytes avoids allocating an
aligned taskstats structure and copying it back. Since the structure
weighs in at 328 bytes, it's too big to do it on the stack.
Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
Reported-by: Brian Rogers <brian@xxxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Cc: Guillaume Chazarain <guichaz@xxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 4e06fd14d5fa78826397c891654a37e5a36ee827
Author: Will Newton <will.newton@xxxxxxxxx>
Date: Tue Dec 21 17:24:29 2010 -0800
include/linux/unaligned: pack the whole struct rather than just the field
The current packed struct implementation of unaligned access adds the
packed attribute only to the field within the unaligned struct rather than
to the struct as a whole. This is not sufficient to enforce proper
behaviour on architectures with a default struct alignment of more than
one byte.
For example, the current implementation of __get_unaligned_cpu16 when
compiled for arm with gcc -O1 -mstructure-size-boundary=32 assumes the
struct is on a 4 byte boundary so performs the load of the 16bit packed
field as if it were on a 4 byte boundary:
__get_unaligned_cpu16:
ldrh r0, [r0, #0]
bx lr
Moving the packed attribute to the struct rather than the field causes the
proper unaligned access code to be generated:
__get_unaligned_cpu16:
ldrb r3, [r0, #0] @ zero_extendqisi2
ldrb r0, [r0, #1] @ zero_extendqisi2
orr r0, r3, r0, asl #8
bx lr
Signed-off-by: Will Newton <will.newton@xxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 91facc22dec964683aef88f5620a790a6e46b98a
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Dec 21 17:24:28 2010 -0800
led_class: fix typo in blink API
When I added led_blink_set I had a typo: the return value of the hw
offload is a regular error code that is zero when succesful, and in that
case software emulation should not be used, rather than the other way
around.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 5a2d6e31c683b361b5012aec1768c994fea3f25a
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Tue Dec 21 17:24:27 2010 -0800
backlight: cr_bllcd.c: fix a memory leak
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Cc: Thomas Hellstrom <thomas@xxxxxxxxxxxxxxxxxxxx>
Cc: Alan Hourihane <alanh@xxxxxxxxxxxxxxxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 0d1836c366157994474afd29632992375a3dd20c
Author: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
Date: Tue Dec 21 17:24:26 2010 -0800
mm/migrate.c: fix compilation error
GCC complained about update_mmu_cache() not being defined in migrate.c.
Including <asm/tlbflush.h> seems to solve the problem.
Signed-off-by: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 118364948fad7b6c0469ef2d3ddaee447d7a0b5f
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Tue Dec 21 17:24:24 2010 -0800
rtc: rs5c372: fix buffer size
Match the buffer size to the amount of initialized values. Before, it was
one too big and thus destroyed the neighbouring register causing the clock
to run at false speeds.
Reported-by: Andre van Rooyen <a.v.rooyen@xxxxxxxxx>
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 6900609612d26ca6ba11935613aa9db112613a48
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Tue Dec 21 17:24:23 2010 -0800
MAINTAINERS: update geode entry
Remove Jordan as the geode maintainer (he's not been interested in geode for
some time), and add myself as the maintainer.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Cc: Daniel Drake <dsd@xxxxxxxxxx>
Cc: Jordan Crouse <jordan@xxxxxxxxxxxxxxxxx>
Cc: Chris Ball <cjb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit e254811c205ec539b648cff54a7852ee8dcd2e5e
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Tue Dec 21 17:24:22 2010 -0800
gpiolib: gpio_request_one(): add missing gpio_free()
If GPIO request succeeds, but configuration fails, it should be released.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Acked-by: Eric Miao <eric.miao@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit d153ba64450b9371158c6516d6cac120faace44c
Author: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Date: Tue Dec 21 17:24:21 2010 -0800
writeback: do uninterruptible sleep in balance_dirty_pages()
Using TASK_INTERRUPTIBLE in balance_dirty_pages() seems wrong. If it's
going to do that then it must break out if signal_pending(), otherwise
it's pretty much guaranteed to degenerate into a busywait loop. Plus we
*do* want these processes to appear in D state and to contribute to load
average.
So it should be TASK_UNINTERRUPTIBLE. -- Andrew Morton
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit f06328d7721ad3852c45eb2a10a0c8f9439b5f33
Author: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Date: Tue Dec 21 17:24:20 2010 -0800
logfs: fix "Kernel BUG at readwrite.c:1193"
This happens when __logfs_create() tries to write a new inode to the disk
which is full.
__logfs_create() associates the transaction pointer with inode. During
the logfs_write_inode() function call chain this transaction pointer is
moved from inode to page->private using function move_inode_to_page
(do_write_inode() -> inode_to_page() -> move_inode_to_page)
When the write inode fails, the transaction is aborted and iput is called
on the failed inode. During delete_inode the same transaction pointer
associated with the page is getting used. Thus causing kernel BUG.
The patch checks for error in write_inode() and restores the page->private
to NULL.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=20162
Signed-off-by: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Cc: Joern Engel <joern@xxxxxxxxx>
Cc: Florian Mickler <florian@xxxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Maciej Rutecki <maciej.rutecki@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit eabb26cacdec33ca6f6fcaee762b57c2205169ca
Author: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Date: Tue Dec 21 17:24:19 2010 -0800
logfs: fix deadlock in logfs_get_wblocks, hold and wait on super->s_write_mutex
do_logfs_journal_wl_pass() should use GFP_NOFS for memory allocation GC
code calls btree_insert32 with GFP_KERNEL while holding a mutex
super->s_write_mutex.
The same mutex is used in address_space_operations->writepage(), and a
call to writepage() could be triggered as a result of memory allocation
in btree_insert32, causing a deadlock.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=20342
Signed-off-by: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Cc: Joern Engel <joern@xxxxxxxxx>
Cc: Florian Mickler <florian@xxxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Maciej Rutecki <maciej.rutecki@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 7a2d19bced51af31d2c9ff55219400ed0a6c012f
Author: Mel Gorman <mel@xxxxxxxxx>
Date: Tue Dec 21 17:24:18 2010 -0800
mm: vmscan: tracepoint: account for scanned pages similarly for both ftrace and vmstat
When correlating ftrace results with /proc/vmstat, I noticed that the
reporting scripts value for "pages scanned" differed significantly. Both
values were "right" depending on how you look at it.
The difference is due to vmstat only counting scanning of the inactive
list towards pages scanned. The analysis script for the tracepoint counts
active and inactive list yielding a far higher value than vmstat. The
resulting scanning/reclaim ratio looks much worse. The tracepoint is ok
but this patch updates the reporting script so that the report values for
scanned are similar to vmstat.
Signed-off-by: Mel Gorman <mel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit dd9e5efe3aa9fc5b1ce484a531ecdba3a7a30bbf
Author: Minchan Kim <minchan.kim@xxxxxxxxx>
Date: Tue Dec 21 17:24:16 2010 -0800
mm/compaction.c: avoid double mem_cgroup_del_lru()
del_page_from_lru_list() already called mem_cgroup_del_lru(). So we must
not call it again. It adds unnecessary overhead.
It was not a runtime bug because the TestClearPageCgroupAcctLRU() early in
mem_cgroup_del_lru_list() will prevent any double-deletion, etc.
Signed-off-by: Minchan Kim <minchan.kim@xxxxxxxxx>
Acked-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Acked-by: Mel Gorman <mel@xxxxxxxxx>
Reviewed-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 0b50c691f93a973136dc821ef11372ffdfae9646
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 18:42:36 2010 -0800
omap2+: Initialize serial port for dynamic remuxing for n8x0
Use omap_serial_init_port so we can let the serial code handle the
remuxing of the RX pads. Note that this patch alone is not enough
and additional GPIO related patches are needed.
Only initialize uart3_rx_irrx pin, the other uart pins can be
stay static.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 40e44399301b6dbd997408a184140b79b77f632d
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 18:42:35 2010 -0800
omap2+: Add struct omap_board_data and use it for platform level serial init
This is needed to pass board specific data such as pads used to the
platform level driver init code.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 8d9af88f55be89fa4c897ded3204ef12c947731e
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 18:42:35 2010 -0800
omap2+: Allow hwmod state changes to mux pads based on the state changes
Allow hwmod state changes to mux pads based on the state changes.
By default, only enable and disable the pads. In some rare cases
dynamic remuxing for the idles states is needed, this can be done
by passing the enable, idle, and off pads from board-*.c file along
with OMAP_DEVICE_PAD_REMUX flag.
Thanks to Paul Walmsley <paul@xxxxxxxxxxx> for the comments on the
hwmod related changes.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 9796b323b5a1940f9ec62c3a6cf7e442bf540d53
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 18:42:35 2010 -0800
omap2+: Add support for hwmod specific muxing of devices
This allows adding hwmod specific pads dynamically during the
platform device init.
Note that we don't currently have the hwmod specific signals
listed in the hwmod data, but struct omap_hwmod_mux_info will
make that possible if necessary.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 8419fdbaf2118a0a169441be82f09f7be93a5ca1
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 18:42:35 2010 -0800
omap2+: Add omap_mux_get_by_name
Do this by splitting _omap_mux_init_signal as it already has most
of the necessary features.
Based on an earlier patch by Dan Murphy <dmurphy@xxxxxx>.
Cc: Dan Murphy <dmurphy@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit b7e03ec9a6b9d0c0cb1e435026d46dfcd78e48ac
Merge: 762e30239cce9ff0d82227ade663feed2f6283d8 b51aff057c9d0ef6c529dc25fd9f775faf7b6c63
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 22 17:34:40 2010 -0800
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 17f9cc3124c97f50a19a7597e5f29f915b5b835c
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date: Wed Dec 22 23:00:34 2010 -0200
Bluetooth: Improve handling of HCI control channel in bind
Does not allow any channel different of HCI_CHANNEL_RAW and
HCI_CHANNEL_CONTROL to bind.
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 23bb57633df97ede067ea26f3cdc8a7ba2cd8109
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Tue Dec 21 23:01:27 2010 +0200
Bluetooth: Fix __hci_request synchronization for hci_open_dev
The initialization function used by hci_open_dev (hci_init_req) sends
many different HCI commands. The __hci_request function should only
return when all of these commands have completed (or a timeout occurs).
Several of these commands cause hci_req_complete to be called which
causes __hci_request to return prematurely.
This patch fixes the issue by adding a new hdev->req_last_cmd variable
which is set during the initialization procedure. The hci_req_complete
function will no longer mark the request as complete until the command
matching hdev->req_last_cmd completes.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit c71e97bfaadfa727669fcfcf12301744fd169091
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Mon Dec 13 21:07:07 2010 +0200
Bluetooth: Add management events for controller addition & removal
This patch adds Bluetooth Management interface events for controller
addition and removal. The events correspond to the existing HCI_DEV_REG
and HCI_DEV_UNREG stack internal events.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit f7b64e69c7c75c8e9f2d5e23edec8de1ce883bcc
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Mon Dec 13 21:07:06 2010 +0200
Bluetooth: Add read_info management command
This patch implements the read_info command which is used to fetch basic
info about an adapter.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit faba42eb2a8cf905ed26d540c3c93d429e327224
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Mon Dec 13 21:07:05 2010 +0200
Bluetooth: Add read_index_list management command
This patch implements the read_index_list command through which
userspace can get a list of current adapter indices.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 02d981292ad3149e8e5f37cffbccedab1a8576d8
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Mon Dec 13 21:07:04 2010 +0200
Bluetooth: Add read_version management command
This patch implements the initial read_version command that userspace
will use before any other management interface operations.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit e41d8b4e131a41f2a3b74aaa783b16aa46376d8e
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Mon Dec 13 21:07:03 2010 +0200
Bluetooth: Add error handling for managment command handlers
The command handlers for bluetooth management messaging should be able
to report errors (such as memory allocation failures) to the higher
levels in the call stack.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 762e30239cce9ff0d82227ade663feed2f6283d8
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Wed Dec 22 03:07:52 2010 +0000
atl1c: Do not use legacy PCI power management
The atl1c driver uses the legacy PCI power management, so it has to
do some PCI-specific things in its ->suspend() and ->resume()
callbacks and they are not done correctly.
Convert atl1c to the new PCI power management framework and make it
let the PCI subsystem handle all of the PCI-specific aspects of
device handling during system power transitions.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f622691c91cd1bb27d03a5caa8a43822572c62bc
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Wed Dec 22 03:00:39 2010 +0000
pch_can: Fix array miss-pointing issue
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 05fad3e72e98e57274b8930a08f8b476048f5022
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 22 23:04:17 2010 +0000
OMAP2: PM: fix compile error when !CONFIG_SUSPEND
When CONFIG_SUSPEND is not enabled, none of the system PM methods are
used, so do not compile them in.
Thanks to Charles Manning for reporting the problem and proposing
an initial patch.
Reported-by: Charles Manning <manningc2@xxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 1c4655651f1377297425525b250b2e4b5462015b
Merge: f400c82efb474b2ccf01c796b60b36408f7845a3 b35cecf978e33bf8f4be0f36ffe00fe10f381c4a
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 15:08:05 2010 -0800
Merge branch 'pm-sr' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
commit f400c82efb474b2ccf01c796b60b36408f7845a3
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Mon Dec 6 19:08:54 2010 -0700
MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
Add myself and Benoît as co-maintainers of the OMAP hwmod core code.
(The OMAP hwmod code manages the integration of IP blocks on the OMAP SoC
family.)
Add Benoît as the maintainer of OMAP4-based SoC hwmod mode.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Benoît Cousson <b-cousson@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 25cf0398bdf365d027e171116aa4a281e9cd3c1c
Merge: 9326845f45650f6af9953a4b6a31e89b54fab82f 59bdd133561a432c4655146e283caf85fa64c2fb
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 22:46:24 2010 +0000
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
commit 09c85a440d113a8e6f32bc616423d7684970c37c
Merge: ee81e7a0a86a3b40837de4a5f514c2d3758af20e a74b74a5555c741ed3df896096e33b853995631e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 22 22:45:48 2010 +0000
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
commit 1da0c89c66753860ccfe81eb327c25db46c2a24a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:56:47 2010 +0000
ARM: versatile: convert sched_clock() to use new infrastructure
Convert versatile platforms to use the new sched_clock() infrastructure
for extending 32bit counters to full 64-bit nanoseconds.
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit f06a1624621527ef597ae4b3b795553fc1b2eff2
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:55:06 2010 +0000
ARM: orion: convert sched_clock() to use new infrastructure
Convert orion platforms to use the new sched_clock() infrastructure for
extending 32bit counters to full 64-bit nanoseconds.
Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit dc548fbbd2ecd0fc3b02301d551e5f8e19ae58fd
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:53:51 2010 +0000
ARM: omap: convert sched_clock() to use new infrastructure
Convert omap to use the new sched_clock() infrastructure for extending
32bit counters to full 64-bit nanoseconds.
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ec05aa139939d9c7b790041a379f0e752b2f1a4d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:53:02 2010 +0000
ARM: nomadik: convert sched_clock() to use new infrastructure
Convert nomadik platforms to use the new sched_clock() infrastructure
for extending 32bit counters to full 64-bit nanoseconds.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 08f26b1ef25a2f7b52afcb805d260fd5a000a7f6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:52:10 2010 +0000
ARM: iop: convert sched_clock() to use new infrastructure
Convert iop platforms to use the new sched_clock() infrastructure for
extending 32bit counters to full 64-bit nanoseconds.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5c21b7ca2c1cca3758a1d357dd57987c96ad1aa0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:50:14 2010 +0000
ARM: u300: convert sched_clock() to use new infrastructure
Convert u300 to use the new sched_clock() infrastructure for extending
32bit counters to full 64-bit nanoseconds.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e3f4c0ab916334e861fc49eeb2673a8c13e978e7
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:49:42 2010 +0000
ARM: tegra: convert sched_clock() to use new infrastructure
Convert tegra to use the new sched_clock() infrastructure for extending
32bit counters to full 64-bit nanoseconds.
Tested-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5094b92f1c7d0f21c5d4411ba7415bac0684210f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:49:06 2010 +0000
ARM: sa1100: convert sched_clock() to use new infrastructure
Convert sa1100 to use the new sched_clock() infrastructure for extending
32bit counters to full 64-bit nanoseconds.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 7ce830188199c23aaeaf0c5ccc28b73c32b6df02
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:48:15 2010 +0000
ARM: pxa: convert sched_clock() to use new infrastructure
Convert pxa to use the new sched_clock() infrastructure for extending
32bit counters to full 64-bit nanoseconds.
Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 28bb7bc61a8cd48716d38d9c153fdc524f09870a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:46:48 2010 +0000
ARM: mmp: convert sched_clock() to use new infrastructure
Convert mmp to use the new sched_clock() infrastructure for extending
32bit counters to full 64-bit nanoseconds.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5b0d495c067d843c52fc1f9edbca29d5e9368b10
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:23:13 2010 +0000
ARM: ixp4xx: convert sched_clock() to use new infrastructure
Convert ixp4xx to use the new sched_clock() infrastructure for
extending 32bit counters to full 64-bit nanoseconds.
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 112f38a4a31668eb6a7d91d128296a26afdf7c4b
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 19:23:07 2010 +0000
ARM: sched_clock: provide common infrastructure for sched_clock()
Provide common sched_clock() infrastructure for platforms to use to
create a 64-bit ns based sched_clock() implementation from a counter
running at a non-variable clock rate.
This implementation is based upon maintaining an epoch for the counter
and an epoch for the nanosecond time. When we desire a sched_clock()
time, we calculate the number of counter ticks since the last epoch
update, convert this to nanoseconds and add to the epoch nanoseconds.
We regularly refresh these epochs within the counter wrap interval.
We perform a similar calculation as above, and store the new epochs.
We read and write the epochs in such a way that sched_clock() can easily
(and locklessly) detect when an update is in progress, and repeat the
loading of these constants when they're known not to be stable. The
one caveat is that sched_clock() is not called in the middle of an
update. We achieve that by disabling IRQs.
Finally, if the clock rate is known at compile time, the counter to ns
conversion factors can be specified, allowing sched_clock() to be tightly
optimized. We ensure that these factors are correct by providing an
initialization function which performs a run-time check.
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
Tested-by: Olof Johansson <olof@xxxxxxxxx>
Tested-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Reviewed-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b5776c4a6d0afc13697e8452b9ebe1cc4d961b74
Author: john stultz <johnstul@xxxxxxxxxx>
Date: Thu Dec 16 19:03:27 2010 +0000
Fix rounding in clocks_calc_mult_shift()
Russell King reports:
| On the ARM dev boards, we have a 32-bit counter running at 24MHz. Calling
| clocks_calc_mult_shift(&mult, &shift, 24MHz, NSEC_PER_SEC, 60) gives
| us a multiplier of 2796202666 and a shift of 26.
|
| Over a large counter delta, this produces an error - lets take a count
| from 362976315 to 4280663372:
|
| (4280663372-362976315) * 2796202666 / 2^26 - (4280663372-362976315) * (1000/24)
| => -38.91872422891230269990
|
| Can we do better?
|
| (4280663372-362976315) * 2796202667 / 2^26 - (4280663372-362976315) * (1000/24)
| 19.45936211449532822051
|
| which is about twice as good as the 2796202666 multiplier.
|
| Looking at the equivalent divisions obtained, 2796202666 / 2^26 gives
| 41.66666665673255920410ns per tick, whereas 2796202667 / 2^26 gives
| 41.66666667163372039794ns. The actual value wanted is 1000/24 =
| 41.66666666666666666666ns.
Fix this by ensuring we round to nearest when calculating the
multiplier.
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
Tested-by: Olof Johansson <olof@xxxxxxxxx>
Tested-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5e06b6492e53ab2a4e467763a9ee9f70b032c301
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 15 19:19:25 2010 +0000
ARM: ensure all sched_clock() implementations are notrace marked
ftrace requires sched_clock() to be notrace. Ensure that all
implementations are so marked. Also make sure that they include
linux/sched.h
Also ensure OMAP clocksource read functions are marked notrace as
they're used for sched_clock() too.
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
Tested-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 684e94cbcb5add60356d124166e40feb2174f0f1
Author: Colin Cross <ccross@xxxxxxxxxxx>
Date: Wed Nov 17 16:20:15 2010 -0800
ARM: tegra: timer: Separate clocksource and sched_clock
tegra_clocksource_read should not use cnt32_to_63, wrapping is
already handled in the clocksource code. Move the cnt32_to_63
into the sched_clock function, and replace the use of clocksource
mult and shift with a multiplication by 1000 to convert us to ns.
Acked-by: John Stultz <johnstul@xxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Tested-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Colin Cross <ccross@xxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 11e718a6535c0c7a375b24c3ad60a98b988090c8
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:21:52 2010 +0000
ARM: realview/versatile: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 2218543fe0c40ce36fa165c5003072cc8b236c34
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:21:41 2010 +0000
ARM: stmp: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:21:33 2010 +0000
ARM: orion: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e0387320c32d4b9852e6436233274003e82318a6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:21:21 2010 +0000
ARM: spear: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Viresh Kumar <viresh.kumar@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 8492fd28987732e42f33a3711299927e8905d448
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:20:49 2010 +0000
ARM: nomadik: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:20:35 2010 +0000
ARM: mxc: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d28b116b9239b603f790a5ed6f0c5fe329561b49
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:20:23 2010 +0000
ARM: iop: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 894cf56b1a64b65360086c2c890c2ae7f257793f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:20:06 2010 +0000
ARM: nuc: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Wan zongshun <mcuos.com@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit da797478c1ba05a858c7719a02ce0856a5bb69ce
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:19:55 2010 +0000
ARM: U300: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6b46340a18e7552656097119d121b4b42049dde1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:19:44 2010 +0000
ARM: tcc8k: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 2c760b5b52a56e8b92c384dc9611e23fd4980d03
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:19:35 2010 +0000
ARM: SA11x0: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 71c874529904818a2888a650425369e0842ff28d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:19:22 2010 +0000
ARM: s5pv310: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit f62ae0ce4369effc432ea25df09c88d7aa08965e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:19:11 2010 +0000
ARM: PXA: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 8437c25e78c3af2b31bf6c8942494e34e267f446
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:18:44 2010 +0000
ARM: omap: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b460ddbbe29a45cc13e3f13314ec9aed7e9412f2
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:18:32 2010 +0000
ARM: ns9xxx: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:18:21 2010 +0000
ARM: netx: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ff9c9772480f06bc7164217b93ebb99fc088539f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:18:12 2010 +0000
ARM: MSM: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Tested-By: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Acked-by: David Brown <davidb@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5975f496e07e0f1e396939308b815f99907440ea
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:18:04 2010 +0000
ARM: mmp: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 594cbf2f4ceaaacc706eb1302ff139a61092ec6f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:17:52 2010 +0000
ARM: lpc32xx: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b7c7c50adcf0d9c901542c5db8d795fe226bb454
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:17:40 2010 +0000
ARM: ixp4xx: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 08963dab7c6b0ba6a687cb008299eabbbeff7282
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:17:24 2010 +0000
ARM: integrator: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 7c044be50d4bdc33e039a65956b8a927feecaaa3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:17:12 2010 +0000
ARM: davinci: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6eda51192fb1c767f792e92c67b9a4fd73c1fcba
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:16:39 2010 +0000
ARM: bcmring: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-By: Scott Branden <sbranden@xxxxxxxxxxxx>
Acked-By: Jiandong Zheng <jdzheng@xxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee
Author: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
Date: Wed Dec 22 17:37:13 2010 +0100
perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen
This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850.
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <m3y67hsr0m.fsf@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit d3678758048308049cdad31ec3eae063be17c0db
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Dec 21 23:38:37 2010 -0200
perf test: Look forward for symbol aliases
Not just before, fixing these false positives:
[acme@mica linux]$ perf test -v 1
1: vmlinux symtab matches kallsyms:
--- start ---
Looking at the vmlinux_path (6 entries long)
Using //lib/modules/2.6.37-rc5-00180-ge06b6bf/build/vmlinux for symbols
0xffffffff81058dc0: diff name v: sys_vm86old k: sys_ni_syscall
0xffffffff81058dc0: diff name v: sys_vm86 k: sys_ni_syscall
0xffffffff81058dc0: diff name v: sys_subpage_prot k: sys_ni_syscall
0xffffffff810b5f7c: diff name v: probe_kernel_write k: __probe_kernel_write
0xffffffff810b5fe5: diff name v: probe_kernel_read k: __probe_kernel_read
0xffffffff811bc380: diff name v: __memset k: memset
0xffffffff81384a98: diff name v: __sched_text_start k: sleep_on_common
0xffffffff81386750: diff name v: __sched_text_end k: _raw_spin_trylock
0xffffffff8138cee8: diff name v: __irqentry_text_start k: do_IRQ
0xffffffff8138f079: diff name v: __start_notes k: _etext
0xffffffff8138f079: diff name v: __stop_notes k: _etext
---- end ----
vmlinux symtab matches kallsyms: FAILED!
[acme@mica linux]$
Some are weak functions, others are just markers, etc. They get in the rb tree
with the same addr, so we need to look around to find the symbol with the same
name.
We were looking just at the previous entries with the same addr, look forward
too.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Han Pingtian <phan@xxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit b35cecf978e33bf8f4be0f36ffe00fe10f381c4a
Author: Thara Gopinath <thara@xxxxxx>
Date: Wed Aug 18 12:23:12 2010 +0530
OMAP4: Smartreflex framework extensions
This patch extends the smartreflex framework to support
OMAP4. The changes are minor like compiling smartreflex Kconfig
option for OMAP4 also, and a couple of OMAP4 checks in
the smartreflex framework.
The change in sr_device.c where new logic has to be introduced
for reading the efuse registers is due to the fact that in OMAP4
the efuse registers are 24 bit aligned. A __raw_readl will
fail for non-32 bit aligned address and hence the 8-bit read
and shift.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit fb200cfb2330b959eabc94e2f2c15717ce8466af
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Wed Aug 18 12:22:52 2010 +0530
OMAP4: hwmod: Add inital data for smartreflex modules.
This patch adds the hwmod details for OMAP4 smartreflex modules.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 1376ee1d191b32d0be6d2956f1a6f3dd63251e2e
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:25 2010 +0530
OMAP4: PM: Program correct init voltages for scalable VDDs
By default the system boots up at nominal voltage for every
voltage domain in the system. This patch puts vdd_mpu, vdd_iva
and vdd_core to the correct boot up voltage as per the opp tables
specified. This patch implements this by matching the rate of
the main clock of the voltage domain with the opp table and
picking up the correct voltage.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit bd38107b565a41d994aa22db0962ffcc34ebef02
Author: Thara Gopinath <thara@xxxxxx>
Date: Fri Dec 10 23:15:23 2010 +0530
OMAP4: Adding voltage driver support
OMAP4 has three scalable voltage domains vdd_mpu, vdd_iva
and vdd_core. This patch adds the voltage tables and other
configurable voltage processor and voltage controller
settings to control these three scalable domains in OMAP4.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 3b01a413c196c91040d41c86e5b56f76bb369f74
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Wed Dec 22 01:08:36 2010 -0200
perf symbols: Improve kallsyms symbol end addr calculation
For kallsyms we don't have the symbol address end, so we do an extra pass and
set the symbol end addr as being the start of the next minus one.
But this was being done just after we filtered the symbols of a
particular type (functions, variables), so the symbol end was sometimes
after what it really is.
Fixing up symbol end also was falling apart when we have symbol aliases,
then the end address of all but the last alias was being set to be
before its start.
Fix it up by checking for symbol aliases and making the kallsyms__parse
routine use the next symbol, whatever its type, as the limit for the
previous symbol, passing that end address to the callback.
This was detected by the 'perf test' synthetic paranoid regression
tests, fix it up so that even that case doesn't mislead us.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 7bc3ed9ae632b9c94d3721d555d3452e24ca8ee3
Author: Thara Gopinath <thara@xxxxxx>
Date: Fri Dec 10 23:15:16 2010 +0530
OMAP4: Register voltage PMIC parameters with the voltage layer
TWL6030 is the power IC used along with OMAP4 in OMAP4 SDPs,
blaze boards and panda boards. This patch registers the OMAP4
PMIC specific information with the voltage layer.
This also involves implementing a different formula for
voltage to vsel and vsel to voltage calculations from
TWL4030.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 1482d8be5525eccdec6286677d40af29da03a30c
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:25 2010 +0530
OMAP3: PM: Program correct init voltages for VDD1 and VDD2
By default the system boots up at nominal voltage for every
voltage domain in the system. This patch puts VDD1 and VDD2
to the correct boot up voltage as per the opp tables specified.
This patch implements this by matching the rate of the main clock
of the voltage domain with the opp table and picking up the correct
voltage.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 077fceca3a5db69791d64723ffba1caad2f03a08
Author: Thara Gopinath <thara@xxxxxx>
Date: Wed Oct 27 20:29:37 2010 +0530
OMAP3: PM: Adding debug support to Voltage and Smartreflex drivers
This patch adds debug support to the voltage and smartreflex drivers.
This means a whole bunch of voltage processor and smartreflex
parameters are now visible through the pm debugfs.
The voltage parameters can be viewed at
/debug/voltage/vdd_<x>/<parameter>
and the smartreflex parameters can be viewed at
/debug/voltage/vdd_<x>/smartreflex/<parameter>
Also smartreflex n-target values are now exposed out at
/debug/voltage/vdd_<x>/smartreflex/nvalue/<voltage>
This is a read-write interface which means user has the
flexibility to change the n-target values for any opp.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit fbc319f67660ede23cc22f3af5df559693f8062e
Author: Thara Gopinath <thara@xxxxxx>
Date: Fri Dec 10 22:51:05 2010 +0530
OMAP3: PM: Register TWL4030 pmic info with the voltage driver.
This patch registers the TWL4030 PMIC specific informtion
with the voltage driver. Failing this patch the voltage driver
is unware of the formula to use for vsel to voltage and vice versa
conversion and lot of other PMIC dependent parameters.
This file is based on the arch/arm/plat-omap opp_twl_tpl.c file
by Paul Walmsley. The original file is replaced by this file.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit fa765823a3cbb9ce1b13ce2832109a50d899c471
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:25 2010 +0530
OMAP3: PM: Adding smartreflex class3 driver
Smartreflex Class3 implementation continuously monitors
silicon performance and instructs the Voltage Processors
to increase or decrease the voltage.
This patch adds smartreflex class 3 driver. This driver hooks
up with the generic smartreflex driver smartreflex.c to abstract
out class specific implementations out of the generic driver.
Class3 driver is chosen as the default class driver for smartreflex.
If any other class driver needs to be implemented, the init of that
driver should be called from the board file. That way the new class driver
will over-ride the Class3 driver.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit d34427267186827dfd62bd8cf726601fffb22534
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:24 2010 +0530
OMAP3: PM: Adding smartreflex hwmod data
This patch adds the smartreflex hwmod data for OMAP3430
and OMAP3630.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 0c0a5d61ed9319e7e666990a7888f3b00868ac20
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:23 2010 +0530
OMAP3: PM: Adding smartreflex device file.
This patch adds support for device registration of various
smartreflex module present in the system. This patch introduces
the platform data for smartreflex devices which include
the efused n-target vaules, a parameter to indicate
whether smartreflex autocompensation needs to be
enabled on init or not. An API
omap_enable_smartreflex_on_init is provided for the
board files to enable smartreflex autocompensation during
system boot up.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 984aa6dbf4ca5be806fee217311c9cc68e8f2e88
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:22 2010 +0530
OMAP3: PM: Adding smartreflex driver support.
SmartReflex modules do adaptive voltage control for real-time
voltage adjustments. With Smartreflex the power supply voltage
can be adapted to the silicon performance(manufacturing process,
temperature induced performance, age induced performance etc).
There are differnet classes of smartreflex implementation.
Class-0: Manufacturing Test Calibration
Class-1: Boot-Time Software Calibration
Class-2: Continuous Software Calibration
Class-3: Continuous Hardware Calibration
Class-4: Fully Integrated Power Management
OMAP3 has two smartreflex modules one associated with VDD MPU and the
other associated with VDD CORE.
This patch adds support for smartreflex driver. The driver is designed
for Class-1 , Class-2 and Class-3 support and is a platform driver.
Smartreflex driver can be enabled through a Kconfig option
"SmartReflex support" under "System type"->"TI OMAP implementations" menu.
Smartreflex autocompensation feature can be enabled runtime through
a debug fs option.
To enable smartreflex autocompensation feature
echo 1 > /debug/voltage/vdd_<X>/smartreflex/autocomp
To disable smartreflex autocompensation feature
echo 0 > /debug/voltage/vdd_<X>/smartreflex/autocomp
where X can be mpu, core , iva etc.
This patch contains code originally in linux omap pm branch.
Major contributors to this driver are
Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley,
Nishant Menon, Kevin Hilman.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 3b92408c7dfeb918fdd2f9fadc73177a59ad621c
Author: Thara Gopinath <thara@xxxxxx>
Date: Wed Aug 18 16:21:58 2010 +0530
OMAP: Introduce voltage domain information in the hwmod structures
This patch extends the device hwmod structure to contain
info about the voltage domain to which the device belongs to.
This is needed to support a device based DVFS where the
device knows which voltage domain it belongs to.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 2f34ce81b8c05c900e45bd88595cc154f7bb5957
Author: Thara Gopinath <thara@xxxxxx>
Date: Sat May 29 22:02:21 2010 +0530
OMAP3: PM: Adding voltage driver support.
This patch adds voltage driver support for OMAP3. The driver
allows configuring the voltage controller and voltage
processors during init and exports APIs to enable/disable
voltage processors, scale voltage and reset voltage.
The driver maintains the global voltage table on a per
VDD basis which contains the various voltages supported by the
VDD along with per voltage dependent data like smartreflex
efuse offset, errminlimit and voltage processor errorgain.
The driver also allows the voltage parameters dependent on the
PMIC to be passed from the PMIC file through an API.
The driver allows scaling of VDD voltages either through
"vc bypass method" or through "vp forceupdate method" the
choice being configurable through the board file.
This patch contains code originally in linux omap pm branch
smartreflex driver. Major contributors to this driver are
Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley,
Nishant Menon, Kevin Hilman. The separation of PMIC parameters
into a separate structure which can be populated from
the PMIC file is based on the work of Lun Chang from Motorola
in an internal tree.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
[khilman: fixed link error for OMAP2-only defconfig]
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit a3ba81131aca243bfecfa78c42edec0cd69f72d6
Author: Ben Gamari <bgamari.foss@xxxxxxxxx>
Date: Wed Dec 22 13:30:14 2010 -0500
Make fixdep error handling more explicit
Also add missing error handling to fstat call
Signed-off-by: Ben Gamari <bgamari.foss@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 4a7863cc2eb5f9804f1c4e9156619a801cd7f14f
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Wed Dec 22 14:00:03 2010 -0500
x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR
The x86 arch has shifted its use of the nmi_watchdog from a
local implementation to the global one provide by
kernel/watchdog.c. This shift has caused a whole bunch of
compile problems under different config options. I attempt to
simplify things with the patch below.
In order to simplify things, I had to come to terms with the
meaning of two terms ARCH_HAS_NMI_WATCHDOG and
CONFIG_HARDLOCKUP_DETECTOR. Basically they mean the same thing,
the former on a local level and the latter on a global level.
With the old x86 nmi watchdog gone, there is no need to rely on
defining the ARCH_HAS_NMI_WATCHDOG variable because it doesn't
make sense any more. x86 will now use the global
implementation.
The changes below do a few things. First it changes the few
places that relied on ARCH_HAS_NMI_WATCHDOG to use
CONFIG_X86_LOCAL_APIC (the former was an alias for the latter
anyway, so nothing unusual here). Those pieces of code were
relying more on local apic functionality the nmi watchdog
functionality, so the change should make sense.
Second, I removed the x86 implementation of
touch_nmi_watchdog(). It isn't need now, instead x86 will rely
on kernel/watchdog.c's implementation.
Third, I removed the #define ARCH_HAS_NMI_WATCHDOG itself from
x86. And tweaked the include/linux/nmi.h file to tell users to
look for an externally defined touch_nmi_watchdog in the case of
ARCH_HAS_NMI_WATCHDOG _or_ CONFIG_HARDLOCKUP_DETECTOR. This
changes removes some of the ugliness in that file.
Finally, I added a Kconfig dependency for
CONFIG_HARDLOCKUP_DETECTOR that said you can't have
ARCH_HAS_NMI_WATCHDOG _and_ CONFIG_HARDLOCKUP_DETECTOR. You can
only have one nmi_watchdog.
Tested with
ARCH=i386: allnoconfig, defconfig, allyesconfig, (various broken
configs) ARCH=x86_64: allnoconfig, defconfig, allyesconfig,
(various broken configs)
Hopefully, after this patch I won't get any more compile broken
emails. :-)
v3:
changed a couple of 'linux/nmi.h' -> 'asm/nmi.h' to pick-up correct function
prototypes when CONFIG_HARDLOCKUP_DETECTOR is not set.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
LKML-Reference: <1293044403-14117-1-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a
Author: Chaoming Li <chaoming_li@xxxxxxxxxxxxxx>
Date: Wed Dec 22 10:56:02 2010 -0600
rtlwifi: Fix large packet issue
An RX buffer is set to 9100 bytes to receive 8K AMSDU; however, an skb
of this size fails in the kernel.
Signed-off-by: Chaoming Li <chaoming_li@xxxxxxxxxxxxxx>
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 172128468f61e16e1427238278b9ad775584aa89
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 22 10:15:30 2010 +0100
mac80211: cleanup select_queue
There's a redundant rcu_read_lock/unlock pair, a
redundant variable, and a few redundant accesses
to the 1d_to_ac array. Fix this to make the code
neater and easier to follow.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit db7ec38d8e99f449856c11ffaef363a8eb5af90f
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Wed Dec 22 12:20:12 2010 +0530
ath9k: Reset keycache on resume
It looks like some hardware registers are left into undefined state
after suspend/resume. At minimum, this can cause odd issues related to
key cache and hardware trying to encrypt/decrypt frames unexpectedly.
This seems to happen even when there is no keys configured, i.e., hardware
can end up touching TX frames just based of invalid key cache context
even if the driver is not asking a specific entry to be used. In
addition, RX can likely be affected. This patch fixes this issue.
Signed-off-by: Jouni Malinen <Jouni.Malinen@xxxxxxxxxxx>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e6d8a817d00793eecd063b1548bbc954ab62b124
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Tue Dec 21 19:40:40 2010 -0600
rtlwifi: rtl8192ce: Fix driver problem when radio switch off at module load
If the radio enable switch is off when the driver is loaded, it is not
possible to get radio output until the driver is unloaded and reloaded
with the switch on.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 40d70dd12200ffeacfe9caaa8242e3ad2995bb5d
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:49 2010 +0200
rndis_wlan: add support for set_power_mgmt
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 49b35bd3f5bbc6997b24b04e9d4896f00cee3528
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:42 2010 +0200
rndis_wlan: add support for set_cqm_rssi_config
Device poller already reads current RSSI, so add support for
set_cqm_rssi_config there.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a3463a1fdc9aa0881760e54efbd62742275601a5
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:34 2010 +0200
rndis_wlan: remove unused variable from priv structure
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c2aa413279cde7c867fc90b07f83fff3c1e9e98d
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:27 2010 +0200
rndis_wlan: constify rndis_config_ops
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 21b27beca73ad7d2829fe9cc3e48054f69e3d9d3
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:20 2010 +0200
rndis_wlan: turn radio off before interface is bring up
Radio should be off when interface is down.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0b578021745b61b2ff89f6bacbac5db08a9a8089
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:12 2010 +0200
rndis_wlan: do not set default_key if not WEP key
rndis_set_default_key did call add_wep_key to set default key on device, even
if key is WPA. This caused rndis_wlan not work with wpa_supplicant in nl80211
mode (causing disconnect from AP).
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bfe3850b0cfca6ba64395e2705d9a51cd044f374
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Dec 21 22:44:05 2010 +0200
rndis_wlan: scanning, workaround device returning incorrect bssid-list item count.
Sometimes device returns wrong number of items in bssid-list. Appears that
some specific beacons trigger this problem and leads to very poor scanning
results. Workaround by ignoring num_items received from device and walkthrough
full bssid-list buffer.
v2: Fix buffer range checks and reading next item length. Old code read
behind buffer on last item but didn't use those values as 'count' would
also reach zero. Also fix resizing of buffer if device has larger buffer,
old code assumed that BSSID-list OID would return same buffer size
when it really can return yet another new larger length.
Tested-by: LuÃs Picciochi <Pitxyoki@xxxxxxxxx>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ab72efdf107e5b0e0a05efb8f24cc6c598ae31ea
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 21:29:44 2010 +0100
b43: N-PHY: enable support for PHYs rev 3 and higher
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d4814e69eec24f46a9f0a6d57b80e0a6add594c7
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 23:57:48 2010 +0100
b43: N-PHY: update 2056 radio on channel switch on rev3+
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d41446467320b7cbe550a85c44fd9d3cb12c119d
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 19:40:18 2010 +0100
b43: N-PHY: use correct channel tables for rev4+
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aca434d36f38754392f53e7b16f90eab66ae95e0
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 11:50:22 2010 +0100
b43: N-PHY: avoid PHY hangs for rev 3 and 4
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 94a5b0452410f8bdff27aa13592bec046fb6095d
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 11:50:21 2010 +0100
b43: N-PHY: add init tables for 2056 radio
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ea7ee14b8a6371f006d73333ef2b7fe929b6dab0
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 17:13:44 2010 +0100
b43: N-PHY: implement radio 2056 init steps
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e41596a118a5cb15a045ef773dc117b2596e6a86
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 21 11:50:19 2010 +0100
b43: use correct firmware for newer cores
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d0ce2d170585b7061a08af061d64ebb08c6782dd
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Tue Dec 21 01:42:43 2010 -0800
ath9k_hw: Fix bug in eeprom data length validation for AR9485
The size of the eeprom data is 1088 bytes for AR9485. But
a sanity check is done against 4K which would result in a
'potential read past the end of the buffer' smatch complaint.
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0207c0c51a37659a92232e665f2a7fadec170556
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Dec 21 17:30:43 2010 +0900
ath5k: Use helper function to get eeprom mode from channel
Introduce a helper function to get the EEPROM mode from channel and remove
multiple similar switch statements. Also since it's now easy to get the EEPROM
mode from the channel, use them inside the functions which need it, instead of
passing a redundant ee_mode parameter.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 26a51ad7f285236ca593c57cffcaadd40514084a
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Dec 21 17:30:37 2010 +0900
ath5k: Remove ATH5K_INI_RFGAIN defines, use band instead
Remove redundant defines.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 51f00622e5664ae77fd6c8670ddd402d9b77ccc8
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Dec 21 17:30:32 2010 +0900
ath5k: Track current TX power separately from max TX power
Add a new variable to keep track of the currently configured tx power. Before
max_pwr was re-used for keeping the maximum allowed power as well as the
current configuration. Doing a min() on it allows you to lower the txpower, but
how would you be able to make it higher again?
This patch fixes that by adding a new variable ah_cur_pwr which is used instead
of txp_max_pwr to keep the current configuration. txp_max_pwr is used to check
if we are within the limits.
Another problem fixed by this patch is that it avoids setting a zero txpower
when things are initialized first and the current power is not yet set.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 56bd29d361a53f3bf6b815b5bf570a23bdc55b35
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Dec 21 17:30:26 2010 +0900
ath5k: Separate powertable setup and writing
And rename functions which write the powertable to make it clearer.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 26c7fc436422de5d6d2b491f777e965e96f5c3a2
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Dec 21 17:30:20 2010 +0900
ath5k: Simplify powertable recalculation
Let ath5k_hw_txpower() decide if it can re-use the powertable or if it has to
be recalculated instead of passing a 'fast' flag from the outside.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Tue Dec 21 06:59:06 2010 +0300
ath9k: unlock on error path in ath9k_change_interface()
There is a missing unlock when we hit the "No beacon slot available"
error condition.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8d6a686a0d20d39c202fdfc6fa7f1daf1d6e3b35
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:56 2010 +0100
rtlwifi: Use pci_pcie_cap()
Use function pci_pcie_cap() instead of accessing struct member directly.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e40b5faabc34f61fdf17b40d2e31837461ddc467
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:55 2010 +0100
ath9k: Use pci_is_pcie()
Use function pci_is_pcie() instead of accessing struct member directly.
CC: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e98b06b09be0fc459806aa4d2c301cfaf268c570
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:54 2010 +0100
ath5k: Use pci_is_pcie()
Use function pci_is_pcie() instead of accessing struct member directly.
CC: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2cdb9a42f3b4c97088ea0768dbee55ee8863f233
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:53 2010 +0100
rt2x00: Use pci_is_pcie()
Use function pci_is_pcie() instead of accessing struct member directly.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6b740aaa005474a7b135d3c554b9295c73eaab95
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:52 2010 +0100
ssb: Use pci_is_pcie()
Use function pci_is_pcie() instead of accessing struct member directly.
CC: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 750de29109770f6b50daecc4c44aaa50a9e0075b
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:51 2010 +0100
wl12xx: remove unnecessary import
No function declared in gpio.h is used here.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Acked-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 63d9faf665ba27c65f0cf118df05a412d3dfd39d
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Tue Dec 21 02:01:50 2010 +0100
wl1251: remove unnecessary import
No function declared in gpio.h is used here.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit afe68d0a8f5961652e26cea39d74e2cc820de841
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Mon Dec 20 11:29:59 2010 -0500
ath9k: fix aphy / wiphy idle mismatch
ath9k supports its own set of virtual wiphys, and it uses
the mac80211 idle notifications to know when a device needs
to be idle or not. We recently changed ath9k to force idle
on driver stop() and on resume but forgot to take into account
ath9k's own virtual wiphy idle states. These are used internally
by ath9k to check if the device's radio should be powered down
on each idle call. Without this change its possible that the
device could have been forced off but the virtual wiphy idle
was left on.
Cc: stable@xxxxxxxxxx
Cc: Paul Stewart <pstew@xxxxxxxxxx>
Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d584747be838775cebbf5937c20b24da6899e3e8
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Mon Dec 20 14:39:51 2010 +0530
ath9k: Fix warnings on card removal
The recently added warning message on power change failure
is not needed on device removal.
ath: Failed to wakeup in 500us
------------[ cut here ]------------
WARNING: at drivers/net/wireless/ath/ath9k/hw.c:1618
ath9k_hw_setpower+0x61f/0x630 [ath9k_hw]()
Hardware name: 64756D6
Pid: 540, comm: kworker/u:3 Not tainted 2.6.37-rc6-wl #37
Call Trace:
[<ffffffff810501aa>] warn_slowpath_common+0x7a/0xb0
[<ffffffffa056e280>] ? ath9k_iowrite32+0x0/0x90 [ath9k]
[<ffffffff810501f5>] warn_slowpath_null+0x15/0x20
[<ffffffffa05226ef>] ath9k_hw_setpower+0x61f/0x630 [ath9k_hw]
[<ffffffffa05700e5>] ath9k_ps_wakeup+0x85/0xd0 [ath9k]
[<ffffffffa0570685>] ath9k_configure_filter+0x25/0x80 [ath9k]
[<ffffffffa04dde43>] ieee80211_configure_filter+0x133/0x190 [mac80211]
[<ffffffffa04ee502>] ieee80211_do_stop+0x132/0x540 [mac80211]
[<ffffffff813466ff>] ? _raw_spin_unlock_bh+0x1f/0x30
[<ffffffff812b6923>] ? dev_deactivate+0x1c3/0x1e0
[<ffffffffa04ee925>] ieee80211_stop+0x15/0x20 [mac80211]
[<ffffffff8129d1b6>] __dev_close+0x56/0x90
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 97dcec5715a381362c88d1542e52c63147764d3c
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Mon Dec 20 08:02:42 2010 +0530
ath9k_htc: Fix warning on device removal
The commit "ath9k_hw: warn if we cannot change the power to the chip"
introduced a new warning to indicate chip powerup failures, but this
is not required for devices that have been removed. Handle USB device
removal properly by checking for unplugged status.
For PCI devices, this warning will still be seen when the card is pulled
out, not sure how to check for card removal.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2af10844eb6ed104f9505bf3a7ba3ceb02264f31
Merge: 73bc7d315f56e260071bdb5f15e25b53bddc1402 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Wed Dec 22 12:25:34 2010 -0800
USB: Merge 2.6.37-rc5 into usb-next
This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 28bd2c341120db346f30b3ba11b4eac06b2cc981
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Mon Dec 20 21:31:34 2010 +0530
davinci: am18x/da850/omap-l138 evm: add support for higher speed grades
Apart from the regular AM18x/DA850/OMAP-L138 SoC operating
at 300MHz, these SoCs have variants that can operate at a
maximum of 456MHz. Variants at 408Mhz and 375 Mhz are available
as well.
Not all silicon is qualified to run at higher speeds and
unfortunately the maximum speed the chip can support can only
be determined from the label on the package (not software
readable).
The EVM hardware for all these variants is the same (except
for the actual SoC populated).
U-Boot on the EVM sets up ATAG_REVISION to inform the OS
regarding the speed grade supported by the silicon. We use
this information to pass on the speed grade information to
the SoC code.
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 39e145500458bd68d1d33adfa256886900b1597b
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Mon Dec 20 21:31:33 2010 +0530
davinci: am18x/da850/omap-l138: add support for higher speed grades
AM18x/DA850/OMAP-L138 SoCs have variants that can operate
at a maximum of 456 MHz at 1.3V operating point. Also the
1.2V operating point has a variant that can support a maximum
of 375 MHz.
This patch adds three new OPPs (456 MHz, 408 MHz and 372 MHz)
to the list of DA850 OPPs.
Not all silicon is qualified to run at higher speeds and
unfortunately the maximum speed the chip can support can only
be determined from the label on the package (not software
readable).
Because of this, we depend on the maximum speed grade information
to be provided to us in some board specific way. The board informs
the maximum speed grade information by setting the da850_max_speed
variable.
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 9cc3049911d0166d54247cf2471802eb5293c66c
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Thu Dec 9 16:51:07 2010 -0500
da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional
Use the mach-davinci/Kconfig to enable gpio-keys-polled as default when
da850-evm machine is enabled.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
CC: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
CC: "Nori, Sekhar" <nsekhar@xxxxxx>
CC: Gabor Juhos <juhosg@xxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 70b3093963feefbf122672f9fe5f916db5338ca0
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Thu Dec 9 16:51:06 2010 -0500
da850-evm: add baseboard GPIO expander buttons, switches and LEDs
This patch adds a pca953x platform device for the tca6416 found on the evm
baseboard. The tca6416 is a GPIO expander, also found on the UI board at a
separate I2C address. The pins of the baseboard IO expander are connected to
software reset, deep sleep enable, test points, a push button, DIP switches and
LEDs.
Add support for the push button, DIP switches and LEDs and test points (as
free GPIOs). The reset and deep sleep enable connections are reserved by the
setup routine so that userspace can't toggle those lines.
The existing tca6416-keypad driver was not employed because there was no
apararent way to register the LEDs connected to gpio's on the tca6416 while
simultaneously registering the tca6416-keypad instance.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
CC: Govindarajan, Sriramakrishnan <srk@xxxxxx>
Reviewed-by: Sekhar Nori <nsekhar@xxxxxx>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
CC: Gabor Juhos <juhosg@xxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 53c2897d36153830d4d34324bedf23a641602cc9
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Thu Dec 9 16:51:05 2010 -0500
da850-evm: extract defines for SEL{A,B,C} pins in UI expander
The setup and teardown methods of the UI expander reference the SEL_{A,B,C}
pins by 'magic number' in each function. This uses the common enum for their offsets
in the expander setup and teardown functions.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
Reviewed-by: Sekhar Nori <nsekhar@xxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
CC: Victor Rodriguez <vm.rod25@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 75929f5e2bcba7cc328fcf9a3d7ba7076946ac3a
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Thu Dec 9 16:51:04 2010 -0500
da850-evm: add UI Expander pushbuttons
This patch adds EV_KEYs for each of the 8 pushbuttons on the UI board via a
gpio-key device.
The expander is a tca6416; it controls the SEL_{A,B,C} lines which enable and
disable the peripherals found on the UI board in addition to the 8 pushbuttons
mentioned above. The reason the existing tca6416-keypad driver is not employed
is because there was no aparent way to keep the gpio lines used as
SEL_{A,B,C} registered while simultaneously registering the pushbuttons as a
tca6416-keypad instance.
Some experimentation with the polling interval was performed; we were searching
for the largest polling interval that did not affect the feel of the
responsiveness of the buttons. It is very subjective but 200ms seems to be a
good value that accepts firm pushes but rejects very light ones. The key values
assigned to the buttons were arbitrarily chosen to be F1-F8.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
CC: Govindarajan, Sriramakrishnan <srk@xxxxxx>
Reviewed-by: Sekhar Nori <nsekhar@xxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
CC: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
CC: Gabor Juhos <juhosg@xxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit ee09b3c1cff0335137dc1b146488e4352f640f13
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 22 11:39:59 2010 -0800
sfq: fix sfq class stats handling
sfq_walk() runs without qdisc lock. By the time it selects a non empty
hash slot and sfq_dump_class_stats() is run (with lock held), slot might
have been freed : We then access q->slots[SFQ_EMPTY_SLOT], out of
bounds, and crash in slot_queue_walk()
On previous kernels, bug is here but out of bounds qs[SFQ_DEPTH] and
allot[SFQ_DEPTH] are located in struct sfq_sched_data, so no illegal
memory access happens, only possibly wrong data reported to user.
Also, slot_dequeue_tail() should make sure slot skb chain is correctly
terminated, or sfq_dump_class_stats() can access freed skbs.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 65a6538a56d4c7ae8465f2a8420ddc65877b6779
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date: Tue Dec 21 16:02:17 2010 +0200
mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration
If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile,
because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is
set.
This patch adds ifdefs around the tpt_led_trigger declaration in
ieee80211_i.h to avoid the problem.
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 67408c8c7b9daf28b50e33be3541334c07d15789
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 30 08:59:23 2010 +0100
mac80211: selective throughput LED trigger active
The throughput LED trigger was always active when
the radio was enabled. In most cases that's likely
the desired behaviour, but iwlwifi requires it to
be only active when one of the virtual interfaces
is actually "connected" in some way.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e1e5406854378dfada3f33c7192b012083a5b8e0
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 30 08:58:45 2010 +0100
mac80211: add throughput based LED blink trigger
iwlwifi and other drivers like to blink their LED
based on throughput. Implement this generically in
mac80211, based on a throughput table the driver
specifies. That way, drivers can set the blink
frequencies depending on their desired behaviour
and max throughput.
All the drivers need to do is provide an LED class
device, best with blink hardware offload.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fe67c913f1ec2a01aaa9176c80ef36eaf87d705d
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Nov 27 20:02:59 2010 +0100
mac80211: make LED trigger names available early
The throughput trigger will require doing LED
classdev/trigger handling before register_hw(),
so drivers should have access to the trigger
names before it. If trigger registration fails,
this will still make the trigger name available,
but that's not a big problem since the default
trigger will the simply not be found.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 808601b75804475c9022f6375e76b7c62c99a10a
Merge: c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 f17f9726c27c3921e00a5750e85070e6dd7e1ff7
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 11:32:24 2010 -0800
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
commit c10abbb26513f4ccff89c4d80912cb4d36fcd3e8
Merge: 4931445b94f49672028b81ace9d4eee8ddf19ab2 da1f026b532ce944d74461497dc6d8c16456466e
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Wed Dec 22 11:30:12 2010 -0800
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
commit 63e35cd9bd4c8ae085c8b9a70554595b529c4100
Merge: 503b1a529a6b62b31904bab4699752c523cf76b2 3d986b25b5faa50ba6afd94f60f270b6c3061e5e
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Dec 22 14:27:21 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
commit da1f026b532ce944d74461497dc6d8c16456466e
Author: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Date: Mon Dec 20 21:09:22 2010 +0000
Keyboard: omap-keypad: use matrix_keypad.h
Most keypad drivers make use of the <linux/input/matrix_keypad.h>
defined macros, structures and inline functions.
Convert omap-keypad driver to use those as well, as suggested by a
compile time warning, hardcoded into the OMAP <palt/keypad.h>.
Created against linux-2.6.37-rc5.
Tested on Amstrad Delta.
Compile tested with omap1_defconfig and omap2plus_defconfig shrinked to
board-h4.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Reviewed-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 4e012e5f246d4da924b14d453452fd0838d4e03b
Author: Arno Steffen <arno.steffen@xxxxxxxxxxxxxx>
Date: Wed Dec 22 18:14:36 2010 +0000
OMAP3: fix typo in OMAP3_IVA_MASK
OMAP3_IVA_MASK should use OMAP3_IVA_SHIFT instead of OMAP3_SGX_SHIFT
Signed-off-by: Arno Steffen <arno.steffen@xxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 6d38c4b4f1df70f953633c27ebcdc2712e9039bc
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Tue Dec 21 17:46:01 2010 +0000
omap: rx51: Remove tvout code that plays with gpio 40
Commit 60d24ee "Added video data to support tvout on rx51" added code that
tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong
since this gpio has nothing to do with OMAP DSS but it is used to control
one switch that selects is the audio jack connected to tvout or audio
circuitry.
This switch is already supported by the RX51 ASoC driver so there is no need
to control it elsewhere. Switch is contolled with ALSA control
'Jack Function' and tvout can be selected with following example:
amixer -D hw:0 set 'Jack Function' 'TV-OUT'
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Srikar <ext-srikar.1.bhavanarayana@xxxxxxxxx>
Acked-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 31bbb4f035c13a73d1ebc2626663971723cbd28f
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Tue Dec 21 17:25:35 2010 +0000
omap: rx51: Add vdda_dac supply for tvout
Commmit 60d24ee "Added video data to support tvout on rx51" broke the DSS
on RX51/N900 since it added DSS VENC support but a patch adding needed
supply is missing from tree and no framebuffers are initialized.
This patch is basically cleaned up version of original one:
http://marc.info/?l=linux-omap&m=129070041402418&w=2
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Srikar <ext-srikar.1.bhavanarayana@xxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit b5b9945b2b139ca922b49062053f34486ca64cca
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Tue Dec 21 17:25:34 2010 +0000
omap: rx51: Cleanup vdds_sdi supply construction
It is much more cleaner to use REGULATOR_SUPPLY macro and a device name
instead of having a reference to rx51_display_device.dev with #if defined()
guards.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Acked-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 3cfeb0c33f5cbcc6dde371392877ef3101b8f805
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 20 15:16:53 2010 -0500
rtl818x: move rtl8180 and rtl8187 to separate subdirectories
These drivers share one header file, but nothing else. Worse, both
drivers use the rtl8225 part with different register settings. The
results has been some ugly naming -- let's simplify that.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Acked-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Acked-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 22 10:15:07 2010 +0100
mac80211: fix mesh forwarding
Under memory pressure, the mac80211 mesh code
may helpfully print a message that it failed
to clone a mesh frame and then will proceed
to crash trying to use it anyway. Fix that.
Cc: stable@xxxxxxxxxx [2.6.27+]
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Acked-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 68229689b6dc950bea4b81dd60563884f4a7e1c5
Author: Oliver Neukum <oneukum@xxxxxxx>
Date: Wed Dec 22 15:33:40 2010 +0100
HID: usbhid: base runtime PM on modern API
This patch doesn't alter functionality, but removes a dedicated kernel
thread.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
Tested-by: Maulik Mankad <x0082077@xxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit f17f9726c27c3921e00a5750e85070e6dd7e1ff7
Author: Jon Hunter <jon-hunter@xxxxxx>
Date: Thu Dec 9 23:13:40 2010 +0100
OMAP4: clock data: Add missing fixed divisors
The following OMAP4 clocks have the following fixed divisors that
determine the frequency at which these clocks operate. These
dividers are defined by the PRCM specification and without these
dividers the rates of the below clocks are calculated incorrectly.
This may cause internal peripherals using these clocks to operate
at the wrong frequency.
- abe_24m_fclk (freq = divided-by-8)
- ddrphy_ck (freq = parent divided-by-2)
- dll_clk_div_ck (freq = parent divided-by-2)
- per_hs_clk_div_ck (freq = parent divided-by-2)
- usb_hs_clk_div_ck (freq = parent divided-by-3)
- func_12m_fclk (freq = parent divided-by-16)
- func_24m_clk (freq = parent divided-by-4)
- func_24mc_fclk (freq = parent divided-by-8)
- func_48mc_fclk (freq = divided-by-4)
- lp_clk_div_ck (freq = divided-by-16)
- per_abe_24m_fclk (freq = divided-by-4)
Signed-off-by: Jon Hunter <jon-hunter@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit 9bf8391846db849509a6aa6f1f0659843ca30662
Author: Vishwanath BS <vishwanath.bs@xxxxxx>
Date: Tue Oct 5 19:35:34 2010 +0530
OMAP3: SDRC: Add comments on Errata i520 for Global SW reset
This patch adds comments on precaution to be taken if Global Warm reset is
used as the means to trigger system reset.
Signed-off-by: Vishwanath BS <vishwanath.bs@xxxxxx>
[paul@xxxxxxxxx: fixed typos, one mentioned by Sanjeev]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Sanjeev Premi <premi@xxxxxx>
commit 9fb67204d7a00a6444bc121f221527034613d338
Merge: 8c1df4002aa425973d7d25ffa56c042acd953bed 287050d390264402e11bea8b811859e42e8faa29
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 22 12:46:12 2010 +0100
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit bcbea798f8f1492052c23ceb4fbc2a96013a3865
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Wed Dec 22 14:19:14 2010 +0100
percpu: print out alloc information with KERN_DEBUG instead of KERN_INFO
Now that percpu allocator is mostly stable, there is no reason to
print alloc information with KERN_INFO and clutter the boot messages.
Switch it to KERN_DEBUG.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Travis <travis@xxxxxxx>
commit d8850ba425d9823d3184bd52f065899dac4689f9
Author: Jack Steiner <steiner@xxxxxxx>
Date: Tue Nov 30 13:55:40 2010 -0600
x86, UV: Fix the effect of extra bits in the hub nodeid register
UV systems can be partitioned into multiple independent SSIs.
Large partitioned systems may have extra bits in the node_id
register. These bits are used when the total memory on all SSIs
exceeds 16TB. These extra bits need to be ignored when
calculating x2apic_extra_bits.
Signed-off-by: Jack Steiner <steiner@xxxxxxx>
LKML-Reference: <20101130195926.972776133@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e681041388e61ecd7f99dba66b3c1db11a564d92
Author: Jack Steiner <steiner@xxxxxxx>
Date: Tue Nov 30 13:55:39 2010 -0600
x86, UV: Add common uv_early_read_mmr() function for reading MMRs
Early in boot, reading MMRs from the UV hub controller require
calls to early_ioremap()/early_iounmap(). Rather than
duplicating code, add a common function to do the
map/read/unmap.
Signed-off-by: Jack Steiner <steiner@xxxxxxx>
LKML-Reference: <20101130195926.834804371@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 36bb94ba36f332de767cfaa3af6a5136435a3a9c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 16 08:40:36 2010 +0000
ARM: pgtable: provide RDONLY page table bit rather than WRITE bit
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 9522d7e4cb5e0858122fc55d33a2c07728f0b10d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 16 00:23:31 2010 +0000
ARM: pgtable: invert L_PTE_EXEC to L_PTE_XN
The hardware page tables use an XN bit 'execute never'. Historically,
we've had a Linux 'execute allow' bit, in the positive sense. Get rid
of this artifact as future hardware will continue to have the XN sense.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e926f4495e202500a6265987277fab217e235f08
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 11:55:37 2010 +0000
ARM: pgtable: remove FIRST_USER_PGD_NR
FIRST_USER_PGD_NR is now unnecessary, as this has been replaced by
FIRST_USER_ADDRESS except in the architecture code. Fix up the last
usage of FIRST_USER_PGD_NR, and remove the definition.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit af3813d6a5bf8d0f71b23d3ce458fa5f9916c6b7
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 11:48:16 2010 +0000
ARM: pgtable: use conventional page table code for identity mappings
Remove some knowledge of our 2-level page table layout from the
identity mapping code - we assume that a step size of PGDIR_SIZE will
allow us to step over all entries. While this is true today, it won't
be true in the near future.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 614dd0585f376a25c638abbed9c5fbd21d7baece
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 11:41:57 2010 +0000
ARM: pgtable: collect up identity mapping functions
We have two places where we create identity mappings - one when we bring
secondary CPUs online, and one where we setup some mappings for soft-
reboot. Combine these two into a single implementation. Also collect
the identity mapping deletion function.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 26bbf0b57a0848932f725076bcb1245ca696e8d3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 11:30:36 2010 +0000
ARM: pgtable: remove L2 cache flushes for SMP page table bring-up
The MMU is always configured to read page tables from the L2 cache
so there's little point flushing them out of the L2 cache back to
RAM. Remove these flushes.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d30e45eeabefadc6039d7f876a59e5f5f6cb11c6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 16 00:16:01 2010 +0000
ARM: pgtable: switch order of Linux vs hardware page tables
This switches the ordering of the Linux vs hardware page tables in
each page, thereby eliminating some of the arithmetic in the page
table walks. As we now place the Linux page table at the beginning
of the page, we can deal with the offset in the pgt by simply masking
it away, along with the other control bits.
This also makes the arithmetic all be positive, rather than a mixture.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b93cef556162b0f33399bfe5f307c54f51554e09
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 16:25:43 2010 +0000
mfd: Support additional parent IDs for wm831x
Some newer device revisions add a second parent ID. Support this in
the device validity checks done at startup.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
commit 88aec4f7b67b5889ba5b4beac2d2c1400451c318
Author: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Date: Thu Dec 2 15:06:49 2010 +0100
mfd: Fix ab8500-core interrupt ffs bit bug
We want to find the first set bit on value, not status.
Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
commit bd7c72ed18d719c1fb0fdf6ff9042d8ab78fdf71
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 24 18:01:39 2010 +0000
mfd: Supply IRQ base for WM832x devices
Without this the IRQ base will not be correctly configured for the
subdevices.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
commit 3b3c1f24e96c411a95daabb6af9e09c5381f713b
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date: Fri Nov 26 10:39:55 2010 +0100
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
rdc321x-wdt currently fetches its driver specific data by using the
platform_device->platform_data pointer, this is wrong because the mfd
device which registers our platform_device has been added using
mfd_add_device() which sets the platform_device->driver_data pointer
instead.
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
CC: stable@xxxxxxxxxx
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
commit fa6469cb5b2d16703464c344b943e2c025cb7858
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date: Fri Nov 26 10:39:54 2010 +0100
gpio: Fix null pointer dereference while accessing rdc321x platform_data
rdc321x-gpio currently fetches its driver specific data by using the
platform_device->platform_data pointer, this is wrong because the mfd
device which registers our platform_device has been added using
mfd_add_device() which sets the platform_device->driver_data pointer
instead.
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
CC: stable@xxxxxxxxxx
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
commit 8c1df4002aa425973d7d25ffa56c042acd953bed
Merge: 6c529a266bdc590a870ee2d2092ff6527eff427b 21dd9ae5a4e9f717f3957ec934dd3158129436b8
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 22 11:54:50 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 6c529a266bdc590a870ee2d2092ff6527eff427b
Merge: 7639dae0ca11038286bbbcda05f2bef601c1eb8d 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 22 11:53:20 2010 +0100
Merge commit 'v2.6.37-rc7' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7d8f98769e7f4bc29c38789daeb416c6a7d7c241
Author: Tao Ma <boyu.mt@xxxxxxxxxx>
Date: Wed Dec 22 17:50:30 2010 +0800
ocfs2: Fix system inodes cache overflow.
When we store system inodes cache in ocfs2_super,
we use a array for global system inodes. But unfortunately,
the range is calculated wrongly which makes it overflow and
pollute ocfs2_super->local_system_inodes.
This patch fix it by setting the range properly.
The corresponding bug is ossbug1303.
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1303
Cc: stable@xxxxxxxxxx
Signed-off-by: Tao Ma <boyu.mt@xxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 2ce494a3dac331fdbb2590e5fa0598956dd21b8b
Merge: 90a8a73c06cc32b609a880d48449d7083327e11a 3b4694de3596edac0159524b15a4a06945875421
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 22 11:31:03 2010 +0100
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
commit 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Sat Dec 18 15:42:30 2010 +0100
Input: synaptics - ignore bogus mt packet
In multitouch mode, at least one device (fw: 7.4 id: 0x1c0b1) sometimes
sends a final main packet with x == 1. Since the normal values are above
1472, this is clearly bogus. At the same time, a two-finger touch is
signaled, even though only one finger was on the pad to begin with. This
patch ignores the packet altogether, removing the problem.
Acked-by: Chris Bagwell <chris@xxxxxxxxxxxxxx>
Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 4f32e9b1f812fd6c00cc85a127583fefbdedaedc
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date: Wed Dec 22 10:27:53 2010 +0100
kthread_work: make lockdep happy
spinlock in kthread_worker and wait_queue_head in kthread_work both
should be lockdep sensible, so change the interface to make it
suiltable for CONFIG_LOCKDEP.
tj: comment update
Reported-by: Nicolas <nicolas.mailhot@xxxxxxxxxxx>
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Tested-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 11c8ea81cc639c2ea56f94a9cdaa6242ff13a3af
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Fri Dec 17 21:16:23 2010 +0100
ux500: rename modem IRQ and MBOX files
Suffix the U5500 modem IRQ and MBOX files with *-db5500* so that
we clearly know the SoC they belong to, in line with the rest of
the files in mach-ux500.
Cc: Stefan Nilsson <stefan.xk.nilsson@xxxxxxxxxxxxxx>
Cc: Martin Persson <martin.persson@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Wed Dec 22 06:35:30 2010 +0000
ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
Adding platform resources, PFC setting and release
reset pin for eMMC on ag5evm.
[damm@xxxxxxxxxxxxx: Add MSTP code for MMCIF]
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5d7814728d80ee56d02e99cc2ab0850c8625a047
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Wed Dec 22 06:30:19 2010 +0000
ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
Follow up to pfc-sh73a0.c's pull-up support.
Change GPIO_FN_KEYINx to GPIO_FN_KEYINx_PU.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a0794fd019820d3d5e9d73ffd61b5bbcac818f18
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Wed Dec 22 06:26:06 2010 +0000
ARM: mach-shmobile: sh73a0 GPIO pullup improvement
On SH-Mobile, Pull UP/Downs can be controlled independently
from Function selectors (by lower nibble of PFCR).
It means people may want to use GPIO_FN_xxx_PU/PD in addition
to GPIO_IN_PU/PD which is currently supported.
This patch adds pull-up version for some input signals on
KEYSC, MMC, FSIA as well as SDHI1.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 019c4ae313ccf5d253be32197e002c626d8bd678
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Dec 22 06:14:05 2010 +0000
ARM: mach-shmobile: sh73a0 CPGA fix for KEYSC
Fix the sh73a0 KEYSC clock control by adding MSTP403
to mstp_clks[]. Use KEYSC instead of KEYSC0 in comments.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8c1ac08b38af0c477ae32df9f4625b7dbddea1ea
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Tue Dec 21 11:46:35 2010 +0100
fbdev: sh-mobile: retrieve and propagate display sizes from EDID
Monitor EDID contains information about physical display sizes. Retrieve
it and propagate to the framebuffer driver.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e0b9fb26266778cc749365b98041c5b7ef6f10f8
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Tue Dec 21 11:46:26 2010 +0100
fbdev: sh-mobile: restore display size configuration
An earlier patch replaced open-coded video-mode configuration from
platform data by a call to fb_videomode_to_var(), thereby setting
ofdisplay sizes have been accidentally lost. Restore them.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 752a4a95e3c96a8e8d3405b16d292f13e8c7856b
Merge: bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Wed Dec 22 00:10:01 2010 -0700
Merge commit 'v2.6.37-rc7' into spi/next
commit 60a0e5d972bad6927b63aede7a1cfe758b8251ad
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Tue Dec 21 22:37:29 2010 -0700
OMAP4: clock data: Keep L3INSTR clock domain modulemode under HW control
L3INSTR clock domain is read only register and its reset value is
HW_AUTO. The modules withing this clock domain needs to be kept under
hardware control.
MODULEMODE:
- 0x0: Module is disable by software. Any INTRCONN access to module
results in an error, except if resulting from a module wakeup
(asynchronous wakeup).
- 0x1: Module is managed automatically by hardware according to
clock domain transition. A clock domain sleep transition put
module into idle. A wakeup domain transition put it back
into function. If CLKTRCTRL=3, any INTRCONN access to module
is always granted. Module clocks may be gated according to
the clock domain state.
This patch keeps CM_L3INSTR_L3_3_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL
and CM_L3INSTR_INTRCONN_WP1_CLKCTRL module mode under hardware control
by using ENABLE_ON_INIT flag.
Without this the OMAP4 device OFF mode SAR restore phase aborts during
interconnect register restore phase. This can be also handled by doing
explicit a clock enable and disable in the low power code since there
is no direct module associated with it. But that seems not necessary
since the clock domain is under HW control.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 80f093657371b3ebb1d05354a698088bf7b21c15
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Tue Dec 21 22:37:28 2010 -0700
OMAP4: powerdomain: Remove L3INIT_PD OFF state
On OMAP4, there is an issue when L3INIT transitions to OFF mode without
device OFF. The SAR restore mechanism will not get triggered without
wakeup from device OFF and hence the USB host and USB TLL context
will not be restored.
Hardware team recommended to remove the OFF state support for L3INIT_PD
since there is no power impact. It will be removed on next OMAP revision
(OMAP4440 and beyond).
Hence this patch removed the OFF state from L3INIT_PD. The deepest
state supported on L3INIT_PD is OSWR just like CORE_PD and PER_PD
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
[b-cousson@xxxxxx: update the changelog with next OMAP info]
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 474e7aeb6a5ac78071cc9b841889fcf026524e97
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 22:37:28 2010 -0700
OMAP4: powerdomain: l4per pwrdm does not support OFF
The l4per power domain in ES2.0 does support only RET and ON states.
The previous ES1.0 HW database was wrong and thus fixed on ES2.
Change the pwrsts field to reflect that.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 33de32b3ebcb4f7f77f10a1b42493352f00c6a30
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 22:37:28 2010 -0700
OMAP4: PM: Do not assume clkdm supports hw transitions
omap_set_pwrdm_state today assumes a clkdm supports hw_auto
transitions and hence leaves some which do not support this
in sw wkup state preventing low power transitions.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 71a488dbcc4acbc9b845491a368b30ecd7484089
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 22:37:27 2010 -0700
OMAP4: PM: Use the low-power state change feature on OMAP4
For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking
up the domain to put it back to deeper sleep state.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 73bc7d315f56e260071bdb5f15e25b53bddc1402
Author: Melchior FRANZ <mfranz@xxxxxx>
Date: Wed Dec 22 02:04:33 2010 +0100
USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
So far the USBLED driver only supports Delcom's "USB Visual Signal
Indicator" (http://www.delcomproducts.com/products_USBLMP.asp). The
driver generates virtual files "red", "green", and "blue" under the
device's /sys/ directory, where color values can be read from and
written to.
This patch adds support for Dream Cheeky's "DL100B Webmail Notifier"
(http://www.dreamcheeky.com/webmail-notifier -- available from several
shops, such as http://www.conrad.at/ce/de/product/777048/USB-WEBMAIL).
This device isn't as pretty as Delcom's, but it's *far* cheaper, and
its 3 LEDs can be set in 32 brightness steps each. The grey envelope
contour can easily be removed, leaving a rather neutral white box (with
a few small holes), which is useful for generic signalling purposes.
Of course, the small circuit board can easily be put into a prettier
case.
The DL100B device pretends to be a HID, but the HID descriptor shows
that it's not overly useful as such (see below). The patch therefore
removes the "HID-ness" (hid-core.c, hid-ids.h), and adds the necessary
commands to usbled.c. The protocol info comes from the developer's
manual that Dream Cheeky kindly provided (815DeveloperManual.pdf).
HID descriptor:
0: 05 01 Usage Page 'Generic Desktop Controls'
2: 09 10 Usage 'Reserved'
4: a1 01 Collection 'Application (mouse, keyboard)'
6: 05 00 Usage Page 'Undefined'
8: 19 10 Usage Minimum = 16
10: 29 11 Usage Maximum = 17
12: 15 00 Logical Minimum = 0
14: 25 0f Logical Maximum = 15
16: 75 08 Report Size = 8
18: 95 08 Report Count = 8
20: 91 02 Output data *var abs lin pref-state null-pos non-vol bit-field
22: 19 10 Usage Minimum = 16
24: 29 11 Usage Maximum = 17
26: 15 00 Logical Minimum = 0
28: 25 0f Logical Maximum = 15
30: 75 08 Report Size = 8
32: 95 08 Report Count = 8
34: 81 00 Input data array abs lin pref-state null-pos non-vol bit-field
36: c0 End Collection
Signed-off-by: Melchior FRANZ <mfranz@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5010f3db952b19cd353d1e90838818922d995697
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 21 08:40:59 2010 +0000
ARM: mach-shmobile: sh73a0 TMU support
Add support for 2 TMU timer channels on sh73a0.
One timer channel is used for clocksource and
the other is used for clockevents. All channels
in the same TMU block share MSTP bit as usual.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5f53a56af50c002cdb091914aa98df80b1b28ec8
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 21 08:37:32 2010 +0000
ARM: mach-shmobile: sh73a0 INTCS support
Add INTCS support for the sh73a0 processor.
The interrupts on the sh73a0 processor are managed
through controllers such as GIC, INTCS and INTCA.
The ARM cores use the GIC as primary interrupt
controller and the INTCS and INTCA are hanging off
the GIC as cascaded interrupt controllers.
Peripherals connected both to the GIC and the INTC
controllers should if possible only use the GIC.
If no GIC connection is available then INTCS and
INTCA may be used instead.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 354e4157d9e1529cf71c7041a22fde2fd113642b
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Tue Dec 21 11:20:45 2010 +0000
ARM: mach-shmobile: mackerel: fixup default memory size
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6081dc348f122cdb76093b2fc6cf5742c968cb69
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 21 21:31:55 2010 -0700
OMAP: PM noop: implement context loss count for non-omap_devices
For devices which have not (yet) been converted to use omap_device,
implement the context loss counter using the "brutal method" as
originally proposed by Paul Walmsley[1].
The dummy context loss counter is incremented every time it is
checked, but only when off-mode is enabled. When off-mode is
disabled, the dummy counter stops incrementing.
Tested on 36xx/Zoom3 using MMC driver, which is currently the
only in-tree user of this API.
This patch should be reverted after all devices are converted to using
omap_device.
[1] http://marc.info/?l=linux-omap&m=129176260000626&w=2
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
[paul@xxxxxxxxx: fixed compile warning; fixed to compile on OMAP1]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit c80705aa7074045e7431ed2ebeb0f7d5773615ab
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 21 21:31:55 2010 -0700
OMAP: PM: implement context loss count APIs
Implement OMAP PM layer omap_pm_get_dev_context_loss_count() API by
creating similar APIs at the omap_device and omap_hwmod levels. The
omap_hwmod level call is the layer with access to the powerdomain
core, so it is the place where the powerdomain is queried to get the
context loss count.
The new APIs return an unsigned value that can wrap as the
context-loss count grows. However, the wrapping is not important as
the role of this function is to determine context loss by checking for
any difference in subsequent calls to this function.
Note that these APIs at each level can return zero when no context
loss is detected, or on errors. This is to avoid returning error
codes which could potentially be mistaken for large context loss
counters.
NOTE: only works for devices which have been converted to use
omap_device/omap_hwmod.
Longer term, we could possibly remove this API from the OMAP PM layer,
and instead directly use the omap_device level API.
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 7f595674e08b8b4d3faf64a19bccc95445d7ed35
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 21 21:31:55 2010 -0700
OMAP2+: powerdomain: add API to get context loss count
Add new powerdomain API
u32 pwrdm_get_context_loss_count(struct powerdomain *pwrdm)
for checking how many times the powerdomain has lost context. The
loss count is the sum of the powerdomain off-mode counter, the
logic off counter and the per-bank memory off counter.
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
[paul@xxxxxxxxx: removed bogus return value on error; improved kerneldoc;
tweaked commit message]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 0a01aa211da8530dc6a3ff3a725f2edd3464c46f
Author: Hari Kanigeri <h-kanigeri2@xxxxxx>
Date: Tue Dec 21 21:18:56 2010 -0700
OMAP4: clocks: add dummy clock for mailbox
In omap4, there is no explicit configuration register to enable mailbox clocks.
Defining dummy clock for mailbox clock module to keep the mailbox driver
backward compatible with previous omaps.
Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx>
Acked-by: Benoît Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit a36795c1278112af2a78f93c99b7586cb7e2a0a2
Author: Jon Hunter <jon-hunter@xxxxxx>
Date: Tue Dec 21 21:31:43 2010 -0700
OMAP: clock: fix configuration of J-Type DPLLs to work for OMAP3 and OMAP4
J-Type DPLLs have additional configuration parameters that need to
be programmed when setting the multipler and divider for the DPLL.
These parameters being the sigma delta divider (SD_DIV) for the DPLL
and the digital controlled oscillator (DCO) to be used by the DPLL.
The current code is implemented specifically to configure the
OMAP3630 PER J-Type DPLL. The OMAP4430 USB DPLL is also a J-Type DPLL
and so this code needs to be updated to work for both OMAP3 and OMAP4
devices and any other future devices that have J-TYPE DPLLs.
For the OMAP3630 PER DPLL both the SD_DIV and DCO paramenters are
used but for the OMAP4430 USB DPLL only the SD_DIV field is used.
The current implementation will only program the SD_DIV and DCO
fields if the DPLL has both and hence this does not work for
OMAP4430.
In order to make the code more generic add two new fields to the
dpll_data structure for the SD_DIV field and DCO field bit-masks
and only program these fields if the masks are defined for a specific
DPLL. This simplifies the code and allows us to remove the flag
DPLL_NO_DCO_SEL.
Tested on OMAP36xx Zoom3 and OMAP4 Blaze.
Signed-off-by: Jon Hunter <jon-hunter@xxxxxx>
[paul@xxxxxxxxx: removed explicit inlining and added '_' prefix on lookup_*()
functions; added testing info to commit message; added 35xx comments back in]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit b183aaf7274245bb0241d81176cb6b06a3b01ca6
Author: Charulatha V <charu@xxxxxx>
Date: Tue Dec 21 21:31:43 2010 -0700
OMAP3: clock: Update clock domain name for mcspi fck
Update clock3xxx_data for mcspi1-4 with appropriate clock domain name.
Signed-off-by: Charulatha V <charu@xxxxxx>
Signed-off-by: Govindraj.R <govindraj.raja@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 7cffa6b888c77e9386a6b886ef10bc57aac464ec
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:31:28 2010 -0700
OMAP4: hwmod data: Add SIDLE_SMART_WKUP modes to several IPs
uart, gpio, wd_timer and i2c does support the new smart-idle with wakeup
added in OMAP4.
Add the flag to allow the hwmod core to enable this mode when applicable.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit 86009eb326afde34ffdc5648cd344aa86b8d58d4
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:31:28 2010 -0700
OMAP2+: hwmod: Add wakeup support for new OMAP4 IPs
The new OMAP4 IPs introduced a new idle mode named smart-idle with wakeup.
This new idlemode replaces the enawakeup for the new IPs but seems to
coexist as well for some legacy IPs (UART, GPIO, MCSPI...)
Add the new SIDLE_SMART_WKUP flag to mark the IPs that support this
capability.
The omap_hwmod_44xx_data.c will have to be updated to add this new flag.
Enable this new mode when applicable in _enable_wakeup, _enable_sysc and
_idle_sysc.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Tested-by: Sebastien Guiriec <s-guiriec@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit f2dd7e09db3e18e4c053810b72fe026685d9bf0c
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 21:31:28 2010 -0700
OMAP2+: hwmod: Disable clocks when hwmod enable fails
In cases where a module (hwmod) does not become accesible on enabling
the main clocks (can happen if there are external clocks needed
for the module to become accesible), make sure the clocks are not
left enabled.
This ensures that when the requisite external dependencies are met
a omap_hwmod_enable and omap_hwmod_idle/shutdown would rightly enable
and disable clocks using clk framework. Leaving the clocks enabled in
the error case causes additional usecounting at the clock framework
level leaving the clock enabled forever.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit ce35b2446945c506cb02960eab2072f56efdf1c0
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:31:28 2010 -0700
OMAP2+: hwmod: Remove omap_hwmod_mutex
The hwmod list will be built are init time and never
be modified at runtime. There is no need anymore to protect
the list from concurrent accesses using a mutex.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 01592df95049a6f3d4abb0571ae1c7cb6e9d1cd7
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:31:28 2010 -0700
OMAP2+: hwmod: Mark functions used only during initialization with __init
_register, _find_mpu_port_index and _find_mpu_rt_base are static APIs
that will be used only during the omap_hwmod initialization phase.
There is no need to keep them for runtime.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 0102b62789af5aed92cea4cf7f36afaa1ab12c72
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:31:27 2010 -0700
OMAP2+: hwmod: Make omap_hwmod_register private and remove omap_hwmod_unregister
Do not allow omap_hwmod_register to be used outside the core
hwmod code. An omap_hwmod should be registered only at init time.
Remove the omap_hwmod_unregister that is not used today since the
hwmod list will be built once at init time and never be modified
at runtime.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 50ebb7772c8975086dbfc3d21be74dd806650df4
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:34 2010 -0700
OMAP2430: hwmod data: Use common dev_attr for i2c1 and i2c2
Since i2c1 and i2c2 are using the same data, remove the two previous
instances and use a common i2c_dev_attr one.
Moreover, that will fix the following warning:
arch/arm/mach-omap2/omap_hwmod_2430_data.c:485:
warning: 'i2c_dev_attr' defined but not used
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Charulatha V <charu@xxxxxx>
commit 5a7ddcbdaf1bb7603422fb6188156ccc39711b0f
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 21 21:08:34 2010 -0700
OMAP2+: omap_hwmod: fix wakeup enable/disable for consistency
In the omap_hwmod core, most of the SYSCONFIG register helper
functions do not directly write the register, but instead just modify
a value passed in.
This patch converts the _enable_wakeup() and _disable_wakeup() helper
functions to take a value argument and only modify it instead of
actually writing the register. This makes the wakeup helpers
consistent with the other helper functions and avoids unintentional
problems like the following.
This problem was found after discovering that GPIO wakeups were no
longer functional. The root cause was that the ENAWAKEUP bit of the
SYSCONFIG register was being unintentionaly overwritten, leaving
wakeups disabled after the following two commits were combined:
commit: 9980ce53c97392a3dbdc9d1ac3e455d79b4167ed
OMAP: hwmod: Enable module wakeup if in smartidle
commit: 78f26e872f77b6312273216de1a8f836c6f2e143
OMAP: hwmod: Set autoidle after smartidle during _sysc_enable
There resulting in code in _enable_sysc() was this:
/*
* XXX The clock framework should handle this, by
* calling into this code. But this must wait until the
* clock structures are tagged with omap_hwmod entries
*/
if ((oh->flags & HWMOD_SET_DEFAULT_CLOCKACT) &&
(sf & SYSC_HAS_CLOCKACTIVITY))
_set_clockactivity(oh, oh->class->sysc->clockact, &v);
_write_sysconfig(v, oh);
so here, 'v' has wakeups disabled.
/* If slave is in SMARTIDLE, also enable wakeup */
if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE))
_enable_wakeup(oh);
Here wakeup is enabled in the SYSCONFIG register (but 'v' is not updated)
/*
* Set the autoidle bit only after setting the smartidle bit
* Setting this will not have any impact on the other modules.
*/
if (sf & SYSC_HAS_AUTOIDLE) {
idlemode = (oh->flags & HWMOD_NO_OCP_AUTOIDLE) ?
0 : 1;
_set_module_autoidle(oh, idlemode, &v);
_write_sysconfig(v, oh);
}
And here, SYSCONFIG is updated again using 'v', which does not have
wakeups enabled, resulting in ENAWAKEUP being cleared.
Special thanks to Benoit Cousson for pointing out that wakeups were
supposed to be automatically enabled when a hwmod is enabled, and thus
helping target the root cause of this problem.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit b399bca897802db3f342b6f3032a19ab8f2af99b
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:34 2010 -0700
OMAP4: hwmod & clock data: Fix GPIO opt_clks and ocp_if iclk
Fix opt clocks name in clock framework and hwmod.
Add the missing iclk in the ocp_if structure.
Add the HWMOD_CONTROL_OPT_CLKS_IN_RESET flag to ensure
the the GPIO optional clock is enable during reset.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Tested-by: Charulatha V <charu@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit 8f25bdc55d619bdd469a90b82743248680422507
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:34 2010 -0700
OMAP4: hwmod data: Add IVA and DSP
Add IVA and DSP hwmods in order to allow the pm code to
initialize properly the processors devices during
omap2_init_processor_devices.
It will avoid the following warnings.
_init_omap_device: could not find omap_hwmod for iva
_init_omap_device: could not find omap_hwmod for dsp
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 659fa8222c0ca1061d74cb3282614c017f415fe5
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:34 2010 -0700
OMAP4: hwmod data: Fix missing address in DMM and EMIF_FW
The DMM is a piece of interconnect that need to be configured properly
for the tiler functionnality. It thus exposes some configuration registers
that were missing previously.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 0cfe8751bbb8703bc77beb031eb6f4edf3d601d3
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:33 2010 -0700
OMAP4: hwmod data: Add SYSS_HAS_RESET_STATUS flag
Update the data for GPIO, UART, WD_TIMER and I2C in order to
support the new reset status flag introduce in the following
commit:
commit 2cb068149c365f1c2b10f2ece6786139527dcc16
OMAP: hwmod: Fix softreset status check for some new OMAP4 IPs
Without this flag properly set, the reset is done, but the hwmod
core code will not wait for the reset completion to continue its
excecution.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Tested-by: Charulatha V <charu@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Govindraj.R <govindraj.raja@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 3b54baad8a79cc252e9d6a5ccc796b4c8b2b7173
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:33 2010 -0700
OMAP4: hwmod data: Fix hwmod entries order
The original OMAP4 hwmod data files is fully generated from HW
database. But since the file is introduced incrementaly along
with driver that uses the data, it has to be splitted by the driver
owner and then re-merged by the maintainer.
Because of the similarity of the data, git is completely lost
during such merge and thus the data does not look like the original one
at the end.
Re-order properly the structures to stay in sync with original data set.
This makes it much easier to diff the autogenerated script output with
what's in mainline, see differences, and generate patches for those
diffs. The goal is to stay in sync with the autogenerated data from now
on.
Add a comment that does contain all the IPs that can have a hwmod, but
do not have it in the file for the moment. It gives a good indication
of the progress.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
[paul@xxxxxxxxx: updated to apply against current core integration branch,
commit message slightly amplified; fixed opt_clks_cnt whitespace]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Govindraj.R <govindraj.raja@xxxxxx>
Cc: Charulatha V <charu@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 65ae65c9058eb41e9566ffd12699607c68b23e5f
Author: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Date: Tue Dec 21 21:08:15 2010 -0700
OMAP1: clock_data: use runtime cpu / machine checks
Otherwise multi-omap1 configurations may set wrong clock speed.
Created and tested against l-o master on Amstrad Delta.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 1124d2f9186ec9e42e1c3f78c20199ba2cb597e2
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:08:14 2010 -0700
OMAP2/3: SRAM: add comment about crashes during a TLB miss
Some users were observing crashes during the execution of CORE DVFS
code from OCM RAM -- a locally-modified copy of the linux-omap code.
Richard Woodruff tracked this down to a DTLB miss which had been
inadvertently and intermittently caused by the local modifications.
(The TLB miss caused the ARM MMU to attempt to walk the page tables
stored in SDRAM, which was not possible since SDRAM is off-line for a
portion of the CORE DVFS OCM RAM code.)
Add a note to the OMAP2 & OMAP3 CORE DVFS SRAM code to warn others that
changes may result in crashes here if they are not carefully tested.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Richard Woodruff <r-woodruff2@xxxxxx>
Cc: Jon Hunter <jon-hunter@xxxxxx>
Cc: Nishanth Menon <nm@xxxxxx>
commit f1f4b7703f8fd165ece458ae97ebddb2b62b2ce3
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:08:14 2010 -0700
OMAP3: clock: fix incorrect rate display when switching MPU rate at boot
The OMAP3 clock code contains some legacy code to allow the MPU rate
to be specified as a kernel command line parameter. If the 'mpurate'
parameter is specified, the kernel will attempt to switch the MPU rate
to this rate during boot. As part of this process, a short message
"Switched to new clocking rate" is generated -- and in this message,
the "Core" clock rate and "MPU" clock rate are transposed.
This patch ensures that the clock rates are displayed in the correct
order.
Thanks to Bruno Guerin <br.guerin@xxxxxxx> for reporting this bug and
proposing a fix. Thanks to Richard Woodruff <r-woodruff2@xxxxxx> for
reviewing the problem and passing the report on.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Bruno Guerin <br.guerin@xxxxxxx>
Cc: Richard Woodruff <r-woodruff2@xxxxxx>
commit 553d239aadc75bee70c7858ac4548d073cb3daff
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:08:14 2010 -0700
OMAP3: clock: clarify usage of struct clksel_rate.flags and struct omap_clk.cpu
Clarify the usage of the struct omap_clk.cpu flags (e.g., CK_*) to use
bits only for individual SoC variants (e.g., CK_3430ES1, CK_3505,
etc.). Superset flags, such as CK_3XXX or CK_AM35XX, are now defined
as disjunctions of individual SoC variant flags. This simplifies the
definition and use of these flags. struct omap_clk record definitions
can now simply specify the bitmask of actual SoCs that the records are
valid for. The clock init code can simply set a single CPU type mask
bit for the SoC that is currently in use, and test against that,
rather than needing to set some combination of flags.
Similarly, clarify the use of struct clksel_rate.flags. The bit
allocated for RATE_IN_3XXX has been reassigned, and RATE_IN_3XXX has
been defined as a disjunction of the 34xx and 36xx rate flags. The
advantages are the same as the above.
Clarify the usage of struct omap_clk.cpu flags such as CK_34XX to only
apply to the SoCs that they name, e.g., OMAP34xx chips. The previous
practice caused significantly different SoCs, such as OMAP36xx, to be
included in CK_34XX. In my opinion, this is much more intuitive.
Similarly, clarify the use of struct clksel_rate.flags, such that
RATE_IN_3430ES2PLUS now only applies to 34xx chips with ES level >= 2
- it does not apply to OMAP36xx.
...
At some point, it probably makes sense to collapse the CK_* and
RATE_IN_* flags together into a single bitfield, and possibly use the
existing CHIP_IS_OMAP* flags for platform detection.
...
This all seems to work fine on OMAP34xx and OMAP36xx Beagle. Not sure
if it works on Sitara or the TI816X, unfortunately I don't have any
here to test with.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit d4521f6731756c82a76d3e791c3ec2d28b38f97e
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:08:14 2010 -0700
OMAP2xxx clock: fix dss2_fck recalc to use clksel
dss2_fck is a clksel clock, and therefore its rate should be recalculated
with the clksel mechanism. This was working in early 2009, but was one of
the casualties of the big OMAP clock merge between 2.6.29 and 2.6.30.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit cb13459b38c8f2e99df4923d2a71ce6db99f2436
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 21:08:14 2010 -0700
OMAP4: clock data: Export control to enable/disable CORE/PER M3 clocks
The CORE and PER M3 post dividers are different from the rest of the
DPLL post dividers as in they go to SCRM, and are used
there to export clocks for instance used by external sensor.
There is no automatic HW dependency in PRCM to manage them. Hence these
two clocks (dpll post dividers) should be managed by SW and explicitly
enabled/disabled.
Add control in clock framework to handle that.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit e0cb70c565acffb210ffa2a4590637d1844d13c5
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 21:08:14 2010 -0700
OMAP4: clock data: Add SCRM auxiliary clock nodes
Add support for auxiliary clocks nodes which are part of SCRM.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit 768ab94f8b2b16a23fa10900430c10ec44f2643e
Author: Jonathan Bergsagel <jbergsagel@xxxxxx>
Date: Tue Dec 21 21:08:13 2010 -0700
OMAP4: clock data: Add missing fields in iva_hsd_byp_clk_mux_ck
Add register address, mask and link to the clksel structure that
were missing in the IVA DPLL mux clock node.
Signed-off-by: Jonathan Bergsagel <jbergsagel@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit 032b5a7e3aa7dca8a13a79ff6a59232d307552a3
Author: Thara Gopinath <thara@xxxxxx>
Date: Tue Dec 21 21:08:13 2010 -0700
OMAP4: clock data: Add missing DPLL x2 clock nodes
This patch extends the OMAP4 clock data to include
various x2 clock nodes between DPLL and HS dividers as the
clock framework skips a x2 while calculating the dpll locked
frequency.
The clock database extensions are autogenerated using
the scripts maintained by Benoit Cousson.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Thara Gopinath <thara@xxxxxx>
[paul@xxxxxxxxx: fixed merge conflicts against v2.6.37-rc5; dropped
dpll_mpu_x2_ck on advice from Benoît]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit ae4b4fc1bb59ad8802800a8103a6519acadcc9cf
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:13 2010 -0700
OMAP3: clock data: Add "wkup_clkdm" in sr1_fck and sr2_fck
The smartreflex modules belong to an ALWON_FCLK clock domain that
does not have any SW control. The gating of that interface clock
is triggered by a transition of the WKUP clock domain to idle.
Attach both smartreflex instances on OMAP3 to the WKUP clock domain.
The missing clock domain field in srX_fck clock nodes was reported by
Kevin during the discussion about smartreflex on OMAP3:
https://patchwork.kernel.org/patch/199342/
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit d9b98f5f9e20389c43370539ef3de4aba7cf1d79
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 21:08:13 2010 -0700
OMAP4: clock data: Add control for pad_clks_ck and slimbus_clk
The gating of pad_clks and slimbus_ck is controlled by the PRCM, but
since the clock source is external, this is the SW responsability
to gate / un-gate it when the mcpdm or slimbus module need to be used.
There is no autogating possible with such external clock.
Add SW control to enable / disable this SW gating in the pad_clks_ck
and slimbus_clk clock node.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Sebastien Guiriec <s-guiriec@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
commit 596efe4792c50163578578bd4fe470f97652aad7
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:16 2010 -0700
OMAP3: control/PM: move padconf save code to mach-omap2/control.c
Move the padconf save code from pm34xx.c to the System Control Module
code in mach-omap2/control.c. This is part of the general push to
move direct register access from middle-layer core code to low-level
core code, so the middle-layer code can be abstracted to work on
multiple platforms and cleaned up.
In the medium-to-long term, this code should be called by the mux
layer code, not the PM idle code. This is because, according to the
TRM, saving the padconf only needs to be done when the padconf
changes[1].
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
1. OMAP34xx Multimedia Device Silicon Revision 3.1.x [Rev. ZH] [SWPU222H]
Section 4.11.4 "Device Off-Mode Sequences"
commit 72e06d087204f3bc9acf281717b90ebf0b9731f7
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:16 2010 -0700
OMAP2+: powerdomain: move header file from plat-omap to mach-omap2
The OMAP powerdomain code and data is all OMAP2+-specific. This seems
unlikely to change any time soon. Move plat-omap/include/plat/powerdomain.h
to mach-omap2/powerdomain.h. The primary point of doing this is to remove
the temptation for unrelated upper-layer code to access powerdomain code
and data directly.
As part of this process, remove the references to powerdomain data
from the GPIO "driver" and the OMAP PM no-op layer, both in plat-omap.
Change the DSPBridge code to point to the new location for the
powerdomain headers. The DSPBridge code should not be including the
powerdomain headers; these should be removed.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Cc: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Cc: Greg Kroah-Hartman <greg@xxxxxxxxx>
commit 1540f214065982e6cbc6b8da1fe65a15e358f7c5
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:15 2010 -0700
OMAP2+: clockdomain: move header file from plat-omap to mach-omap2
The OMAP clockdomain code and data is all OMAP2+-specific. This seems
unlikely to change any time soon. Move plat-omap/include/plat/clockdomain.h
to mach-omap2/clockdomain.h. The primary point of doing this is to remove
the temptation for unrelated upper-layer code to access clockdomain code
and data directly.
DSPBridge also uses the clockdomain headers for some reason, so,
modify it also. The DSPBridge code should not be including the
clockdomain headers; these should be removed.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Cc: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Cc: Greg Kroah-Hartman <greg@xxxxxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit 55ae35073b1c76f24c3736cf797c40d9932b19aa
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:15 2010 -0700
OMAP2/3: clockdomain: remove unneeded .clkstctrl_reg, remove some direct CM register accesses
Reverse some of the effects of commit
84c0c39aec31a09571fc08a752a2f4da0fe9fcf2 ("ARM: OMAP4: PM: Make OMAP3
Clock-domain framework compatible for OMAP4"). On OMAP2/3, the
CM_CLKSTCTRL register is at a constant offset from the powerdomain's
CM instance.
Also, remove some of the direct CM register access from the
clockdomain code, moving it to the OMAP2/3 CM code instead. The
intention here is to simplify the clockdomain code. (The long-term
goal is to move all direct CM register access across the OMAP core
code to the appropriate cm*.c file.)
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit bd2122ca358fbd5c8e94869ae731a0951b36c757
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:15 2010 -0700
OMAP4: clockdomains: add OMAP4 PRCM data and OMAP4 support
Add PRCM partition, CM instance register address offset, and clockdomain
register address offset to each OMAP4 struct clockdomain record. Add OMAP4
clockdomain code to use this new data to access registers properly.
While here, clean up some nearby clockdomain code to allocate auto variables
in my recollection of Linus's preferred style.
The autogeneration scripts have been updated.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit e4156ee52fe617c2c2d80b5db993ff4bf07d7c3c
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:15 2010 -0700
OMAP4: CM instances: add clockdomain register offsets
In OMAP4 CM instances, some registers (CM_CLKSTCTRL, CM_STATICDEP,
CM_DYNAMICDEP, and the module-specific registers underneath) are
organized by clockdomain. Add the clockdomain offset macros to the
appropriate PRCM module header files.
This data was almost completely autogenerated from the TI hardware
database; the autogeneration scripts have been updated.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit b170fbe1f9f1aa38773b1bcf064ab65951ce739d
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:15 2010 -0700
OMAP2+: clockdomains: split the clkdm hwsup enable/disable function
Split _omap2_clkdm_set_hwsup() into _disable_hwsup() and _enable_hwsup().
While here, also document that the autodeps are deprecated and that they
should be removed at the earliest opportunity.
The documentation has been fixed for _{enable,disable}_hwsup(), thanks
to Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> for pointing out that those
functions still had placeholder documentation in an earlier patch revision.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit a64bb9cda8b12f599766c7dfe81770d2082a133a
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:14 2010 -0700
OMAP4: powerdomains: add PRCM partition data; use OMAP4 PRM functions
OMAP4 powerdomain control registers are split between the PRM hardware
module and the PRCM_MPU local PRCM. Add this PRCM partition
information to each OMAP4 powerdomain record, and convert the OMAP4
powerdomain function implementations to use the OMAP4 PRM instance
functions.
Also fixes a potential null pointer dereference of pwrdm->name.
The autogeneration scripts have been updated.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit c4d7e58fb52c632d8e33cd23a4917d7a7f8302ac
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:14 2010 -0700
OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"
Now that OMAP4-specific PRCM functions have been added, distinguish the
existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_".
This patch should not result in any functional change.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Cc: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit dac9a77120e2724e22696f06f3ecb4838da1e3e4
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:14 2010 -0700
OMAP4: PRCM: move global reset function for OMAP4 to an OMAP4-specific file
Move the OMAP4 global software reset function to the OMAP4-specific
prm44xx.c file, where it belongs. Part of the long-term process of
moving all of the direct PRCM register writes into lower-layer code.
Also add OCP barriers on OMAP2/3/4 to reduce the chance that the MPU
will continue executing while the system is supposed to be resetting
itself.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 2ace831ffc8feaffb8bc03da89ff43d948efdc97
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 21:05:14 2010 -0700
OMAP4: PRCM: add OMAP4-specific accessor/mutator functions
In some ways, the OMAP4 PRCM register layout is quite different than
the OMAP2/3 PRCM register layout. For example, on OMAP2/3, from a
register layout point of view, all CM instances were located in the CM
subsystem, and all PRM instances were located in the PRM subsystem.
OMAP4 changes this. Now, for example, some CM instances, such as
WKUP_CM and EMU_CM, are located in the system PRM subsystem. And a
"local PRCM" exists for the MPU - this PRCM combines registers that
would normally appear in both CM and PRM instances, but uses its own
register layout which matches neither the OMAP2/3 PRCM layout nor the
OMAP4 PRCM layout.
To try to deal with this, introduce some new functions, omap4_cminst*
and omap4_prminst*. The former is to be used when writing to a CM
instance register (no matter what subsystem or hardware module it
exists in), and the latter, similarly, with PRM instance registers.
To determine which "PRCM partition" to write to, the functions take a
PRCM instance ID argument. Subsequent patches add these partition IDs
to the OMAP4 powerdomain and clockdomain definitions.
As far as I can see, there's really no good way to handle these types
of register access inconsistencies. This patch seemed like the least
bad approach.
Moving forward, the long-term goal is to remove all direct PRCM
register access from the PM code. PRCM register access should go
through layers such as the powerdomain and clockdomain code that can
hide the details of how to interact with the specific hardware
variant.
While here, rename cm4xxx.c to cm44xx.c to match the naming convention
of the other OMAP4 PRCM files.
Thanks to Santosh Shilimkar <santosh.shilimkar@xxxxxx>, Rajendra Nayak
<rnayak@xxxxxx>, and Benoît Cousson <b-cousson@xxxxxx> for some comments.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit 227fb925d3d3c5e565c1f1323a530564509195f2
Author: Don Fry <pcnet32@xxxxxxxxxxxx>
Date: Tue Dec 21 19:58:15 2010 -0800
MAINTAINERS: email address change
My ISP has changed and therefore my email address.
Signed-off-by: Don Fry <pcnet32@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 17d6ce11195fceda62af00beefde37e37a01337c
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:22 2010 +0200
sisfb: eliminate compiler warnings
Convert some bit masks to 8-bit values to avoid the following compiler
warnings:
drivers/video/sis/sis_main.c:3858: warning: large integer implicitly truncated to unsigned type
drivers/video/sis/init301.c:5855: warning: large integer implicitly truncated to unsigned type
drivers/video/sis/init301.c:5869: warning: large integer implicitly truncated to unsigned type
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 114776776a8e38fff5772efeef68fc3fdde76a82
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:21 2010 +0200
sisfb: delete unused register I/O macros
Delete unused register I/O macros.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ad78adb4e814104510da421a38cfe89ab018a8b1
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:20 2010 +0200
sisfb: replace setSISIDXREG with SiS_SetRegANDOR
Replace setSISIDXREG() with SiS_SetRegANDOR().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 667a8b4114641895c90f8c98db1678c0bfa056df
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:19 2010 +0200
sisfb: replace andSISIDXREG with SiS_SetRegAND
Replace andSISIDXREG() with SiS_SetRegAND().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 27799d6c40828d5983fb1778ad3089740b946af8
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:18 2010 +0200
sisfb: replace orSISIDXREG with SiS_SetRegOR
Replace orSISIDXREG() with SiS_SetRegOR().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 44b751bbe1fb6e7a75bbdee2d0c5f3ee133d6b0f
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:17 2010 +0200
sisfb: replace outSISIDXREG with SiS_SetReg
Replace outSISIDXREG() with SiS_SetReg().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e57d413681b6d9c3d256eeac1e34f0d1b8b81e26
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:16 2010 +0200
sisfb: replace inSISIDXREG with SiS_GetReg
Replace inSISIDXREG() with SiS_GetReg().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 63e13f8e2b4873b97d78567de8ad4dbcc63740db
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:15 2010 +0200
sisfb: replace outSISREG with SiS_SetRegByte
Replace outSISREG() with SiS_SetRegByte().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1e1687d78bcaba01c7a22ef8564af2029e8e9919
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:14 2010 +0200
sisfb: replace inSISREG with SiS_GetRegByte
Replace inSISREG() with SiS_GetRegByte().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f0611a5c220e50dec65041b10bd2fe9484f061a6
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:30:56 2010 -0700
OMAP3: PRM/CM: separate CM context save/restore; remove PRM context save/restore
The OMAP3 PRM module is in the WKUP powerdomain, which is always
powered when the chip is powered, so it shouldn't be necessary to save
and restore those PRM registers. Remove the PRM register save/restore
code, which should save several microseconds during off-mode
entry/exit, since PRM register accesses are relatively slow.
While doing so, move the CM register save/restore code into
CM-specific code. The CM module has been distinct from the PRM module
since 2430.
This patch includes some minor changes to pm34xx.c.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Tero Kristo <tero.kristo@xxxxxxxxx>
Cc: Kalle Jokiniemi <kalle.jokiniemi@xxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit f48b9644ef330a13c6bb16ca85c2efdbe7e25558
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:13 2010 +0200
sisfb: change register I/O functions to use fixed size types
Use fixed-sized types (u8, u16, u32) instead of plain C types.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e68046b72e9b35d054e3d98d71dc2c69d7e88e1e
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:12 2010 +0200
sisfb: remove duplicate function declarations
Remove duplicate register I/O function declarations by moving them into
a common header file.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b5b7dda7b5d9126d531ffa212b6a89d72aeac90a
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:11 2010 +0200
sisfb: delete HAVE_CONFIG_H checks
Delete unneeded HAVE_CONFIG_H checks.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 679c489fffe1ca426de1faa1ba51f0413149d139
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date: Mon Dec 20 23:50:10 2010 +0200
sisfb: eliminate unused variable compiler warning
Eliminate the following compiler warning on non-x86 platforms by limiting
the variable scope:
drivers/video/sis/sis_main.c:4108: warning: unused variable 'temp'
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd
Merge: 623eb15647fc35c5a8cd38985d5958240eb072c1 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 22 12:56:10 2010 +0900
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 59fb659b065f52fcc2deed293cfbfc58f890376c
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:30:55 2010 -0700
OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files
In preparation for adding OMAP4-specific PRCM accessor/mutator
functions, split the existing OMAP2/3 PRCM code into OMAP2/3-specific
files. Most of what was in mach-omap2/{cm,prm}.{c,h} has now been
moved into mach-omap2/{cm,prm}2xxx_3xxx.{c,h}, since it was
OMAP2xxx/3xxx-specific.
This process also requires the #includes in each of these files to be
changed to reference the new file name. As part of doing so, add some
comments into plat-omap/sram.c and plat-omap/mcbsp.c, which use
"sideways includes", to indicate that these users of the PRM/CM includes
should not be doing so.
Thanks to Felipe Contreras <felipe.contreras@xxxxxxxxx> for comments on this
patch.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
Cc: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Cc: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Acked-by: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Cc: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Acked-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Cc: Greg Kroah-Hartman <greg@xxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit cdb54c4457d68994da7c2e16907adfbfc130060d
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:30:55 2010 -0700
OMAP4: PRCM: rename _MOD macros to _INST
Back in the OMAP2/3 PRCM interface days, the macros that referred to
the offsets of individual PRM/CM instances from the top of the PRM/CM
hardware modules were incorrectly suffixed with "_MOD". (They should
have been suffixed with something like "_INST" or "_INSTANCE".) These
days, now that we have better contact with the OMAP hardware people,
we know that this naming is wrong. And in fact in OMAP4, there are
actual hardware module offsets inside the instances, so the incorrect
naming gets confusing very quickly for anyone who knows the hardware.
Fix this naming for OMAP4, before things get too far along, by
changing "_MOD" to "_INST" on the end of these macros. So, for
example, OMAP4430_CM2_INSTR_MOD becomes OMAP4430_CM2_INSTR_INST.
This unfortunately creates quite a large diff, but it is a
straightforward rename. This patch should not result in any
functional changes.
The autogeneration scripts have been updated accordingly.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 0f318fd52d7e251c5f48416c3e7156acc680d81c
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 21 15:30:54 2010 -0700
OMAP4: PRCM: Add SCRM header file
Add the header file with scrm registers absolute address, offset
and bitfields.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
[paul@xxxxxxxxx: renamed OMAP4_SCRM to OMAP4_SCRM_BASE]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
commit d198b514bd9e94930ee0b9ca1cad0a51f5e29608
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:30:54 2010 -0700
OMAP4: PRCM: reorganize existing OMAP4 PRCM header files
Split the existing cm44xx.h file into cm1_44xx.h and cm2_44xx.h files
so they match their underlying OMAP hardware modules. Add clockdomain
offset information.
Add header files for the MPU local PRCM, prcm_mpu44xx.h, and for the
SCRM, scrm44xx.h. SCRM register offsets still need to be added; TI
should do this.
Move the "_MOD" macros out of the prcm-common.h header file, into the
header file of the hardware module that they belong to. For example,
OMAP4430_PRM_*_MOD macros have been moved into the prm44xx.h header.
Adjust #includes of all files that used the old PRCM header file names
to point to the new filenames.
The autogeneration scripts have been updated accordingly.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit f5f9d132d1c212bf3828c7926d95f79e0c20d243
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:30:53 2010 -0700
OMAP3: control/PRCM: move CONTROL_PADCONF_SYS_NIRQ save/restore to SCM code
For some reason, the PRCM context save/restore code also saves and
restores a single System Control Module register,
CONTROL_PADCONF_SYS_NIRQ. This is probably just an error -- the
register should be handled by SCM code -- so this patch moves it
there.
If this register really does need to be saved and restored before the
rest of the PRCM registers, the code to do so should live in the SCM
code, and the PM code should call this separate function. This
register pertains to devices with a stacked modem, so this patch is
unlikely to affect most OMAP devices out there.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 166353bd75587a2158d713af1b9489a79e0ce297
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 20:01:21 2010 -0700
OMAP3: control/PRCM: add omap3_ctrl_write_boot_mode()
Get rid of the open-coded scratchpad write in mach-omap2/prcm.c and
replace it with an actual API, omap3_ctrl_write_boot_mode(). While
there, get rid of the gratuitous omap_writel().
There's not much documentation available for what should wind up in
the scratchpad here, so more documentation would be appreciated.
Also, at some point, we should formalize our treatment of the scratchpad;
right now, accesses to the scratchpad are not well-documented.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit dc0b3a701499bb7727314d7a9c764f7486db4802
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 20:01:20 2010 -0700
OMAP2+: clockdomains: move clockdomain static data to .c files
Static data should be declared in .c files, not .h files. It should be
possible to #include .h files at any point without creating multiple
copies of the same data.
We converted the clock data to .c files some time ago. This patch does
the same for the clockdomain data.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 6e01478ae8a4322c9a2b2d6efed50196265ed5f2
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 20:01:20 2010 -0700
OMAP2+: powerdomains: move powerdomain static data to .c files
Static data should be declared in .c files, not .h files. It should be
possible to #include .h files at any point without creating multiple
copies of the same data.
We converted the clock data to .c files some time ago. This patch does
the same for the powerdomain data.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 4b4f62c4672805466652a785070cc2ac8a398e16
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Tue Dec 21 20:01:19 2010 -0700
OMAP4: powerdomain: Add pwrdm_clear_all_prev_pwrst
Like OMAP3, OMAP4430 ES2 has additional bitfields in PWRSTST register
which help identify the previous power state entered by the
powerdomain. Add pwrdm_clear_all_prev_pwrst to the OMAP4 powerdomains
implementation to support this.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
[paul@xxxxxxxxx: clarified commit message]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 9b7fc907d9378f86eb6b823bbe84ec9ed584b091
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 20:01:19 2010 -0700
OMAP: powerdomain: Arch specific funcs for mem control
Define the following architecture specific funtions for omap2/3/4
.pwrdm_set_mem_onst
.pwrdm_set_mem_retst
.pwrdm_read_mem_pwrst
.pwrdm_read_prev_mem_pwrst
.pwrdm_read_mem_retst
.pwrdm_clear_all_prev_pwrst
.pwrdm_enable_hdwr_sar
.pwrdm_disable_hdwr_sar
.pwrdm_wait_transition
.pwrdm_set_lowpwrstchange
Convert the platform-independent framework to call these functions.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
[paul@xxxxxxxxx: rearranged Makefile changes]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit 12627578523d2d9396cae76b1dad0ed3dccf1730
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 20:01:18 2010 -0700
OMAP: powerdomain: Arch specific funcs for logic control
Define the following architecture specific funtions for omap2/3/4
.pwrdm_set_logic_retst
.pwrdm_read_logic_pwrst
.pwrdm_read_prev_logic_pwrst
.pwrdm_read_logic_retst
Convert the platform-independent framework to call these functions.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit f327e07b0ef9c60a6018799c9f04de10101d8e5a
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 20:01:18 2010 -0700
OMAP: powerdomain: Arch specific funcs for state control
Define the following architecture specific funtions for omap2/3/4
.pwrdm_set_next_pwrst
.pwrdm_read_next_pwrst
.pwrdm_read_pwrst
.pwrdm_read_prev_pwrst
Convert the platform-independent framework to call these functions.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
[paul@xxxxxxxxx: remove remaining static allocations in powerdomains.h file;
remove path in file header comments, rearranged Makefile changes]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 3b1e8b21fcbd686445f0bb42f84701b4621cdec6
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 20:01:18 2010 -0700
OMAP: powerdomain: Infrastructure to put arch specific code
Put infrastructure in place, so arch specific func pointers
can be hooked up to the platform-independent part of the
framework.
This is in preparation of splitting the powerdomain framework into
platform-independent part (for all omaps) and platform-specific
parts.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit 74bea6b9881f4b32f6c0379e46d2f5e16fd34a07
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 21 20:01:17 2010 -0700
OMAP: powerdomain: Move static allocations from powerdomains.h to a .c file
powerdomains.h header today has only static definitions. Adding any
function declarations into it and including it in multiple source file
is expected to cause issues. Hence move all the static definitions
from powerdomains.h file into powerdomains_data.c file.
Also, create a new powerdomain section of the mach-omap2/Makefile, and
rearrange the prcm-common part of the Makefile, now that the
powerdomain code is in its own Makefile section.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
[paul@xxxxxxxxx: rearrange Makefile changes, tweaked commit message]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Rajendra Nayak <rnayak@xxxxxx>
commit ff2516fbef20ed9edd9cc2fc8b8b48d5cb5a932f
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:39:15 2010 -0700
OMAP2+: wd_timer: disable on boot via hwmod postsetup mechanism
The OMAP watchdog timer IP blocks require a specific set of register
writes to occur before they will be disabled[1], even if the device
clocks appear to be disabled in the CM_*CLKEN registers. In the MPU
watchdog case, failure to execute this reset sequence will eventually
cause the watchdog to reset the OMAP unexpectedly.
Previously, the code to disable this watchdog was manually called from
mach-omap2/devices.c during device initialization. This causes the
watchdog to be unconditionally disabled for a portion of kernel
initialization. This should be controllable by the board-*.c files,
since some system integrators will want full watchdog coverage of
kernel initialization. Also, the watchdog disable code was not
connected to the hwmod shutdown code. This means that calling
omap_hwmod_shutdown() will not, in fact, disable the watchdog, and the
goal of omap_hwmod_shutdown() is to be able to shutdown any on-chip
OMAP device.
To resolve the latter problem, populate the pre_shutdown pointer in
the watchdog timer hwmod classes with a function that executes the
watchdog shutdown sequence. This allows the hwmod code to fully
disable the watchdog.
Then, to allow some board files to support watchdog coverage
throughout kernel initialization, add common code to mach-omap2/io.c
to cause the MPU watchdog to be disabled on boot unless a board file
specifically requests it to remain enabled. Board files can do this
by changing the watchdog timer hwmod's postsetup state between the
omap2_init_common_infrastructure() and omap2_init_common_devices()
function calls.
1. OMAP34xx Multimedia Device Silicon Revision 3.1.x Rev. ZH
[SWPU222H], Section 16.4.3.6, "Start/Stop Sequence for WDTs (Using
WDTi.WSPR Register)"
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Charulatha Varadarajan <charu@xxxxxx>
commit 81fbc5ef9b22df2e2198dd0c530719a263a8d1c5
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 19:56:17 2010 -0700
OMAP2+: wd_timer: separate watchdog disable code from the rest of mach-omap2/devices.c
Split the wd_timer disable code out into its own file,
mach-omap2/wd_timer.c; it belongs in its own file rather than
cluttering up devices.c.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Charulatha Varadarajan <charu@xxxxxx>
commit 233cbe5b94096f95ba7bca2162d63275b0b90b5b
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Dec 14 12:42:36 2010 -0700
OMAP2+: hwmod: Update the sysc_cache in case module context is lost
Do not skip the sysc programming in the hmwod framework based
on the cached value alone, since at times the module might have lost
context (due to the Powerdomain in which the module belongs
transitions to either Open Switch RET or OFF).
Identifying if a module has lost context requires atleast one
register read, and since a register read has more latency than
a write, it makes sense to do a blind write always.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoit Cousson <b-cousson@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit b56b7bc8d9293b64e7a459527ae78078902751ff
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 14 12:42:36 2010 -0700
OMAP2+: hwmod: fix a warning, add some docs, remove unused fields
Trivial cleanup and documentation changes on the hwmod code and data:
- add some hwmod documentation to indicate flags that should be moved
outside the static hwmod data in a future patch
- remove some unused fields in the struct omap_hwmod_ocp_if and
struct omap_hwmod structures
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
commit dc6d1cda044b24c3d9f8e4af0431887ebe3488ef
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 14 12:42:35 2010 -0700
OMAP2+: hwmod: upgrade per-hwmod mutex to a spinlock
Change the per-hwmod mutex to a spinlock. (The per-hwmod lock
serializes most post-initialization hwmod operations such as enable,
idle, and shutdown.) Spinlocks are needed, because in some cases,
hwmods must be enabled from timer interrupt disabled-context, such as
an ISR. The current use-case that is driving this is the OMAP GPIO
block ISR: it can trigger interrupts even with its clocks disabled,
but these clocks are needed for register accesses in the ISR to succeed.
This patch also effectively reverts commit
848240223c35fcc71c424ad51a8e8aef42d3879c - this patch makes
_omap_hwmod_enable() and _omap_hwmod_init() static, renames them back
to _enable() and _idle(), and changes their callers to call the
spinlocking versions. Previously, since omap_hwmod_{enable,init}()
attempted to take mutexes, these functions could not be called while
the timer interrupt was disabled; but now that the functions use
spinlocks and save and restore the IRQ state, it is appropriate to
call them directly.
Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> originally proposed this
patch - thanks Kevin.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
commit bd36179eec2827cd60b4a8c6e180cc030c74a4ec
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 14 12:42:35 2010 -0700
OMAP2+: hwmod: add support for per-class custom device reset functions
The standard omap_hwmod.c _reset() code relies on an IP block's
OCP_SYSCONFIG.SOFTRESET register bit to reset the IP block. This
works for most IP blocks on the chip, but unfortunately not all. For
example, initiator-only IP blocks often don't have any MPU-accessible
OCP-header registers, and therefore the MPU can't write to any
OCP_SYSCONFIG registers in that block. Other IP blocks, such as the
IVA and I2C, require a specialized reset sequence.
Since we need to be able to reset these IP blocks as well, allow
custom IP block reset functions to be passed into the hwmod code via a
per-hwmod-class reset function pointer, struct omap_hwmod_class.reset.
If .reset is non-null, then the hwmod _reset() code will call the custom
function instead of the standard OCP SOFTRESET-based code.
As part of this change, rename most of the existing _reset() function
code to _ocp_softreset(), to indicate more clearly that it does not work
for all cases.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Cc: Paul Hunt <hunt@xxxxxx>
Cc: Stanley Liu <stanley_liu@xxxxxx>
commit 2092e5ccf89db09ebde94e9aabd3c86d5fa05c6c
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 14 12:42:35 2010 -0700
OMAP2+: hwmod: add postsetup state
Allow board files and OMAP core code to control the state that some or
all of the hwmods end up in at the end of _setup() (called by
omap_hwmod_late_init() ). Reimplement the old skip_setup_idle code in
terms of this new postsetup state code.
There are two use-cases for this patch: the !CONFIG_PM_RUNTIME case,
in which all IP blocks should stay enabled after _setup() finishes;
and the MPU watchdog case, in which the watchdog IP block should enter
idle if watchdog coverage of kernel initialization is desired, and
should be disabled otherwise.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Charulatha Varadarajan <charu@xxxxxx>
commit e4dc8f507c3066d6fcece988d99b6d766c46af85
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 14 12:42:34 2010 -0700
OMAP2+: hwmod: allow custom pre-shutdown functions
Some OMAP IP blocks, such as the watchdog timers, cannot be completely
shut down via the standard hwmod shutdown mechanism. This patch
enables the hwmod data files to supply a pointer to a custom
pre-shutdown function via the struct omap_hwmod_class.pre_shutdown
function pointer. If the struct omap_hwmod_class.pre_shutdown
function pointer is non-null, the function will be executed before the
existing hwmod shutdown code runs.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Benoît Cousson <b-cousson@xxxxxx>
commit 4805734bcc5a6b28b527a13a5c1603a2912c9f48
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 21 15:25:10 2010 -0700
OMAP2+: io: split omap2_init_common_hw()
Split omap2_init_common_hw() into two functions. The first,
omap2_init_common_infrastructure(), initializes the hwmod code and
data, the OMAP PM code, and the clock code and data. The second,
omap2_init_common_devices(), handles any other early device
initialization that, for whatever reason, has not been or cannot be
moved to initcalls or early platform devices.
This patch is required for the hwmod postsetup patch, which allows
board files to change the state that hwmods should be placed into at
the conclusion of the hwmod _setup() function. For example, for a
board whose creators wish to ensure watchdog coverage across the
entire kernel boot process, code to change the watchdog's postsetup
state will be added in the board-*.c file between the
omap2_init_common_infrastructure() and omap2_init_common_devices() function
calls.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
commit 5b59cc2fc2ff90369d6aa7862caaba3cf45b5075
Author: Raghuveer Murthy <raghuveer.murthy@xxxxxx>
Date: Tue Dec 21 14:14:34 2010 +0000
OMAP4: Pandaboard: Fix MMC card detect gpio line
commit bf56f0a6668cd (2.6.37-rc1), from Nishanth Menon attempted
to fix card detection for PandaBoard, unfortunately, the fix missed
to initialize .gpio_cd member of omap2_hsmmc_info. This results
in a default value of '0', which is a valid GPIO line.
On PandaBoard, the side effect of this is that GPIO line 0 controls
the powering TFP410 DVI chip, and without the fix DVI chip is
inadvertently powered.
Tested-by: David Anders <x0132446@xxxxxx>
Acked-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@xxxxxx>
Signed-off-by: Raghuveer Murthy <raghuveer.murthy@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 79c5f68dc221df729417823d4981373f4762d8eb
Author: Thomas Weber <weber@xxxxxxxxxxxxx>
Date: Tue Dec 21 11:07:09 2010 +0000
OMAP3: Devkit8000: Add DEBUG_LL support
Add support for DEBUG_LL for Devkit8000.
Devkit8000 uses uart 3 for debug output.
Signed-off-by: Thomas Weber <weber@xxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit d858addf10a00e663e438d7607f18496d30f1d1b
Author: Daniel Morsing <daniel.morsing@xxxxxxxxx>
Date: Tue Dec 21 10:23:13 2010 +0000
OMAP2: Devkit8000: Use _cansleep GPIO functions for displayreset lines
The display reset lines are connected to a TPS65930 which may sleep
when changing GPIO values. Use the appropriate function to silence
a nasty warning from gpiolib.
Signed-off-by: Daniel Morsing <daniel.morsing@xxxxxxxxx>
Acked-by: Thomas Weber <weber@xxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit b9e7683bbca638967a56e5d7fd4035a947109621
Merge: bb3613aa34a81a5e2f1227ccdb801fde04a7da10 53da4ce23809ca33405001b0ae117e60b7feced1
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 21 17:05:57 2010 -0800
Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
commit bb3613aa34a81a5e2f1227ccdb801fde04a7da10
Merge: 6971071cdda79cad5f53ba390e466d696e7e9006 bb1c9034b3ce7f29d3d178a87b42b767611d6574
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 21 16:53:00 2010 -0800
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
commit 6971071cdda79cad5f53ba390e466d696e7e9006
Merge: 4584acc3ee236424b5d0b52f143d980cae3c2be5 f31cc9622d75c1c6f041d786698daa425c0425c2
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 21 16:48:20 2010 -0800
Merge branch 'devel-dma' into omap-for-linus
commit 0f16830e9f6de0a44cf1e473ffa80cbe612d5beb
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 21 22:49:28 2010 +0000
drm: Include the connector name in the output_poll_execute() debug message
Always useful to know just which connector was polled and had its
status updated.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit bb1c9034b3ce7f29d3d178a87b42b767611d6574
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:49:57 2010 +0100
OMAP3: ASM sleep code format rework
Cosmetic fixes to the code:
- white spaces and tabs,
- alignement,
- comments rephrase and typos,
- multi-line comments
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 8352129166b8270253a746f336a4429b349b023d
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:44:46 2010 +0100
OMAP3: add comments for low power code errata
Errata covered:
- 1.157 & 1.185
- i443
- i581
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit f7dfe3d8a98b7c4869c09826e3a65663cb9c71be
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:44:45 2010 +0100
OMAP3: rework of the ASM sleep code execution paths
- Reworked and simplified the execution paths for better
readability and to avoid duplication of code,
- Added comments on the entry and exit points and the interaction
with the ROM code for OFF mode restore,
- Reworked the existing comments for better readability.
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 1e81bc015a444e0f908451642b0197199d0c6fa4
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:44:44 2010 +0100
OMAP3: re-organize the ASM sleep code
Organize the code in the following sections:
- register access macros,
- API functions,
- internal functions.
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit fe360e1c8693bca175338da4c53078b0be807c52
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:44:43 2010 +0100
OMAP3: remove hardcoded values from the ASM sleep code
Using macros from existing include files for registers addresses.
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Based on original patch from Vishwa.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Cc: Vishwanath BS <vishwanath.bs@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit b4b36fd94e4ca99b3258ff24c2c58cdde67085e0
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:44:42 2010 +0100
OMAP2+: use global values for the SRAM PA addresses
The SRAM PA addresses are locally defined and used at
different places, i.e. SRAM management code and idle sleep code.
The macros are now defined at a centralized place, for
easier maintenance.
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon<nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit d3cdfd2a15d87d040a5f553231b979fbc28b98e7
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Sat Dec 18 16:44:41 2010 +0100
OMAP3: remove unused code from the ASM sleep code
Remove unused code:
- macros,
- variables,
- unused semaphore locking API. This API shall be added back
when needed,
- infinite loops for debug.
Tested on N900 and Beagleboard with full RET and OFF modes,
using cpuidle and suspend.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Reviewed-by: Nishanth Menon <nm@xxxxxx>
Tested-by: Nishanth Menon<nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit cc1b6028878646a2419b27e5f590b5e9fe01dc3d
Author: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
Date: Mon Dec 20 14:05:09 2010 -0600
OMAP3630: PM: Erratum i583: disable coreoff if < ES1.2
Limitation i583: Self_Refresh Exit issue after OFF mode
Issue:
When device is waking up from OFF mode, then SDRC state machine sends
inappropriate sequence violating JEDEC standards.
Impact:
OMAP3630 < ES1.2 is impacted as follows depending on the platform:
CS0: for 38.4MHz as internal sysclk, DDR content seen to be stable, while
for all other sysclk frequencies, varied levels of instability
seen based on varied parameters.
CS1: impacted
This patch takes option #3 as recommended by the Silicon erratum:
Avoid core power domain transitioning to OFF mode. Power consumption
impact is expected in this case.
To do this, we route core OFF requests to RET request on the impacted
revisions of silicon.
Acked-by: Jean Pihet <j-pihet@xxxxxx>
[nm@xxxxxx: rebased the code to 2.6.37-rc2- short circuit code changed a bit]
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 80723c3fe457a5d29c178da4ac72983f47b37ed7
Author: Nishanth Menon <nm@xxxxxx>
Date: Mon Dec 20 14:05:08 2010 -0600
OMAP3: PM: make omap3_cpuidle_update_states independent of enable_off_mode
Currently omap3_cpuidle_update_states makes whole sale decision
on which C states to update based on enable_off_mode variable
Instead, achieve the same functionality by independently providing
mpu and core deepest states the system is allowed to achieve and
update the idle states accordingly.
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Signed-off-by: Nishanth Menon <nm@xxxxxx>
[khilman: fixed additional user of this API in OMAP CPUidle driver]
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit c4236d2e7913d18d058a018f0d19473eb6a11a3c
Author: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx>
Date: Mon Dec 20 14:05:07 2010 -0600
OMAP3630: PM: Disable L2 cache while invalidating L2 cache
While coming out of MPU OSWR/OFF states, L2 controller is reseted.
The reset behavior is implementation specific as per ARMv7 TRM and
hence $L2 needs to be invalidated before it's use. Since the
AUXCTRL register is also reconfigured, disable L2 cache before
invalidating it and re-enables it afterwards. This is as per
Cortex-A8 ARM documentation.
Currently this is identified as being needed on OMAP3630 as the
disable/enable is done from "public side" while, on OMAP3430, this
is done in the "secure side".
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
[nm@xxxxxx: ported to 2.6.37-rc2, added hooks to enable the logic only on 3630]
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 458e999eb14a301d4176783c8fcb277f5d009b4e
Author: Nishanth Menon <nm@xxxxxx>
Date: Mon Dec 20 14:05:06 2010 -0600
OMAP3630: PM: Erratum i608: disable RTA
Erratum id: i608
RTA (Retention Till Access) feature is not supported and leads to device
stability issues when enabled. This impacts modules with embedded memories
on OMAP3630
Workaround is to disable RTA on boot and coming out of core off.
For disabling RTA coming out of off mode, we do this by overriding the
restore pointer for 3630 as the first point of entry before caches are
touched and is common for GP and HS devices. To disable earlier than
this could be possible by modifying the PPA for HS devices, but not for
GP devices.
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
[ambresh@xxxxxx: co-developer]
Signed-off-by: Ambresh K <ambresh@xxxxxx>
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 8cdfd83473d9b408b924b5d32777ac3fddd251ff
Author: Nishanth Menon <nm@xxxxxx>
Date: Mon Dec 20 14:05:05 2010 -0600
OMAP3: pm: introduce errata handling
Introduce errata handling for OMAP3. This patch introduces
errata variable and stub for initialization which will be
filled up by follow-on patches.
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 9d93b8a2c8c78972f0a3d15a820288dbb3968bf2
Author: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx>
Date: Mon Dec 20 14:05:04 2010 -0600
OMAP3: PM: Erratum i581 support: dll kick strategy
Erratum i581 impacts OMAP3 platforms.
PRCM DPLL control FSM removes SDRC_IDLEREQ before DPLL3 locks causing
the DPLL not to be locked at times.
IMPORTANT:
*) This is not a complete workaround implementation as recommended
by the silicon erratum. This is a support logic for detecting lockups and
attempting to recover where possible and is known to provide stability
in multiple platforms.
*) This code is mostly important for inactive and retention. The ROM code
waits for the maximum DLL lock time when resuming from off mode. So for
off mode this code isn't really needed.
*) counters are introduced here for eventual export to userspace once the
cleanups are completed.
This should eventually get refactored as part of cleanups to sleep34xx.S
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 0bd40535365c318e331f5e872030a710d5746167
Author: Richard Woodruff <r-woodruff2@xxxxxx>
Date: Mon Dec 20 14:05:03 2010 -0600
OMAP3: PM: Update clean_l2 to use v7_flush_dcache_all
Analysis in TI kernel with ETM showed that using cache mapped flush
in kernel instead of SO mapped flush cost drops by 65% (3.39mS down
to 1.17mS) for clean_l2 which is used during sleep sequences.
Overall:
- speed up
- unfortunately there isn't a good alternative flush method today
- code reduction and less maintenance and potential bug in
unmaintained code
This also fixes the bug with the clean_l2 function usage.
Reported-by: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
[nm@xxxxxx: ported rkw's proposal to 2.6.37-rc2]
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Richard Woodruff <r-woodruff2@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit e29ff7290e826d5c7fda906d99233713a47a92c8
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Tue Dec 21 16:05:38 2010 -0500
drm/radeon/kms: fix bug in r600_gpu_is_lockup
We were using the lockup struct from the wrong union.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: Jerome Glisse <jglisse@xxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 53da4ce23809ca33405001b0ae117e60b7feced1
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 9 09:13:48 2010 -0600
OMAP3: remove OPP interfaces from OMAP PM layer
With new OPP layer, OPP users will access OPP API directly instead of
using OMAP PM layer, so remove all notions of OPPs from the OMAP PM
layer.
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit f5a6422d4e0e85a9c7f5522d3321254bfdfa7f04
Author: Nishanth Menon <nm@xxxxxx>
Date: Thu Dec 9 09:13:47 2010 -0600
omap4: opp: add OPP table data
This patch adds OPP tables for OMAP4. New file has been added to keep
the OMAP4 opp tables and the registration of these tables with the
generic opp framework by OMAP SoC OPP interface.
Based on:
http://dev.omapzoom.org/?p=santosh/kernel-omap4-base.git;a=blob;f=arch/arm/mach-omap2/opp44xx_data.c;h=252e3d0cb6050a64f390b9311c1c4977d74f762a;hb=refs/heads/omap4_next
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit fd1478cd61624479c89e35602925459d74505ff3
Author: Nishanth Menon <nm@xxxxxx>
Date: Thu Dec 9 09:13:46 2010 -0600
omap: opp: add OMAP3 OPP table data and common init
Add OPP data for OMAP34xx and OMAP36xx and initialization functions
to populate OPP tables based on current SoC.
introduce an OMAP generic opp initialization routine which OMAP3
and OMAP4+ SoCs can use to register their OPP definitions.
Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 1cbbe37ac5c78fb59ce02f639d6c4f69b610cf5e
Author: Thara Gopinath <thara@xxxxxx>
Date: Mon Dec 20 21:17:21 2010 +0530
OMAP: pm.c correct the initcall for an early init.
omap2_common_pm_init is the API where generic system devices like
mpu, l3 etc get initialized. This has to happen really early on
during the boot and not at a later time. This is especially important
with the new opp changes as these devices need to be built before the
opp tables init happen. Today both are device initcalls and it works
just because of the order of compilation. Making this postcore_initcall
is ideal because the omap device layer init happens as a core_initcall
and typically rest of the driver/device inits are arch_initcall or
something lower.
Signed-off-by: Thara Gopinath <thara@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit c166381d4013fd32512f124c237f4213ae9888e9
Author: Jean Pihet <j-pihet@xxxxxx>
Date: Thu Dec 9 18:39:58 2010 +0100
OMAP2+: disable idle early in the suspend sequence
Some bad interaction between the idle and the suspend paths has been
identified: the idle code is called during the suspend enter and exit
sequences. This could cause corruption or lock-up of resources.
The solution is to move the calls to disable_hlt at the very beginning
of the suspend sequence (ex. in omap3_pm_begin instead of
omap3_pm_prepare), and the call to enable_hlt at the very end of
the suspend sequence (ex. in omap3_pm_end instead of omap3_pm_finish).
Tested with RET and OFF on Beagle and OMAP3EVM.
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 503b1a529a6b62b31904bab4699752c523cf76b2
Merge: 4b4f54670859074cf7670cc6fa96fe34a65846d9 215faf9c5f6e319e97edea9e178123e07825c14d
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 21 13:26:15 2010 -0800
Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods
commit 4b4f54670859074cf7670cc6fa96fe34a65846d9
Author: Denis Kirjanov <dkirjanov@xxxxxxxxxx>
Date: Tue Dec 21 02:02:26 2010 +0000
sundance: Program station address into HW
Program adapter's StationAddress register when changing device MAC address
Signed-off-by: Denis Kirjanov <dkirjanov@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 24de5285dce378e4170e068f2662236d2b46c033
Author: Denis Kirjanov <dkirjanov@xxxxxxxxxx>
Date: Tue Dec 21 02:01:36 2010 +0000
sundance: Wrap up acceess to ASICCtrl high word with a macro
Wrap up acceess to ASICCtrl high word with a macro
Signed-off-by: Denis Kirjanov <dkirjanov@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3b4694de3596edac0159524b15a4a06945875421
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 17 22:12:18 2010 +0900
perf probe: Fix to support libdwfl older than 0.148
Since the libdwfl library before 0.148 fails to analyze live kernel debuginfo,
'perf probe --list' compiled with those old libdwfl sometimes crashes.
To avoid that bug, perf probe does not use libdwfl's live kernel analysis
routine when it is compiled with older libdwfl.
Side effect: perf with older libdwfl doesn't support listing probe in modules
with source code line. Those could be shown by symbol+offset.
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
LKML-Reference: <20101217131218.24123.62424.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit ea187cfbb9a3de73e7bd7b7125ae345d92d4384b
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 17 22:12:00 2010 +0900
perf tools: Fix lazy wildcard matching
Fix lazy wildcard matching to ignore space after wild card.
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
LKML-Reference: <20101217131200.24123.8202.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit da521b2c4f046383bc8941604174bc0e8bffb430
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 21 12:43:16 2010 -0800
net: Fix range checks in tcf_valid_offset().
This function has three bugs:
1) The offset should be valid most of the time, this is just
a sanity check, therefore we should use "likely" not "unlikely"
2) This is the only place where we can check for arithmetic overflow
of the pointer plus the length.
3) The existing range checks are off by one, the valid range is
skb->head to skb_tail_pointer(), inclusive.
Based almost entirely upon a patch by Ralph Loader.
Reported-by: Ralph Loader <suckfish@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 12b16dadbc2406144d408754f96d0f44aa016239
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 15 19:45:28 2010 +0000
filter: optimize accesses to ancillary data
We can translate pseudo load instructions at filter check time to
dedicated instructions to speed up filtering and avoid one switch().
libpcap currently uses SKF_AD_PROTOCOL, but custom filters probably use
other ancillary accesses.
Note : I made the assertion that ancillary data was always accessed with
BPF_LD|BPF_?|BPF_ABS instructions, not with BPF_LD|BPF_?|BPF_IND ones
(offset given by K constant, not by K + X register)
On x86_64, this saves a few bytes of text :
# size net/core/filter.o.*
text data bss dec hex filename
4864 0 0 4864 1300 net/core/filter.o.new
4944 0 0 4944 1350 net/core/filter.o.old
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cb8f404893bab40431f7eeb2511454031b07e7df
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Tue Dec 14 06:09:59 2010 +0000
bnx2: remove cancel_work_sync() from remove_one
Michael pointed out that bnx2_close() already cancels bp->reset_task
and thus it is guaranteed to be idle when bnx2_remove_one() is called.
Remove the unnecessary cancel_work_sync() in remove_one.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a13c13273a206e0c4b9a814277fb50529457abe7
Merge: 34a52f363ab6bcf6d50a65c153dec03f3fb32653 c04bfc6b223662c42a77727342c1df7d39e686a2
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 21 12:17:29 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
commit 4931445b94f49672028b81ace9d4eee8ddf19ab2
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Date: Thu Dec 9 11:22:50 2010 +0200
OMAP2/3: OneNAND: add 104MHz support
Add GPMC timings for 104MHz OneNAND.
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit a3551f5b0c3ca7aaa053e554e3ee766983b5d713
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Date: Thu Dec 9 10:48:27 2010 +0200
OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds
The calculations done with sync_clk are anyway in picoseconds
and switching to picoseconds allows sync_clk values that are
not a whole number of nanoseconds - which is sometimes the
case.
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 10 08:40:31 2010 +0100
mmc: Fix re-probing with PM_POST_RESTORE notification
In the error-path where PM notifies PM_POST_RESTORE, the rescan-blockage
should be cleared as well. Otherwise it'll be never re-probed.
Also, as a bonus, this fixes a bug in S4 with user-mode suspend in the
current code, as it sends PM_POST_RESTORE instead of
PM_POST_HIBERNATION wrongly.
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
commit 2f1d791882d21a4002a719fb016a1ac21c8bd6b7
Author: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Date: Fri Dec 10 19:14:32 2010 +0100
mmc: atmel-mci: fix multiblock SDIO transfers
Based on report made by Yauhen in:
"MMC: Fix multiblock SDIO transfers in AT91 MCI" patch,
I report those changes to the brother driver: atmel-mci.
So, this patch sets SDIO transfer types: SDIO block and SDIO byte
transfers instead of using ordinary MMC block transfers.
It is checking opcode for SDIO CMD53 and setting transfer
type in MCI_CMDR register properly.
Reported-by: Yauhen Kharuzhy <yauhen.kharuzhy@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
commit a2255ff45143001fecbc5e5a4b58fcb999d393ae
Author: Yauhen Kharuzhy <yauhen.kharuzhy@xxxxxxxxxxx>
Date: Thu Nov 25 12:11:51 2010 +0200
mmc: at91_mci: fix multiblock SDIO transfers
The AT91 MCI has special SDIO transfer types: SDIO block and SDIO byte
transfers, but at91_mci driver doesn't use them and handles all SDIO
transfers as ordinary MMC block transfers. This causes problems for
multiple-block SDIO transfers (in particular for 256-bytes blocks).
Fix this situation by checking the opcode for SDIO CMD53 and setting
the transfer type in the AT91_MCI_CMDR register properly.
This patch was tested with libertas SDIO driver: problem with TX
timeouts on big packets was eliminated.
Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
commit 90a8a73c06cc32b609a880d48449d7083327e11a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 21 11:26:40 2010 -0800
Linux 2.6.37-rc7
commit 21dd9ae5a4e9f717f3957ec934dd3158129436b8
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Mon Dec 20 15:18:05 2010 +0100
perf probe: Handle gracefully some stupid and buggy line syntaxes
Currently perf probe doesn't handle those incorrect syntaxes:
$ perf probe -L sched.c:++13
$ perf probe -L sched.c:-+13
$ perf probe -L sched.c:10000000000000000000000000000+13
This patches rewrites parse_line_range_desc() to handle them.
As a bonus, it reports more useful error messages instead of: "Tailing
with invalid character...".
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1292854685-8230-7-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit c6d92e9b84da2002ee7a75b784834970ddfd3bfd
Merge: ba119204ff6ff722dcec387b305d9c2d23380726 5155e2c70fc50bc475911dab5dba2f80130523c7
Author: David Brown <davidb@xxxxxxxxxxxxxx>
Date: Tue Dec 21 10:53:43 2010 -0800
Merge branch 'msm-usb' into for-next
* msm-usb:
MSM: Add USB support for MSM7x30
MSM: Add USB suport for QSD8x50
commit 34a52f363ab6bcf6d50a65c153dec03f3fb32653
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 20 21:34:56 2010 +0000
stmmac: unwind properly in stmmac_dvr_probe()
The original code had a several problems:
*) It had potential null dereferences of "priv" and "res".
*) It released the memory region before it was aquired.
*) It didn't free "ndev" after it was allocated.
*) It didn't call unregister_netdev() after calling stmmac_probe().
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4b97f8e10893e2c8f64a2795901bdb447a3308f4
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 20 21:04:02 2010 +0000
bnx2x: remove bogus check
We dereferenced params on the line before so it's too late to check if
params is NULL. In fact, params can never be NULL and strict_cos is
either 0 or 1 so that part of the check is bogus too. Let's remove it.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 70978182d431e0348e6ef711d0f962d12c03bc46
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 20 21:22:51 2010 +0000
net: timestamp cloned packet in dev_queue_xmit_nit
Le vendredi 17 décembre 2010 à 10:26 +0100, Eric Dumazet a écrit :
>
> I think we can add this after latest Changli patch :
>
> He does one skb_clone() before calling the sniffers.
> We could set timestamp on this clone, instead of original skb.
>
> Problem solved.
>
[PATCH net-next-2.6] net: timestamp cloned packet in dev_queue_xmit_nit
Now we do one clone of skb if at least one sniffer might take packet,
we also can do the skb timestamping on the clone and let original packet
unchanged.
This is a generalization of commit 8caf153974f2 (net: sch_netem: Fix an
inconsistency in ingress netem timestamps.)
This way, we can have a good idea when packets are delivered to our
stack (tcpdump -i ifb0), while a tcpdump on original device gives
timestamps right before ingressing.
This also speedup our stack, avoiding taking timestamps if not needed.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Changli Gao <xiaosuo@xxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Cc: Jarek Poplawski <jarkao2@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e9ccc998b70fbe59626f393bb0328402159c6b5c
Author: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
Date: Fri Dec 17 13:11:16 2010 -0800
[SCSI] Add missing SPC-4 CDB and MAINTENANCE_[IN,OUT] service action definitions
This patch adds a handful of missing CDBs defs that are used by TCM
persistent reservation logic in the SPC-4 defined CDB exclusion table for
registrations and reservations.
This includes a number of missing MI_* and MO_* prefixed service actions defs
for MAINTENANCE_IN and MAINTENANCE_OUT that are mentioned wrt to persistent
registration and reservation status for the SCSI Initiator Port.
Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3f1530c1e1f7fc570672f4a54565949070fad05f
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 14 18:51:48 2010 -0800
[SCSI] megaraid_sas: Update GPL headers.
This patch updates the GPL headers in megaraid_sas_base.c and megaraid_sas.h.
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 0d49016bbab4fe9164710b1d4bbae116b89b7f7e
Author: adam radford <aradford@xxxxxxxxx>
Date: Tue Dec 14 19:17:17 2010 -0800
[SCSI] megaraid_sas: Rename megaraid_sas.c to megaraid_sas_base.c
This patch renames megaraid_sas.c to megaraid_sas_base.c to facilitate
other files in the compile.
Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit fd01a6632da253210c3dbc7814bc6eceda96623d
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Thu Dec 16 14:26:37 2010 -0600
[SCSI] fix the return value of scsi_target_queue_read()
It seems that zero should be returned if scsi_target_is_busy(starget) is
true, no matter if sdev is on the starved list.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit db422318cbca55168cf965f655471dbf8be82433
Author: Menny Hamburger <Menny_Hamburger@xxxxxxxx>
Date: Thu Dec 16 14:57:07 2010 -0500
[SCSI] scsi_dh: propagate SCSI device deletion
Currently, when scsi_dh_activate() returns with an error
(e.g. SCSI_DH_NOSYS) the activate_complete callback is not called and
the error is not propagated to DM mpath.
When a SCSI device attached to a device handler is deleted, userland
processes currently performing I/O on the device will have their I/O
hang forever.
- Set SCSI_DH_NOSYS error when the handler is in the process of being
deleted (e.g. the SCSI device is in a SDEV_CANCEL or SDEV_DEL state).
- Set SCSI_DH_DEV_OFFLINED error when device is in SDEV_OFFLINE state.
- Call the activate_complete callback function directly from
scsi_dh_activate if an error has been set (when either the scsi_dh
internal data has already been deleted or is in the process of being
deleted).
The patch was tested in an iSCSI environment, RDAC H/W handler and
multipath. In the following reproduction process, dd will I/O hang
forever and the only way to release it will be to reboot the machine:
1) Perform I/O on a multipath device:
dd if=/dev/dm-0 of=/dev/zero bs=8k count=1000000 &
2) Delete all slave SCSI devices contained in the mpath device:
I) In an iSCSI environment, the easiest way to do this is by
stopping iSCSI:
/etc/init.d/iscsi stop
II) Another way to delete the devices is by applying the following
bash scriptlet:
dm_devs=$(ls /sys/block/ | grep dm- | xargs)
for dm_dev in $dm_devs; do
devices=$(ls /sys/block/$dm_dev/slaves)
for device in $devices; do
echo 1 > /sys/block/$device/device/delete
done
done
NOTE: when DM mpath's fail_path uses blk_abort_queue this scsi_dh change
isn't strictly required. However, DM mpath's call to blk_abort_queue
will soon be reverted because it has proven to be unsafe due to a race
(between blk_abort_queue and scsi_request_fn) that can lead to list
corruption. Therefore we cannot rely on blk_abort_queue via fail_path,
but even if we could this scsi_dh change is still preferrable.
Signed-off-by: Menny Hamburger <Menny_Hamburger@xxxxxxxx>
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Reviewed-by: Babu Moger <babu.moger@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 35dd3039e09cd46ca3a8733ff1c817bf7b7b19ce
Author: Stephen M. Cameron <StephenM.Cameron>
Date: Thu Dec 16 13:01:03 2010 -0600
[SCSI] hpsa: do not consider RAID level to be part of device identity
Otherwise, after doing a RAID level migration, the disk will be
disruptively removed and re-added as a different disk on rescan.
Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a0b89872b305bd0f6f5af1dd26274a3f057a2303
Author: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 13:00:58 2010 -0600
[SCSI] hpsa: do not consider firmware revision when looking for device changes.
The firmware may have been updated, in which case, it's the same device,
and in that case, we do not want to remove and add the device, we want to
let it continue as is.
Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 774342844f368a0c3ba907f192d844ae337d01aa
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Wed Dec 15 17:58:20 2010 -0500
[SCSI] lpfc 8.3.20: Update lpfc driver version to 8.3.20
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 4042629e426da5ff0c793276a61103bd3f6b2183
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Wed Dec 15 17:58:10 2010 -0500
[SCSI] lpfc 8.3.20: Updates to FC discovery commands
Updated commands used for ELS to utilize VPI
Allocate RPI at node creation time and pass in ELS commnads.
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2fcee4bf874a8ae72ada68b62728d1fdeb30e3d4
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Wed Dec 15 17:57:46 2010 -0500
[SCSI] lpfc 8.3.20: Implement new SLI4 init procedures based on if_type
Implement new SLI4 init procedures based on if_type:
- Add structure changes for new SLIPORT registers and BAR changes.
- Update register names to be consistent with inteface spec terms.
- Added union to encapsulate Hardward error registers.
- Rework lpfc_sli4_post_status_check() around SLI-4's SLI_INTF type
- Removed the lpfc_sli4_fw_cfg_check routine
- Segmented driver logic to include evaluation of the if_type to
engage different behaviors.
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 70f3c073362ef7b5e55c92b83eb2dd9a7fb4e9bf
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Wed Dec 15 17:57:33 2010 -0500
[SCSI] lpfc 8.3.20: Implement the FC and SLI async event handlers
Implement the FC and SLI async event handlers:
- Updated MQ_CREATE_EXT mailbox structure to include fc and SLI async events.
- Added the SLI trailer code.
- Split physical field into type and number to reflect latest SLI spec.
- Changed lpfc_acqe_fcoe to lpfc_acqe_fip to reflect latest Spec changes.
- Added lpfc_acqe_fc_la structure for FC link attention async events.
- Added lpfc_acqe_sli structure for sli async events.
- Added lpfc_sli4_async_fc_evt routine to handle fc la async events.
- Added lpfc_sli4_async_sli routine to handle sli async events.
- Moved LPFC_TRAILER_CODE_FC to be handled by its own handler function.
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit be858b65cf9701e75bc49ed38c56e5b51ff281cd
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Wed Dec 15 17:57:20 2010 -0500
[SCSI] lpfc 8.3.20: Critical fixes
- Use for iocbq->context1 to hold the ndlp pointer.
- Set ndlp in all iocbs generated from ioctl functions.
- Turn parity and serr bits back on after performing sli4 board reset.
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 395eb20238f5f1d5fba0ae284760a68095dd9e66
Author: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Date: Mon Dec 13 16:23:51 2010 -0800
[SCSI] bfa: Update the driver version to 2.3.2.3
Signed-off-by: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 15821f05b78dbeb2f897d1d22576449103a4d8d5
Author: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Date: Mon Dec 13 16:23:27 2010 -0800
[SCSI] bfa: io tag handling and minor bug fix.
Fix iotag handling:
1) Update and check io tag for retry case.
2) Clearing upper 3 bits in io tag when an IO completes.
The 3 upper bits in io tags are used for counting FCP exchange retry.
Un-cleared bits will cause firmware to access invalid memory when the
same io tag is used for an IO to a target that doesn't support FCP
exchange retry.
3) Only check the effective bits when validating an iotag.
Other minor fixes:
1) Added trace to get FC header type with assert of unhandled packet received.
Ignore the type FC_TYPE_FC_FSS (FC_XS).
2) Fixed the adapter info display check - to check for fcmode flag even.
Signed-off-by: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit b704495c6707013806d1b66507a967896e2b4a7c
Author: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Date: Mon Dec 13 16:17:42 2010 -0800
[SCSI] bfa: direct attach mode fix.
- Direct attach is not working due to the check of PID in fcxp_send request.
- Added logic to set the lps->lp_pid with the PID assigned for n2n mode.
Signed-off-by: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f1d584d70f31f54e0a559049906f42db89e2746d
Author: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Date: Mon Dec 13 16:17:11 2010 -0800
[SCSI] bfa: IOC auto recovery fix.
- Made IOC auto_recovery synchronized and not timer based.
- Only one PCI function will attempt to recover and reinitialize
the ASIC on a failure, after all the active PCI fns
acknowledge the IOC failure.
Signed-off-by: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f3a060ca57903daaf2f1a88c6c25832619b2a74f
Author: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Date: Mon Dec 13 16:16:50 2010 -0800
[SCSI] bfa: Store port configuration in flash for persistency.
When the bfa driver is loaded a flogi is sent without the knowledge of
trunking configuration. This normal flogi causes the switch ports
which had trunking enabled to go to persistent offline. Solution is
to store the port configuration (which has trunking info) in the flash
for persistency. The firmware will read this configuration when the
very first fcport enable is received.
Signed-off-by: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 4e78efefa3c083240bd47153ffa99642bfdc7811
Author: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Date: Mon Dec 13 16:16:09 2010 -0800
[SCSI] bfa: IOC fwtrace save logic & state machine fixes.
- Move fw trace save logic to bfa_ioc_sm_fail_entry(),
so that fw trace is saved irrespective of the cause of the failure.
- Make bfa_ioc_sm_fail() a failure parking state.
- Rename bfa_ioc_sm_initfail() to a more appropriate bfa_ioc_sm_fail_retry()
as it is no longer a parking state.
Signed-off-by: Krishna Gudipati <kgudipat@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit da99dcc98dd66a2de4864645bcafffd93cf5a62f
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:13:20 2010 -0800
[SCSI] bfa: remove unused functions and misc cleanups
Remove unused functions and fix checkpatch errors. Misc cleanups in
comment and formatting.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f16a17507b09e10e0cccc4d675ccbfe030d51ef1
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:12:32 2010 -0800
[SCSI] bfa: remove all OS wrappers
Remove OS wrapper functions/macros, and as a result remove bfa_os_inc.h.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f314878ab95d4802ddde066096f7b30087cea7ba
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:11:39 2010 -0800
[SCSI] bfa: remove all SCSI IO callbacks
Remove SCSI IO callbacks, and as a result remove bfa_cb_ioim.h.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit e3e7d3eebb08735c8a14cd27f76dac784e9a9b75
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:10:27 2010 -0800
[SCSI] bfa: scatter gather processing change
Modified scatter gather processing to use the kernel provided
scsi_for_each_sg() macro.
1) Instead of allocating and setting up sgpg in bfa_ioim_sge_setup(),
we only do allocation. As a result, we remove
bfa_ioim_sgpg_setup() and rename bfa_ioim_sge_setup() to
bfa_ioim_sgpg_alloc().
2) bfa_ioim_send_ioreq() call scsi_for_each_sg() to handle both inline
and sgpg setup.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit b77ee1fb10e4b76dc61094b3678d805be0e4f7ba
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:09:26 2010 -0800
[SCSI] bfa: remove a file with small size
Removed bfa_drv.c, merged it to bfa_core.c and modified Makefile.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f7f73812e95077c19a2801bbf4f483fcdab5232f
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:08:43 2010 -0800
[SCSI] bfa: clean up one line functions
Cleaned up one line functions.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit df0f1933eb5454a5c481311837076056557467ad
Author: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Date: Thu Dec 9 19:07:46 2010 -0800
[SCSI] bfa: remove unused and empty functions
Removed unused and empty functions.
Signed-off-by: Maggie Zhang <xmzhang@xxxxxxxxxxx>
Signed-off-by: Jing Huang <xmzhang@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 402c6eec1bd04581c04de758e4efddc020b78f91
Author: Robert Jennings <rcj@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 9 14:03:59 2010 -0600
[SCSI] ibmvfc: Improve ibmvfc_async_desc memory layout
By changing field ordering we can avoid a couple of memory holes in
the tables that use the ibmvfc_async_desc structure.
Signed-off-by: Robert Jennings <rcj@xxxxxxxxxxxxxxxxxx>
Acked-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 058548ae23f5811d0ccdb39d5ad40f078aca63ef
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Thu Dec 9 09:37:56 2010 -0800
[SCSI] iscsi: add module alias
Since iscsi transport can be built as a module and uses netlink socket
to communicate. The module should have an alias to autoload when socket
of NETLINK_ISCSI type is requested.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Acked-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 0d81b4e8dcc4177726f30a1ac8df1f726d2a7c0c
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Wed Dec 8 17:30:46 2010 +0100
[SCSI] zfcp: Add allow_lun_scan module parameter
The zfcpdump tool requires a method to attach exactly one LUN. The
easiest way to achieve this is to add a new zfcp module parameter.
When allow_lun_scan is set to "false", zfcp only accepts LUNs that
have been configured through the unit_add sysfs interface.
Reviewed-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 51780d2c38a7294c2c302ae9d2ea517bd4153dec
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Dec 2 15:16:18 2010 +0100
[SCSI] zfcp: Add __init declaration to zfcp_cache_hw_align
The function zfcp_cache_hw_align is only called from zfcp_module_init,
so it should be declared with __init as well.
Reviewed-by: Steffen Maier <maier@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3d63d3b4fb5fb3674f2d97725e187cbfa22562bc
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Dec 2 15:16:17 2010 +0100
[SCSI] zfcp: Move qdio setup from erp to zfcp_qdio.c
Initialization of the qdio waitqueue should happen when the qdio data
is initialized and the QDIOUP flag should be handled in the qdio code
as well. Adjust the code accordingly and remove the superfluos
function zfcp_erp_adapter_strategy_open_qdio.
Reviewed-by: Steffen Maier <maier@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit ea4a3a6ac40e2a585654808d4aefb39a6d57dca0
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Thu Dec 2 15:16:16 2010 +0100
[SCSI] zfcp: Redesign of the debug tracing final cleanup.
This patch is the final cleanup of the redesign from the zfcp tracing.
Structures and elements which were used by multiple areas of the
former debug tracing are now changed to the new scheme.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 250a1352b95e1db3216e5c5d4f4365bea5122f4a
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Thu Dec 2 15:16:15 2010 +0100
[SCSI] zfcp: Redesign of the debug tracing for SCSI records.
This patch is the continuation to redesign the zfcp tracing to a more
straight-forward and easy to extend scheme.
This patch deals with all trace records of the zfcp SCSI area.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a54ca0f62f953898b05549391ac2a8a4dad6482b
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Thu Dec 2 15:16:14 2010 +0100
[SCSI] zfcp: Redesign of the debug tracing for HBA records.
This patch is the continuation to redesign the zfcp tracing to a more
straight-forward and easy to extend scheme.
This patch deals with all trace records of the zfcp HBA area.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2c55b750a884b86dea8b4cc5f15e1484cc47a25c
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Thu Dec 2 15:16:13 2010 +0100
[SCSI] zfcp: Redesign of the debug tracing for SAN records.
This patch is the continuation to redesign the zfcp tracing to a more
straight-forward and easy to extend scheme.
This patch deals with all trace records of the zfcp SAN area.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit ae0904f60fab7cb20c48d32eefdd735e478b91fb
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Thu Dec 2 15:16:12 2010 +0100
[SCSI] zfcp: Redesign of the debug tracing for recovery actions.
The tracing environment of the zfcp LLD has become very bulky and hard
to maintain. Small changes involve a large modification process which
is error-prone and not effective. This patch is the first of a set to
redesign the zfcp tracing to a more straight-forward and easy to
extend scheme. It removes all interpretation and visualization parts
and focuses on bare logging of the information.
This patch deals with all trace records of the zfcp error recovery.
Signed-off-by: Swen schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 6b57b159709dcb4d53e64738f2d1f73b36e41601
Author: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Date: Thu Dec 2 22:13:00 2010 -0800
[SCSI] qla4xxx: Update driver version to 5.02.00-k5
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7d01d0698f450ed8cc9fd4557f88a3309c868d44
Author: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Date: Thu Dec 2 22:12:51 2010 -0800
[SCSI] qla4xxx: Updated the Copyright header
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3930b8c1f3582d43757cbcc9b7ecaf05f6b4a66e
Author: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Date: Thu Dec 2 22:12:47 2010 -0800
[SCSI] qla4xxx: do not reset hba if ql4xdontresethba is set
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit d56a1f7b39631806ee3d49445a65da6288b099b4
Author: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Date: Thu Dec 2 22:12:45 2010 -0800
[SCSI] qla4xxx: do not check for fw hung if reset retry is in progress
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit e128271b7bcb9c8955cadbf2e18f8af288979e6b
Author: Prasanna Mumbai <prasanna.mumbai@xxxxxxxxxx>
Date: Thu Dec 2 22:12:43 2010 -0800
[SCSI] qla4xxx: cache new IP address acquired via DHCP
Prior to firmware state change from ACQUIRING to READY, an
0x8029 AEN is received. Added code to check previous state
being ACQUIRING in order to update the ip address in the driver.
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Prasanna Mumbai <prasanna.mumbai@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 4cd83cbef878b5d0d4c65ac0a20d12a8bf9f551d
Author: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Date: Thu Dec 2 22:12:40 2010 -0800
[SCSI] qla4xxx: Fail initialization if qla4_8xxx_pci_mem_write_2M fails
Since if fw load is failing, running on incomplete fw load would
be fatal.
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit fe998527e3f1f5a6eeab5baa23ac2b60ae47e96b
Author: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Date: Thu Dec 2 22:12:36 2010 -0800
[SCSI] qla4xxx: put device in FAILED state for 82XX initialization failure
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit e6b07df8b0f1530a8ed606f6f464487520d74ad9
Author: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Date: Thu Dec 2 22:12:27 2010 -0800
[SCSI] qla4xxx: do not process interrupt unconditionally
in mailbox command do not process interrupt unconditionally,
process interrupt only in polling mode
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 6790d4fecf4373016e2983f913bcc0f1cdfa8ca0
Author: Karen Higgins <karen.higgins@xxxxxxxxxx>
Date: Thu Dec 2 22:12:22 2010 -0800
[SCSI] qla4xxx: use correct fw_ddb_index in abort task
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Karen Higgins <karen.higgins@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a1fc26baae41e00a3ecfd99bbe91aa2435045625
Author: Swapnil Nagle <swapnil.nagle@xxxxxxxxxx>
Date: Thu Dec 2 22:12:15 2010 -0800
[SCSI] qla4xxx: memory wedge with peg_halt test in loop
Signed-off-by: Swapnil Nagle <swapnil.nagle@xxxxxxxxxx>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 61391d314e856030b2b40b5d6ea22b93de0f1fed
Author: Shyam Sundar <shyam.sundar@xxxxxxxxxx>
Date: Thu Dec 2 22:12:08 2010 -0800
[SCSI] qla4xxx: initialize MSI in correct way
IRQF_SHARED flag should not be set when calling request_irq for MSI since
this interrupt mechanism cannot be shared like standard INTx
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Shyam Sundar <shyam.sundar@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3e1350c4dc8900476c4db2066c00f13e9e939817
Author: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Date: Thu Dec 2 22:12:03 2010 -0800
[SCSI] qla4xxx: Drop use of IRQF_DISABLE
IRQF_DISABLE flag is deprecated and this flag is a NOOP in kernel.
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@xxxxxxxxxx>
Signed-off-by: Ravi Anand <ravi.anand@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 5f0e385fdafb7d6c8ded6464fa6421c735d96caf
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:20:18 2010 -0800
[SCSI] libfc: fix statistics for FCP input/output megabytes
The statistics for InputMegabytes and OutputMegabytes are
misnamed. They're accumulating bytes, not megabytes.
The statistic returned via /sys must be in megabytes, however,
which is what the HBA-API wants. The FCP code needs to accumulate
it in bytes and then divide by 1,000,000 (not 2^20) before it
presented via sysfs.
This affects fcoe.ko only, not fnic. The fnic driver
correctly by accumulating bytes and then converts to megabytes.
I checked that libhbalinux is using the /sys file directly without
conversion.
BTW, qla2xxx does divide by 2^20, which I'm not fixing here.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit ba9cd5d095b42271588c20ccd6ddd561d0e4cc1e
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:20:12 2010 -0800
[SCSI] libfcoe: change fip_select to return new FCF
Neaten several calls to fip_select() by having it return the
pointer to the new FCF.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 981c1154b240ee77133a478fcd3853ac18111672
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:20:07 2010 -0800
[SCSI] libfcoe: reorder FCF list to put latest advertiser first
When there are several FCFs to choose from, the one most likely
to accept a FLOGI on certian switches is the one that last
answered a multicast solicit.
So, when receiving an advertisement, move the FCF to the front
of the list so that it gets chosen first among those with the
same priority.
Without this, more FLOGIs need to be sent in a test with
multiple FCFs and a switch in NPV mode, but it still
eventually finds one that accepts the FLOGI.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 9069f5c433e402be5707f37f3d0dfb376659c1e4
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:20:02 2010 -0800
[SCSI] libfcoe: add debug message for FCF destination MAC
When multiple FCFs to the same fabric exist, the debug messages
all look alike. Change the message to include the MAC address.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 794d98e77f5901ceded697f1633463e88f078038
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:19:56 2010 -0800
[SCSI] libfcoe: retry rejected FLOGI to another FCF if possible
Switches using multiple-FCFs may reject FLOGI in order to
balance the load between multiple FCFs. Even though the FCF
was available, it may have more load at the point we actually
send the FLOGI.
If the FLOGI fails, select a different FCF
if possible, among those with the same priority. If no other
FCF is available, just deliver the reject to libfc for retry.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit b69ae0ae3f322d9a6bc4e209049b5b6e193ad652
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:19:51 2010 -0800
[SCSI] libfcoe: fix checking of conflicting fabrics in fcoe_ctlr_select()
The check for conflicting fabrics in fcoe_ctlr_select()
ignores any FCFs that aren't usable. This is a minor
problem now but becomes more pronounced after later patches.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit c47036a7cd378533495d8cc06a7cf8a881072a9d
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:19:46 2010 -0800
[SCSI] libfcoe: move some timer code to make it reusable.
Move some of the code in fcoe_ctlr_timer_work() to
fcoe_ctlr_select() so that it can be shared
with another function in a forthcoming patch.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 69316ee2e375c5af0cf1f8d2d30f9aa277f0b454
Author: Joe Eykholt <jeykholt@xxxxxxxxx>
Date: Tue Nov 30 16:19:40 2010 -0800
[SCSI] libfcoe: update FIP FCF announcements
Move the announcement code to a separate function for reuse in
a forthcoming patch.
For messages regarding FCF timeout and selection, use the
previously-announced FCF MAC address (dest_addr) in the fcoe_ctlr struct.
Only print (announce) the FCF if it is new. Print MAC for
timed-out or deselected FCFs.
Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit b5fe5e953c65cd0ec4e9ffd001072700e5b89317
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 30 16:19:35 2010 -0800
[SCSI] libfc: fix fc_tm_done not freeing the allocated fsp pkt
Frame should be freed in fc_tm_done, this is an updated patch on the one
initially submitted by Hillf Danton.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3a91090fe0df10091c5612db8528ee7a822ab83d
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 30 16:19:30 2010 -0800
[SCSI] libfc: the timeout for the REC itself is 2 * R_A_TOV_els
The timeout for the exchange carrying REC itself is 2 * R_A_TOV_els.
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit ea3e2e72eeb3e8a9440a5da965914f9b12088626
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 30 16:19:25 2010 -0800
[SCSI] libfc: fix exchange being deleted when the abort itself is timed out
Should not continue when the abort itself is being timeout since in that case
the exchange will be deleted and relesased. We still want to call the
associated response handler to let the layer, e.g., fcp, know the exchange
itself is being timed out.
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit d889b30a9196c453120ca54323fe80acb4c27b94
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 30 16:19:20 2010 -0800
[SCSI] libfc: do not fc_io_compl on fsp w/o any scsi_cmnd associated
Do not call fc_io_compl() on fsp w/o any scsi_cmnd, e.g., lun reset is built
inside fc_fcp, not from a scsi command from queuecommnd from scsi-ml, so in
in case target is buggy that is invalid flags in the FCP_RSP, as we have seen
in some SAN Blaze target where all bits in flags are 0, we do not want to call
io_compl on this fsp.
[ Comment block added by Robert Love ]
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 9b90dc80ba2e566a48585174b1e5ab00e16f0456
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 30 16:19:15 2010 -0800
[SCSI] libfc: add print of exchange id for debugging fc_fcp
This is very helpful to match up the corresponding exchange to the actual I/O
described by the fsp, particularly when you do a side-by-side comparison of
the syslog with your trace.
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 11aa99001afdbe5fe152e833aa1fea82b85dbeda
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 30 16:19:09 2010 -0800
[SCSI] drivers/scsi/fcoe: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 0e9e3d3b155c35d5750805c2b8bb6d5b6e6a3bfb
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:19:04 2010 -0800
[SCSI] libfc: fix memory leakage in remote port
There seems rdata should get put before return.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 72e0daad555bc0ca2e7abd68593087d098d866a8
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:59 2010 -0800
[SCSI] libfc: fix memory leakage in local port
There seems info should get freed when error encountered.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2d6dfb005e24d7e3404f4c0d333a94b050059173
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:54 2010 -0800
[SCSI] libfc: fix memory leakage in local port
There seems info should get freed when error encountered.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 05fee645e96e732a79ad083cab8ddd4efd108e2c
Author: john fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 30 16:18:49 2010 -0800
[SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct
We can easily remove the tgt_flags from fc_fcp_pkt struct
and use rpriv->tgt_flags directly where needed.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit e0883a3c3e7766b390971a49bf728004816c9520
Author: john fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 30 16:18:44 2010 -0800
[SCSI] libfc: use rport timeout values for fcp recovery
Use the rport value for rec_tov for timeout values when
sending fcp commands. Currently, defaults are being used
which may or may not match the advertised values.
The default may cause i/o to timeout on networks that
set this value larger then the default value. To make
the timeout more configurable in the non-REC mode we
remove the FC_SCSI_ER_TIMEOUT completely allowing the
scsi-ml to do the timeout. This removes an unneeded
timer and allows the i/o timeout to be configured
using the scsi-ml knobs.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit ac17ea8d7d45d0495316edff13faa0dfd6bb2225
Author: john fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 30 16:18:39 2010 -0800
[SCSI] libfc: incorrect scsi host byte codes returned to scsi-ml
The fcp packet recovery handler fc_fcp_recover() is called
when errors occurr in a fcp session. Currently it is
generically setting the status code to FC_CMD_RECOVERY for
all error types. This results in DID_BUS_BUSY errors
being returned to the scsi-ml.
DID_BUS_BUSY errors indicate "BUS stayed busy through time
out period" according to scsi.h. Many of the error reported
by fc_rcp_recovery() are pkt errors. Here we update
fc_fcp_recovery to use better host byte codes.
With certain FAST FAIL flags set DID_BUS_BUSY and DID_ERROR
will have different behaviors this was causing dm multipath
to fail quickly in some cases where a retry would be a
better action.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit e90ff5ef0aab1d40f0e92a44d66f8d45a20d8c95
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:33 2010 -0800
[SCSI] libfc: fix stats computation in fc_queuecommand()
There seems accumulation needed.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 530994d69e5b6b4eca2db4a21b6d945d13646053
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:28 2010 -0800
[SCSI] libfc: fix mem leak in fc_seq_assign()
There is a typo cleaned, which triggers memory leakage.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3c2c3bf23cbef8eed6cf815715d0bece5cb7b5ec
Author: Robert Love <robert.w.love@xxxxxxxxx>
Date: Tue Nov 30 16:18:23 2010 -0800
[SCSI] libfc: Fix incorrect locking and unlocking in FCP
The error handler grabs the si->scsi_queue_lock, but
in the case where the fsp pointer is NULL it releases
the scsi_host lock. This can lead to a variety of
system hangs depending on which is used first- the
scsi_host lock or the scsi_queue_lock.
This patch simply unlocks the correct lock when fcp
is NULL.
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2034c19ce8f8503aa14cb1e763fbfe60316aaa8e
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:17 2010 -0800
[SCSI] libfc: tune fc_exch_em_alloc() to be O(2)
For allocating new exch from pool, scanning for free slot in exch
array fluctuates when exch pool is close to exhaustion.
The fluctuation is smoothed, and the scan looks to be O(2).
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 8236554a27af870ecd1cd588d9558ccdc212037b
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:12 2010 -0800
[SCSI] libfc: fix mem leak in fc_exch_recv_seq_resp()
There seems that ep should get released, or it will no longer get freed.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 80e736f8a37bebeb5bff18f2aec31caab4104b8b
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 30 16:18:07 2010 -0800
[SCSI] libfc: fix NULL pointer dereference bug in fc_fcp_pkt_release
This happens when then tearing down the fcoe interface with active I/O.
The back trace shows dead000000200200 in RAX, i.e., LIST_POISON2, indicating
that the fsp is already being dequeued, which is probably why no complaining
was seen in fc_fcp_destroy() about outstanding fsp not freed, since we dequeue
it in the end of fc_io_compl() before releasing it. The bug is due to the
fact that we have already destroyed lport's scsi_pkt_pool while on-going i/o
is still accessing it through fc_fcp_pkt_release(), like this trace or the
similar code path from scsi-ml to fc_eh_abort, etc. This is fixed by moving
the fc_fcp_destroy() after lport is detached from scsi-ml since fc_fcp_destroy
is supposed to called only once where no lport lock is taken, otherwise the
fc_fcp_pkt_release() would have to grab the lport lock.
BUG: unable to handle kernel NULL pointer dereference at (null)
.......
RIP: 0010:[<0000000000000000>]
[<(null)>] (null)
RSP: 0018:ffff8803270f7b88 EFLAGS: 00010282
RAX: dead000000200200 RBX: ffff880197d2fbc0 RCX: 0000000000005908
RDX: ffff880195ea6d08 RSI: 0000000000000282 RDI: ffff880180f4fec0
RBP: ffff8803270f7bc0 R08: ffff880197d2fbe0 R09: 0000000000000000
R10: ffff88032867f090 R11: 0000000000000000 R12: ffff880195ea6d08
R13: 0000000000000282 R14: ffff880180f4fec0 R15: 0000000000000000
FS: 0000000000000000(0000) GS:ffff8801b5820000(0000) knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000000000 CR3: 00000001a6eae000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process fc_rport_eq (pid: 5278, threadinfo ffff8803270f6000, task ffff880326254ab0)
Stack:
ffffffffa02c39ca ffff8803270f7ba0 ffff88019331cbc0 ffff880197d2fbc0
0000000000000000 ffff8801a8c895e0 ffff8801a8c895e0 ffff8803270f7c10
ffffffffa02c4962 ffff8803270f7be0 ffffffff814c94ab ffff8803270f7c10
Call Trace:
[<ffffffffa02c39ca>] ? fc_io_compl+0x10a/0x530 [libfc]
[<ffffffffa02c4962>] fc_fcp_complete_locked+0x72/0x150 [libfc]
[<ffffffff814c94ab>] ? _spin_unlock_bh+0x1b/0x20
[<ffffffffa02b98ff>] ? fc_exch_done+0x3f/0x60 [libfc]
[<ffffffffa02c4a8f>] fc_fcp_retry_cmd+0x4f/0x60 [libfc]
[<ffffffffa02c6150>] fc_fcp_recv+0x9b0/0xc30 [libfc]
[<ffffffff8106ba7a>] ? _call_console_drivers+0x4a/0x80
[<ffffffff8107d5ec>] ? lock_timer_base+0x3c/0x70
[<ffffffff8107e06b>] ? try_to_del_timer_sync+0x7b/0xe0
[<ffffffffa02b9dcf>] fc_exch_mgr_reset+0x1df/0x250 [libfc]
[<ffffffffa02c57a0>] ? fc_fcp_recv+0x0/0xc30 [libfc]
[<ffffffffa02c1042>] fc_rport_work+0xf2/0x4e0 [libfc]
[<ffffffff8109203e>] ? prepare_to_wait+0x4e/0x80
[<ffffffffa02c0f50>] ? fc_rport_work+0x0/0x4e0 [libfc]
[<ffffffff8108c6c0>] worker_thread+0x170/0x2a0
[<ffffffff81091d50>] ? autoremove_wake_function+0x0/0x40
[<ffffffff8108c550>] ? worker_thread+0x0/0x2a0
[<ffffffff810919e6>] kthread+0x96/0xa0
[<ffffffff810141ca>] child_rip+0xa/0x20
[<ffffffff81091950>] ? kthread+0x0/0xa0
[<ffffffff810141c0>] ? child_rip+0x0/0x20
Code:
Bad RIP value.
RIP
[<(null)>] (null)
RSP <ffff8803270f7b88>
CR2: 0000000000000000
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 12137f5c28284cc51b5f50932c8d02a5823fcd3c
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Tue Nov 30 16:18:01 2010 -0800
[SCSI] libfc: remove define of fc_seq_exch in fc_exch.c
The define for fc_seq_exch is unnecessary, since it also appears in scsi/libfc.h
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: Robert Love <robert.w.love@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 50444a340028119ce5ba45d60b4cf44e3e6e1b32
Author: Maggie <xmzhang@xxxxxxxxxxx>
Date: Mon Nov 29 18:26:32 2010 -0800
[SCSI] bfa: fix endianess sparse check warnings
First round of fix for the endianess check warnings from make C=2 CF="-D__CHECK_ENDIAN__".
Signed-off-by: Maggie <xmzhang@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 52f94b6fd0d1ff9d935c52f8a6360834ed871d92
Author: Maggie <xmzhang@xxxxxxxxxxx>
Date: Mon Nov 29 18:21:32 2010 -0800
[SCSI] bfa: fix regular sparse check warnings.
Fix all sparse check warnings from make C=2.
Signed-off-by: Maggie <xmzhang@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3db86353abba4549f665fbdde8572d619566afbb
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:32 2010 -0800
[SCSI] bnx2i: Updated version to 2.6.2.2
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 11cec1e2e9d94bcda3446f52a868a2099a2eba4f
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:31 2010 -0800
[SCSI] bnx2i: Updated copyright and maintainer info
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a91031a6526441ff36552d53363037c3bbca0c5b
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:30 2010 -0800
[SCSI] bnx2i: Cleaned up various error conditions in ep_connect/disconnect
Various error conditions inside ep_connect and ep_disconnect were
either not being handled or not being handled correctly. This patch
fixes all those issues.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Acked-by: Anil Veerabhadrappa <anilgv@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit bee348770dcaeafa57bbd32129ce0cb16a4342d6
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:29 2010 -0800
[SCSI] bnx2i: Added return code check for chip kwqe submission request
Added the handling for cases when a chip request is made to the
CNIC module but the hardware is not ready to accept. This would
lead to many unnecessary wait timeouts.
This code adds check in the connect establishment and destruction
path.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 842158d7b7bc3b1a49c31f43ac20414234c33a8d
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:28 2010 -0800
[SCSI] bnx2i: Modified the bnx2i stop path to compensate for in progress ops
The stop path has been augmented to wait a max of 10s for all in
progress offload and destroy activities to complete before proceeding
to terminate all active connections (via iscsid or forcefully).
Note that any new offload and destroy requests are now blocked and
return to the caller immediately.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Acked-by: Anil Veerabhadrappa <anilgv@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 016ef69076f3e8f9e42f31152157f46812d25566
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:27 2010 -0800
[SCSI] bnx2i: Removed the dynamic registration of CNIC
The code no longer needs to dynamically register and unregister
the CNIC device. The CNIC device will be kept registered until
module unload.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7a2962c77ced218faeeb7b5eda48abfebc578df2
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:26 2010 -0800
[SCSI] bnx2i: Added mutex lock protection to conn_get_param
Added net_dev mutex lock protection before accessing the csk
parameters.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 252e44805bcfff5de2e05dd126f69a18e0b760f0
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:25 2010 -0800
[SCSI] bnx2i: Allow to abort the connection if connect request times out
In the situation where the connect completion response arrives after
the connect request has already timed out, the connection was not being
aborted but only the resource was being freed. This creates a problem
for 5771X (10g) as the chip flags this with an assertion.
This change will properly aborts the connection before freeing the
resource.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 94810e824df1509ad3ba401e57f74b922fd928c5
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:24 2010 -0800
[SCSI] bnx2i: Fixed the remote TCP RST handling for the 570X (1g)
Modified the handling of the remote TCP RST code so the chip can now
flush the tx pipe accordingly upon a remote TCP RST reception.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 5bf3f39f9bda2750145a7da69ea9ae76d0054956
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:23 2010 -0800
[SCSI] bnx2i: Fixed a cid leak issue for 5771X (10g)
A cid leak issue was found when the connect destroy request exceeded
the driver's disconnection timeout. This will lead to a cid resource
leak issue.
The fix is to allow the cid cleanup even when this happens.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Acked-by: Anil Veerabhadrappa <anilgv@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit cf464fc5eb272f3f5964560ef2b8d632333afe0d
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:22 2010 -0800
[SCSI] bnx2i: Fixed the endian bug in the TMF LUN cmd send
Added a be32_to_cpu call for the TMF LUN wqe.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 8eea2f55a65b9471276e78e5c86ddd19c4c0365c
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:21 2010 -0800
[SCSI] bnx2i: Added fix for NOP-Out response panic from unsolicited NOP-In
The patch fixes the following situations where NOP-Out pkt is called for:
- local unsolicited NOP-Out requests (requesting no NOP-In response)
- local NOP-Out responses to unsolicited NOP-In requests
kernel panic is observed due to double session spin_lock requests; one in the
bnx2i_process_nopin_local_cmpl routine in bnx2i_hwi.c and the other in the
iscsi_put_task routine in libiscsi.c
The proposed fix is to export the currently static __iscsi_put_task() routine
and have bnx2i call it directly instead of the iscsi_put_task() routine which
holds the session spin lock.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Reviewed-by: Anil Veerabhadrappa <anilgv@xxxxxxxxxxxx>
Acked-by: Benjamin Li <benli@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 5ee32576269f33b66c6dbc98144aead1e74a1e91
Author: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Date: Tue Nov 23 15:29:20 2010 -0800
[SCSI] bnx2i: Fixed bugs in the handling of unsolicited NOP-Ins
Unsolicited NOP-Ins are placed in the receive queue of the hardware
which requires to be read out regardless if the receive pipe is suspended
or not. This patch adds the disposal of this RQ element under this
condition.
Also fixed the bug in the unsolicited NOP-In handling routine which
checks for the RESERVED_ITT.
Signed-off-by: Eddie Wai <eddie.wai@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit f0cebfb0177f26e214adca3511f37c089d1317f8
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:42:28 2010 +0530
[SCSI] mpt2sas: Bump version 07.100.00.00
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 37aaa78b8144d48d77bcd69a3353c88c0686df9e
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:41:32 2010 +0530
[SCSI] mpt2sas: Debug string changes from target to device.
Changing debug print to correct string.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit b41c09d1afc2708b3fab395085f538e1fce9b571
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:40:51 2010 +0530
[SCSI] mpt2sas: Sanity check for phy count is added using max phy count
Fix oops loading driver when there is direct attached
SEP device
The driver set max phys count to the value reported in sas iounit page
zero. However this page doesn't take into account additional virutal
phys. When sas topology event arrives, the phy count is larger than
expected, and the driver accesses memory array beyond the end of
allocated space, then oops. Manufacturing page 8 contains the info
on direct attached phys.
For this fix will making sure that sas topology event is not
processing phys greater than the expected phy count.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit a93c6b45df57332b1703e0dc6f99a1bafc17f5e3
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:39:11 2010 +0530
[SCSI] mpt2sas: change queue depth with reason argument more appropriately
change_queue_depth callback API changed
The change_queue_depth callback changed where there is now an additional
parameter called reason, with SCSI_QDEPTH_DEFAULT, SCSI_QDEPTH_QFULL,
and SCSI_QDEPTH_RAMP_UP codes.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 90d2a672250b9d6e5c700f2d2c07c19d6fad064a
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:37:36 2010 +0530
[SCSI] mpt2sas: Remove code for TASK_SET_FULL from driver.
remove support for MPI2_EVENT_TASK_SET_FULL
This event is obsoleted, so this processing of this event
needs to be removed from the driver. The controller firmware is going
to handle TASK_SET_FULL, the driver doesn't need to do anything.
Even though we are removing the EVENT handling, the behavour has not
changed between driver versions becuase fimrware will still be handling
queue throttling, and retrying of commands when the target device queues
are full.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7d061402590efc37d553a9155dbf41277675c179
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:36:14 2010 +0530
[SCSI] mpt2sas: MPI 2.0 Header updated
MPI2 Rev header files.
1) Removed Task Set Full Event. Modified description of Disable SCSI
Initiator Task Set Full Handling bit in the Flags field of IO Unit
Page 1. Modified the descriptions for the three queue depth fields in
SAS IO Unit Page 1.
(2) Added new value for the Current Operation bits of the Flags field
in the RAID Volume Indicator Structure to indicate that the Make Data
Consistent operation is running.
(3) Added a value of 0x6 to various SAS link rate fields to indicate an
attached PHY that is not using any commonly supported settings.
(4) Added Volume Not Consistent bit to the VolumeStatusFlags field of
RAID Volume Page 0.
(5) Added a new value for the IncompatibleReason field of RAID Physical
Disk Page 0 to indicate an incompatible media type.
(6) Added Diagnostic Data Upload tool for the Toolbox Request.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7f6f794dee50ba33710145140f39de59f5ec764e
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:35:30 2010 +0530
[SCSI] mpt2sas: Modify code to support Expander switch
Issue : Switch swap doesn't work when device missing delay is enabled.
(1) add support to individually add and remove phys to and from
existing ports. This replaces the routine
_transport_delete_duplicate_port.
(2) _scsih_sas_host_refresh - was modified to change the link rate
from zero to 1.5 GB rate when the firmware reports there is an
attached device with zero link.
(3) add new function mpt2sas_device_remove, this is wrapper function
deletes some redundant code through out driver by combining into one
subrountine
(4) two subroutines were modified so the sas_device, raid_device, and
port lists are traversed once when objects are deleted from the list.
Previously it was looping back each time an object was deleted from the
list.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 35f805b52c94f8e6cb22907ef32517132a15cb96
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:34:06 2010 +0530
[SCSI] mpt2sas: Create a pool of chain buffer instead of dedicated per IOs
Create a pool of chain buffers, instead of dedicated per IO:
This enahancment is to address memory allocation failure when asking
for more than 2300 IOs per host. There is just not enough contiquious
DMA physical memory to make one single allocation to hold both message
frames and chain buffers when asking for more than 2300 request. In order
to address this problem we will have to allocate memory for each chain
buffer in a seperate individual memory allocation, placing each chain
element of 128 bytes onto a pool of available chains, which can be
shared amoung all request.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 6cb8ef573fd4c2bd72248f492fe336133660148d
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:32:18 2010 +0530
[SCSI] mpt2sas: Added loadtime para for IOMissingDelay and DMD
Ability to override/set the ReportDeviceMissingDelay and
IODeviceMissingDelay from driver: Add new command line option missing_delay,
this is an array, where the first element is the device missing delay,
and the second element is io missing delay. The driver will program
sas iounit page 1 with the new setting when the driver loads. This is
programmed to the current and persistent configuration page so this takes
immediately, as will be sticky across host reboots.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit dd3741d30300f9cf1adc046773a4bb87252d96ac
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:31:14 2010 +0530
[SCSI] mpt2sas: Added sanity check for cb_idx and smid access.
Sometime it is seen that controller
firmware returns an invalid system message id (smid).
the oops is occurring becuase mpt_callbacks pointer is referenced to
either null or invalid virtual address. this is due to cb_idx set
incorrectly from routine _base_get_cb_idx. the cb_idx was set incorrectly
becuase there is no check to make sure smid is less than maxiumum
anticapted smid. to fix this issue, we add a check in
_base_get_cb_idx to make sure smid is not greater than
ioc->hba_queue_depth. in addition, a similar check was added to make
sure the reply address was less than the largest anticapated address.
Newer firmware has sovled this issue, however it good to have this sanity
check.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 363fa50fc35357b1361fb63b0726335de993374a
Author: Kashyap, Desai <kashyap.desai@xxxxxxx>
Date: Sat Nov 13 04:29:20 2010 +0530
[SCSI] mpt2sas: Removed compiler warnnings when logging is disabled
The compiler throws warning messages while compiling without
CONFIG_SCSI_MPT2SAS_LOGGING.
Set proper ifdef for CONFIG_SCSI_MPT2SAS_LOGGING to avoid warnnings.
Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 1f768e91e1fcd9f0df657783847347a833fdc573
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sat Nov 20 23:12:11 2010 -0500
[SCSI] lpfc 8.3.19: Update lpfc driver version to 8.3.19
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit eb7a339e67dceec30f70a5cbed8e2bf6d8318f20
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sat Nov 20 23:12:02 2010 -0500
[SCSI] lpfc 8.3.19: Change heartbeat to default to disabled
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 19ca760979e4be41a3eb215fb8d0e96637161947
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sat Nov 20 23:11:55 2010 -0500
[SCSI] lpfc 8.3.19: Added support for ELS RRQ command
Added support for ELS RRQ command
- Add new routine lpfc_set_rrq_active() to track XRI qualifier state.
- Add new module parameter lpfc_enable_rrq to control RRQ operation.
- Add logic to ELS RRQ completion handler and xri qualifier timeout
to clear XRI qualifier state.
- Use OX_ID from XRI_ABORTED_CQE for RRQ payload.
- Tie abort and XRI_ABORTED_CQE andler to RRQ generation.
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 76a95d75ede64e4f1684ddb8c626fdfdb641bda2
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sat Nov 20 23:11:48 2010 -0500
[SCSI] lpfc 8.3.19: Add SLI4 FC Discovery support
Add SLI4 FC Discovery support
- Replace READ_LA and READ_LA64 with READ_TOPOLOGY mailbox command.
- Converted the old READ_LA structure to use bf_set/get instead of bit fields.
- Rename HBA_FCOE_SUPPORT flag to HBA_FCOE_MODE. Flag now indicates function
is running as SLI-4 FC or FCoE port. Make sure flag reset each time
READ_REV completed as it can dynamically change.
- Removed BDE union in the READ_TOPOLOGY mailbox command and added a define to
define the ALPA MAP SIZE. Added FC Code for async events.
- Added code to support new 16G link speed.
- Define new set of values to keep track of valid user settable link speeds.
- Used new link speed definitions to define link speed max and bitmap.
- Redefined FDMI Port sppeds to be hax values and added the 16G value.
- Added new CQE trailer code for FC Events.
- Add lpfc_issue_init_vfi and lpfc_init_vfi_cmpl routines.
- Replace many calls to the initial_flogi routine with lpfc_issue_init_vfi.
- Add vp and vpi fields to the INIT_VFI mailbox command.
- Addapt lpfc_hba_init_link routine for SLI4 use.
- Use lpfc_hba_init_link call from lpfc_sli4_hba_setup.
- Add a check for FC mode to register the FCFI before init link.
- Convert lpfc_sli4_init_vpi to be called without a vpi (get it from vport).
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 085c647c3377c3e39c8c572278507b1e1c7e7bf7
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sat Nov 20 23:11:37 2010 -0500
[SCSI] lpfc 8.3.19: Add latest SLI4 Hardware initialization support
- Add the Lancer FC and FCoE PCI IDs
- Add new SLI4 INTF register definitions
- Implement new SLI4 doorbell register
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 63e801ce685d151c5faca8f491adc2ad2e732259
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sat Nov 20 23:14:19 2010 -0500
[SCSI] lpfc 8.3.19: Fix critical errors and crashes
Fix critical errors and crashes
- Replace LOF_SECURITY with LOG_SECURITY
- When calculating diag test memory size, use full size with header.
- Return LS_RJT with status=UNSUPPORTED on unrecognized ELS's
- Correct NULL pointer dereference when lpfc_create_vport_work_array()
returns NULL.
- Added code to handle CVL when port is in LPFC_VPORT_FAILED state.
- In lpfc_do_scr_ns_plogi, check the nodelist for FDMI_DID and reuse
the resource.
- Check for generic request 64 and calculate the sgl offset for the request
and reply sgls, also calculate the xmit length using only the request bde.
Signed-off-by: Alex Iannicelli <alex.iannicelli@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 98db519573e805f9f7e988fb5661da951fcb16b1
Author: James Bottomley <James.Bottomley@xxxxxxx>
Date: Mon Oct 25 15:53:41 2010 -0500
[SCSI] fix id computation in scsi_eh_target_reset()
The current code in scsi_eh_target_reset() has an off by one error
that actually sends spurious extra resets. Since there's no real need
to reset the targets in numerical order, simply chunk up the command
recovery list doing target resets and pulling matching targets out of
the list (that also makes the loop O(N) instead of O(N^2).
[mike christie found and fixed a list_splice -> list_splice_init problem]
Reported-by: Hillf Danton<dhillf@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 110def851fc823bb1a4584cb6308e30e5ffb3e05
Author: Wayne Boyer <wayneb@xxxxxxxxxxxxxxxxxx>
Date: Thu Nov 4 09:36:16 2010 -0700
[SCSI] ipr: fix mailbox register definition and add a delay before reading
The definition for the mailbox register for new adapters was incorrect. The
value has been updated to the correct offset.
After an adapter reset, the mailbox register on the new adapters takes a
number of seconds to stabilize. A delay has been added before reading the
register.
Signed-off-by: Wayne Boyer <wayneb@xxxxxxxxxxxxxxxxxx>
Acked-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 0cb992eda1f7e7672775032378690baa87c0e13d
Author: Wayne Boyer <wayneb@xxxxxxxxxxxxxxxxxx>
Date: Thu Nov 4 09:35:58 2010 -0700
[SCSI] ipr: fix lun assignment and comparison
The lun value was not getting set up correctly for all devices attached to the
new 64 bit adapters. The fix is to move the logic to earlier in the
ipr_init_res_entry routine such that the value does get set correctly for all
devices.
Then the ipr_is_same_device comparison function was using the wrong lun value
in the logic for the new adapters. Change this to use the correct lun value.
Signed-off-by: Wayne Boyer <wayneb@xxxxxxxxxxxxxxxxxx>
Acked-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 24d720b726c1a85f1962831ac30ad4d2ef8276b1
Author: Luben Tuikov <ltuikov@xxxxxxxxx>
Date: Fri Oct 22 21:24:36 2010 -0700
[SCSI] Retrieve the Caching mode page
Some kernel transport drivers unconditionally disable
retrieval of the Caching mode page. One such for example is
the BBB/CBI transport over USB. Such a restraint is too
harsh as some devices do support the Caching mode
page. Unconditionally enabling the retrieval of this mode
page over those transports at their transport code level may
result in some devices failing and becoming unusable.
This patch implements a method of retrieving the Caching
mode page without unconditionally enabling it in the
transports which unconditionally disable it. The idea is to
ask for all supported pages, page code 0x3F, and then search
for the Caching mode page in the mode parameter data
returned. The sd driver already asks for all the mode pages
supported by the attached device by setting the page code to
0x3F in order to find out if the media is write protected by
reading the WP bit in the Device Specific Parameter
field. It then attempts to retrieve only the Caching mode
page by setting the page code to 8 and actually attempting
to retrieve it if and only if the transport allows it.
The method implemented here is that if the transport doesn't
allow retrieval of the Caching mode page and the device is
not RBC, then we ask for all pages supported by setting the
page code to 0x3F (similarly to how the WP bit is retrieved
above), and then we search for the Caching mode page in the
mode parameter data returned.
With this patch, devices over SATA, report this (no change):
Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] 976773168 512-byte logical blocks: (500 GB/465 GiB)
Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: Attached scsi generic sg0 type 0
Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Write Protect is off
Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
Smart devices report their Caching mode page. This is a
change where we'd previously see the kernel making
assumption about the device's cache being write-through:
Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: Attached scsi generic sg2 type 0
Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] 610472646 4096-byte logical blocks: (2.50 TB/2.27 TiB)
Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Write Protect is off
Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Mode Sense: 47 00 10 08
Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Write cache: enabled, read cache: enabled, supports DPO and FUA
And "dumb" devices over BBB, are correctly shown not to
support reporting the Caching mode page:
Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] 15663104 512-byte logical blocks: (8.01 GB/7.46 GiB)
Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Write Protect is off
Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Mode Sense: 23 00 00 00
Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] No Caching mode page present
Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Assuming drive cache: write through
Signed-off-by: Luben Tuikov <ltuikov@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 00f0254ed9b19164d416dc2e3c2e81eda55a6faf
Author: Dan Williams <dan.j.williams@xxxxxxxxx>
Date: Fri Oct 1 13:55:52 2010 -0700
[SCSI] libsas: fix definition of wideport, include local sas address
To date libsas has only looked at the attached sas address when
determining the formation of wide ports. The specification and some
hardware expects that phys with different addresses will not form a wide
port unless the local peer phys also match each other. Introduce a flag
to select stricter behavior at sas_register_ha() time. The flag can be
dropped once it is known that all libsas users expect the same behavior.
Current drivers just initialize this field to zero and get the
traditional behavior.
Reported-by: Patrick Thomson <patrick.s.thomson@xxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 3ff5588d3f8afad65ded52ac0e4191462fe034cb
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Tue Sep 7 11:44:01 2010 -0400
[SCSI] sd: improve logic and efficiecy of media-change detection
This patch (as1415) improves the formerly incomprehensible logic in
sd_media_changed() (the current code refers to "changed" as a state,
whereas in fact it is a relation between two states). It also adds a
big comment so that everyone can understand what is really going on.
The patch also improves efficiency by not reporting a media change
when no medium was ever present. If no medium was present the last
time we checked and there's still no medium, it's not necessary to
tell the caller that a change occurred. Doing so merely causes the
caller to attempt to revalidate a non-existent disk, which is a waste
of time.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit fde52dbd7f71934aba4e150f3d1d51e826a08850
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Mon Dec 20 15:18:04 2010 +0100
perf probe: Don't always consider EOF as an error when listing source code
When listing a whole file or a function which is located at the end,
perf-probe -L output wrongly: "Source file is shorter than expected.".
This is because show_one_line() always consider EOF as an error.
This patch fixes this by not considering EOF as an error when dumping
the trailing lines. Otherwise it's still an error and perf-probe still
outputs its warning.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1292854685-8230-6-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 9d95b580a8d64ef4d1660a21a9de0658fe29f041
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Mon Dec 20 15:18:03 2010 +0100
perf probe: Fix line range description since a single file is allowed
$ perf-probe -L sched.c
is currently allowed but not documented.
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1292854685-8230-5-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 44b81e929b0c00e703a31a3d634b668bb27eb1c8
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Mon Dec 20 15:18:02 2010 +0100
perf probe: Clean up redundant tests in show_line_range()
It also removes some superflous parentheses.
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1292854685-8230-4-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit befe341468f4e61ecaf337a0237f2aab76817437
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Mon Dec 20 15:18:01 2010 +0100
perf probe: Rewrite show_one_line() to make it simpler
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1292854685-8230-3-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 62c15fc49bd1b35d79b34ea96f132ab435e2215a
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Mon Dec 20 15:18:00 2010 +0100
perf probe: Make -L display the absolute path of the dumped file
The actual file used by 'perf probe -L sched.c' is reported in the ouput
of the command.
But it's simply displayed as it has been given to the command (simply
sched.c) which is too ambiguous to be really usefull since several
sched.c files can be found into the same project and we also don't know
which search path has been used.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1292854685-8230-2-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 0e43e5d222095ca2d1d825dd2e4fa158bdc4cc9b
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 17 22:12:11 2010 +0900
perf probe: Cleanup messages
Add new lines for error or debug messages, change dwarf related words to more
generic words (or just removed).
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
LKML-Reference: <20101217131211.24123.40437.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit ec5761eab318e50e69fcf8e63e9edaef5949c067
Author: David Ahern <daahern@xxxxxxxxx>
Date: Thu Dec 9 13:27:07 2010 -0700
perf symbols: Add symfs option for off-box analysis using specified tree
The symfs argument allows analysis of perf.data file using a locally accessible
filesystem tree with debug symbols - e.g., tree created during image builds,
sshfs mount, loop mounted KVM disk images, USB keys, initrds, etc. Anything
with an OS tree can be analyzed from anywhere without the need to populate a
local data store with build-ids.
Commiter notes:
o Fixed up symfs="/" variants handling.
o prefixed DSO__ORIG_GUEST_KMODULE case with symfs too, avoiding use of files
outside the symfs directory.
LKML-Reference: <1291926427-28846-1-git-send-email-daahern@xxxxxxxxx>
Signed-off-by: David Ahern <daahern@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit eac23d1c384b55e4bbb89ea9e5a6bb77fb4d1140
Author: Ian Munsie <imunsie@xxxxxxxxxxx>
Date: Thu Dec 9 16:33:53 2010 +1100
perf record,report,annotate,diff: Process events in order
This patch changes perf report to ask for the ID info on all events be
default if recording from multiple CPUs.
Perf report, annotate and diff will now process the events in order if
the kernel is able to provide timestamps on all events. This ensures
that events such as COMM and MMAP which are necessary to correctly
interpret samples are processed prior to those samples so that they are
attributed correctly.
Before:
# perf record ./cachetest
# perf report
# Events: 6K cycles
#
# Overhead Command Shared Object Symbol
# ........ ....... ................. ...............................
#
74.11% :3259 [unknown] [k] 0x4a6c
1.50% cachetest ld-2.11.2.so [.] 0x1777c
1.46% :3259 [kernel.kallsyms] [k] .perf_event_mmap_ctx
1.25% :3259 [kernel.kallsyms] [k] restore
0.74% :3259 [kernel.kallsyms] [k] ._raw_spin_lock
0.71% :3259 [kernel.kallsyms] [k] .filemap_fault
0.66% :3259 [kernel.kallsyms] [k] .memset
0.54% cachetest [kernel.kallsyms] [k] .sha_transform
0.54% :3259 [kernel.kallsyms] [k] .copy_4K_page
0.54% :3259 [kernel.kallsyms] [k] .find_get_page
0.52% :3259 [kernel.kallsyms] [k] .trace_hardirqs_off
0.50% :3259 [kernel.kallsyms] [k] .__do_fault
<SNIP>
After:
# perf report
# Events: 6K cycles
#
# Overhead Command Shared Object Symbol
# ........ ....... ................. ...............................
#
44.28% cachetest cachetest [.] sumArrayNaive
22.53% cachetest cachetest [.] sumArrayOptimal
6.59% cachetest ld-2.11.2.so [.] 0x1777c
2.13% cachetest [unknown] [k] 0x340
1.46% cachetest [kernel.kallsyms] [k] .perf_event_mmap_ctx
1.25% cachetest [kernel.kallsyms] [k] restore
0.74% cachetest [kernel.kallsyms] [k] ._raw_spin_lock
0.71% cachetest [kernel.kallsyms] [k] .filemap_fault
0.66% cachetest [kernel.kallsyms] [k] .memset
0.54% cachetest [kernel.kallsyms] [k] .copy_4K_page
0.54% cachetest [kernel.kallsyms] [k] .find_get_page
0.54% cachetest [kernel.kallsyms] [k] .sha_transform
0.52% cachetest [kernel.kallsyms] [k] .trace_hardirqs_off
0.50% cachetest [kernel.kallsyms] [k] .__do_fault
<SNIP>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <1291872833-839-1-git-send-email-imunsie@xxxxxxxxxxx>
Signed-off-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 21ef97f05a7da5bc23b26cb34d6746f83ca9bf20
Author: Ian Munsie <imunsie@xxxxxxxxxxx>
Date: Fri Dec 10 14:09:16 2010 +1100
perf session: Fallback to unordered processing if no sample_id_all
If we are running the new perf on an old kernel without support for
sample_id_all, we should fall back to the old unordered processing of
events. If we didn't than we would *always* process events without
timestamps out of order, whether or not we hit a reordering race. In
other words, instead of there being a chance of not attributing samples
correctly, we would guarantee that samples would not be attributed.
While processing all events without timestamps before events with
timestamps may seem like an intuitive solution, it falls down as
PERF_RECORD_EXIT events would also be processed before any samples.
Even with a workaround for that case, samples before/after an exec would
not be attributed correctly.
This patch allows commands to indicate whether they need to fall back to
unordered processing, so that commands that do not care about timestamps
on every event will not be affected. If we do fallback, this will print
out a warning if report -D was invoked.
This patch adds the test in perf_session__new so that we only need to
test once per session. Commands that do not use an event_ops (such as
record and top) can simply pass NULL in it's place.
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <1291951882-sup-6069@xxxxxxxxxxx>
Signed-off-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 0719e1d23aab3b445c823404fd1b8b027757bb0a
Author: Yann E. MORIN <yann.morin.1998@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 00:19:00 2010 +0100
Documentation/kbuild: add info that 'choice' can have a symbol name
Changeset 5a1aa8a1 added the possibility to name a choice,
and to have the same choice be defined multiple times.
But the documentation was forgotten, so this updates it accordingly.
Thanks to Arnaud Lacombe for pointing it to me in the first place:
http://www.spinics.net/lists/linux-kbuild/msg03940.html
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@xxxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit fec6e5252b542e748871c88f8455e69ae73ea156
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Dec 21 18:11:25 2010 +0100
Input: synaptics - add multi-finger and semi-mt support
The Synaptics 2.7 series of touchpads support a mode for reporting two
sets of X/Y/Pressure data (advanced gesture mode). By default, these
devices report only single finger data, depriving userspace of the
nowadays ubiquitous two-finger scroll gesture.
Enabling advanced gesture mode also enables the multi-finger report,
although the device does not claim that capability. Up to three
fingers can be reported this way.
While two or three fingers are touching, the normal packet is
prepended by a reduced finger packet of lower resolution. From the two
packets (which do not represent the actual fingers), the bounding
rectangle of the individual contacts can be extracted. This
information is sufficient to perform scaling gestures and a limited
form of rotation gesture. The behavior has been coined semi-mt
capability, and is signaled to userspace via the INPUT_PROP_SEMI_MT
device property.
Work to decode the advanced gesture packet: Takashi Iwai.
Cleanup and testing of the original patch: Chase Douglas.
Minor cleanup and testing: Chris Bagwell.
Finalization and semi-mt support: Henrik Rydberg.
Reported-by: Tobyn Bertram
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Signed-off-by: Chris Bagwell <chris@xxxxxxxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit c14890a8e54977f895773d393d6a640d6d698fb8
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Thu Dec 16 09:52:23 2010 +0100
Input: synaptics - report clickpad property
With the new input property interface, it is possible to report the
special quirks of a device using ioctl/sysfs. This patch sets up the
device as a pointer, and reports the clickpad functionality via the
INPUT_PROP_BUTTONPAD property.
Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 17742dc743716eebbf5892add0e0bf91f541fc39
Author: Michal Marek <mmarek@xxxxxxx>
Date: Mon Dec 20 16:06:44 2010 +0100
kconfig: Make expr_copy() take a const argument
Fixes
scripts/kconfig/expr.c: In function â??expr_get_leftmost_symbolâ??:
scripts/kconfig/expr.c:1026:2: warning: passing argument 1 of â??expr_copyâ?? discards qualifiers from pointer target type
scripts/kconfig/expr.c:67:14: note: expected â??struct expr *â?? but argument is of type â??const struct expr *â??
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 1137c56b7420c801147e0863845c03b07554721a
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Sep 26 16:24:08 2010 -0400
kconfig: simplify select-with-unmet-direct-dependency warning
This is an attempt to simplify the expressing printed by kconfig when a
symbol is selected but still has direct unmet dependency.
First, the symbol reverse dependency is split in sub-expression. Then,
each sub-expression is checked to ensure that it does not contains the
unmet dependency. This removes the false-positive symbols and fixed symbol
which already have the correct dependency. Finally, only the symbol
responsible of the "select" is printed, instead of its full dependency tree.
CC: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit b080ac8ad47aeeb845d8d11924f09255cf49b5e9
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 21:34:51 2010 +0100
ARM: 6459/2: sa1100: Add nanoEngine PCI support.
This patch adds nanoEngine's PCI support.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit fa87672ab30ce6564393778b8cbc67fc32712a30
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:41:29 2010 +0100
ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.
This patch adds nanoEngine PCMCIA support, with support for two sockets.
In order to have a fully functional pcmcia subsystem in a BSE
nanoEngine board you should carefully read this:
http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/
Acked-by: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 17b38ebb6a32250a220d6af77293f7e3f9c62a6e
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:39:05 2010 +0100
ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c.
This patch fixes checkpatch.pl issues in drivers/pcmcia/soc_common.c.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d2ccb52d88dcb7eb3539d0e0c77a7028b8d46037
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 21:31:32 2010 +0100
ARM: 6455/2: Better use of the RTC framework for sa11xx.
This patch uses the RTC framework to treat some common ioctl.
In particular, it fixes the behaviour of rtc_irq_set_freq(), which did
not work as expected because the timer was not beeing retriggered.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 47bb3b31ab2c95e275b850a291794a29aaaa31cd
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:32:48 2010 +0100
ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c.
This patch fixes checkpatch.pl issues in
arch/arm/mach-sa1100/cpu-sa1110.c.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 9f15d2caca102c4b79e34562296bcbf982665cb2
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 20:51:30 2010 +0100
ARM: 6447/3: sa1100: Put nanoEngine support back in the kernel
Adds Bright Star Engineering's nanoEngine board support to the kernel.
Also:
- Adds the nanoEngine memory chip to arch/arm/mach-sa1100/cpu-sa1110.c
(Micron MT48LC8M16A2TG-75).
- Increase in the sdram_params->name[] field length to accomodate the
name of the memory chip.
- Clean up of header content and order of
arch/arm/mach-sa1100/cpu-sa1110.c
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 29687512c0b084957112cc2c0743ce34cd0d5055
Author: James Bottomley <James.Bottomley@xxxxxxx>
Date: Thu Dec 16 09:22:24 2010 -0500
[SCSI] fix up documentation for change in ->queuecommand to lockless calling
The current doc still says we call it with the host lock held, which is
going to cause confusion.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 215faf9c5f6e319e97edea9e178123e07825c14d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 21 02:16:10 2010 -0800
drivers/net/*/: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
commit 75a84eb5d144dc761e1bb0f7dcacbf2b5cee562c
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 21 02:16:09 2010 -0800
tulip: Use DEFINE_PCI_DEVICE_TABLE and static const
Moves the PCI table to the right read-only section.
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
commit 5591c75dc345d93d353d2ab2962824648a73efe4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 21 02:16:09 2010 -0800
usb: Use static const, consolidate code
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Consolidate duplicated code into new fix_crc_bug function
and declare data in that function static const.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
commit b6bc765067ece933cc3dc7f5e95665a89100b1d5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 21 02:16:08 2010 -0800
drivers/net/*.c: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
commit 895950c2a6565d9eefda4a38b00fa28537e39fcb
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 21 02:16:08 2010 -0800
tg3: Use DEFINE_PCI_DEVICE_TABLE
Moves the PCI tables to the right read-only section.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
commit c793bec550c68a1da1034090b43a886e8fee5eb0
Author: Kailang Yang <kailang@xxxxxxxxxxx>
Date: Tue Dec 21 09:14:13 2010 +0100
ALSA: hda - Don't apply ALC269-specific initialization to ALC275
ALC275 doesn't require the ALC269 (and its variants) specific init
sequences. Add the check of codec id.
Signed-off-by: Kailang Yang <kailang@xxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 2785591a9760c677a7ee6f541e751c23086f5bfd
Author: Kailang Yang <kailang@xxxxxxxxxxx>
Date: Tue Dec 21 09:09:53 2010 +0100
ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
Set GPIO2 for some Sony VAIO with ALC275 to fix speaker output.
Signed-off-by: Kailang Yang <kailang@xxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 87a1c8aaa0bced8acf4cd64672362492460c31ae
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Dec 21 00:03:17 2010 +0100
ALSA: pcm: remember to always call va_end() on stuff that we va_start()
The Coverity checker spotted that we do not always remember to call
va_end() on 'args' in failure paths in snd_pcm_hw_rule_add().
Here's a patch to fix that up (compile tested only) - it also removes
some annoying trailing whitespace that caught my eye while I was in the
area..
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit e5fcdb7ed856b714c878ad470040fe832cbe462b
Merge: 7bddaaca472a08bb8a80b653855a1e921b440578 093d804611b9a38fe59753b37c29f840518406a9
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 21:34:16 2010 -0800
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked
n_gsm: Fix message length handling when building header
commit 7bddaaca472a08bb8a80b653855a1e921b440578
Merge: 9d5004fcf6e4e8caa9efbc25c9f85059b165329c dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 21:33:12 2010 -0800
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
Revert "USB: gadget: Allow function access to device ID data during bind()"
USB: misc: uss720.c: add another vendor/product ID
USB: usb-storage: unusual_devs entry for the Samsung YP-CP3
USB: gadget: Remove suspended sysfs file before freeing cdev
USB: core: Add input prompt and help text for USB_OTG config
USB: ftdi_sio: Add D.O.Tec PID
xhci: Fix issue with port array setup and buggy hosts.
commit 356f039822b8d802138f7121c80d2a9286976dbd
Author: Nandita Dukkipati <nanditad@xxxxxxxxxx>
Date: Mon Dec 20 14:15:56 2010 +0000
TCP: increase default initial receive window.
This patch changes the default initial receive window to 10 mss
(defined constant). The default window is limited to the maximum
of 10*1460 and 2*mss (when mss > 1460).
draft-ietf-tcpm-initcwnd-00 is a proposal to the IETF that recommends
increasing TCP's initial congestion window to 10 mss or about 15KB.
Leading up to this proposal were several large-scale live Internet
experiments with an initial congestion window of 10 mss (IW10), where
we showed that the average latency of HTTP responses improved by
approximately 10%. This was accompanied by a slight increase in
retransmission rate (0.5%), most of which is coming from applications
opening multiple simultaneous connections. To understand the extreme
worst case scenarios, and fairness issues (IW10 versus IW3), we further
conducted controlled testbed experiments. We came away finding minimal
negative impact even under low link bandwidths (dial-ups) and small
buffers. These results are extremely encouraging to adopting IW10.
However, an initial congestion window of 10 mss is useless unless a TCP
receiver advertises an initial receive window of at least 10 mss.
Fortunately, in the large-scale Internet experiments we found that most
widely used operating systems advertised large initial receive windows
of 64KB, allowing us to experiment with a wide range of initial
congestion windows. Linux systems were among the few exceptions that
advertised a small receive window of 6KB. The purpose of this patch is
to fix this shortcoming.
References:
1. A comprehensive list of all IW10 references to date.
http://code.google.com/speed/protocols/tcpm-IW10.html
2. Paper describing results from large-scale Internet experiments with IW10.
http://ccr.sigcomm.org/drupal/?q=node/621
3. Controlled testbed experiments under worst case scenarios and a
fairness study.
http://www.ietf.org/proceedings/79/slides/tcpm-0.pdf
4. Raw test data from testbed experiments (Linux senders/receivers)
with initial congestion and receive windows of both 10 mss.
http://research.csc.ncsu.edu/netsrv/?q=content/iw10
5. Internet-Draft. Increasing TCP's Initial Window.
https://datatracker.ietf.org/doc/draft-ietf-tcpm-initcwnd/
Signed-off-by: Nandita Dukkipati <nanditad@xxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit eda83e3b63e88351310c13c99178eb4634f137b2
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 20 12:54:58 2010 +0000
net_sched: sch_sfq: better struct layouts
Here is a respin of patch.
I'll send a short patch to make SFQ more fair in presence of large
packets as well.
Thanks
[PATCH v3 net-next-2.6] net_sched: sch_sfq: better struct layouts
This patch shrinks sizeof(struct sfq_sched_data)
from 0x14f8 (or more if spinlocks are bigger) to 0x1180 bytes, and
reduce text size as well.
text data bss dec hex filename
4821 152 0 4973 136d old/net/sched/sch_sfq.o
4627 136 0 4763 129b new/net/sched/sch_sfq.o
All data for a slot/flow is now grouped in a compact and cache friendly
structure, instead of being spreaded in many different points.
struct sfq_slot {
struct sk_buff *skblist_next;
struct sk_buff *skblist_prev;
sfq_index qlen; /* number of skbs in skblist */
sfq_index next; /* next slot in sfq chain */
struct sfq_head dep; /* anchor in dep[] chains */
unsigned short hash; /* hash value (index in ht[]) */
short allot; /* credit for this slot */
};
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Jarek Poplawski <jarkao2@xxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9d5004fcf6e4e8caa9efbc25c9f85059b165329c
Merge: 453434cf3fdcd3954bb52460e37d4945a0913d3e 361cf40519a491f68b28ad90225e4611c4bf8e12
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 21:32:20 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: handle partial result from get_user_pages
ceph: mark user pages dirty on direct-io reads
ceph: fix null pointer dereference in ceph_init_dentry for nfs reexport
ceph: fix direct-io on non-page-aligned buffers
ceph: fix msgr_init error path
commit 453434cf3fdcd3954bb52460e37d4945a0913d3e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 21:21:49 2010 -0800
Fix build error in drivers/block/cciss.c
.. caused by a missing semi-colon, introduced in commit 0fc13c8995cd
("cciss: fix cciss_revalidate panic").
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Reported-by: Thiago Farina <tfransosi@xxxxxxxxx>
Cc: Jens Axboe <jaxboe@xxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 4584acc3ee236424b5d0b52f143d980cae3c2be5
Merge: f0c61d3d3c319def8feebb99682ae0223a41dffe c7d3e9e801d72e86eb8a0f311453192a84f14412 b89cd71a159b5edca4c429687e4af01708eb1b26
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Mon Dec 20 19:13:40 2010 -0800
Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus
commit a93f344d3c04e4b84490c65f2a574387c593be40
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Mon Dec 20 11:22:29 2010 -0500
drm/radeon/kms: reorder display resume to avoid problems
On resume, we were attemping to unblank the displays before the
timing and plls had be reprogrammed which led to atom timeouts
waiting for things that are not yet programmed. Re-program
the mode first, then reset the dpms state.
This fixes the infamous atombios timeouts on resume.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 86f5c9edbb3bac37cc8cee6528a929005ba72aad
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Mon Dec 20 12:35:04 2010 -0500
drm/radeon/kms/evergreen: reset the grbm blocks at resume and init
This fixes module reloading and resume as the gfx block seems to
be left in a bad state in some cases.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 9f0c4f9c2f835eee1bbb93f96bf9483d56f1892b
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Mon Dec 20 12:35:03 2010 -0500
drm/radeon/kms: fix evergreen asic reset
Only reset the grbm blocks, srbm tends to lock the GPU
if not done properly and in most cases is not necessary.
Also, no need to call asic init after reset the grbm blocks.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Reviewed-by: Jerome Glisse <jglisse@xxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit f0c61d3d3c319def8feebb99682ae0223a41dffe
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Sat Dec 18 18:17:10 2010 +0000
omap: rx51: Switch rx51_tpa6130a2_data __initdata to__initdata_or_module
If the TPA6130 is compiled as module the id and power_gpio values are
arbitrary at module probing time since the rx51_tpa6130a2_data was marked as
__initdata. Fix this by using __initdata_or_module. Then __initdata is
defined only if the kernel is built without CONFIG_MODULES and omitted
otherwise.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit f861fc1766888858db6abd57adae3af7abc286ca
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Sun Dec 19 22:33:36 2010 +0000
omap: pandora: fix wifi support
After commit ed919b0 "mmc: sdio: fix runtime PM anomalies by introducing
MMC_CAP_POWER_OFF_CARD" it is required to specify MMC_CAP_POWER_OFF_CARD
to have runtime PM support. As the wl1251 driver expects card to be
powered down when it's not used, wifi will no longer work after interface
is brought down at least once without functioning runtime PM.
Fix this by declaring MMC_CAP_POWER_OFF_CARD for MMC3.
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit d920e52020bcad791b12137deea341665160b974
Author: Raghuveer Murthy <raghuveer.murthy@xxxxxx>
Date: Fri Dec 17 18:15:07 2010 -0800
OMAP4: Pandaboard: Add omap_reserve functionality
This patch adds omap_reserve functionality to board-omap4panda.c.
Helps in the reserving boot time memory in SDRAM, used here for
framebuffer allocation.
This patch is in similar lines to commit id 71ee7dad9b6991, from
Russell king
Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Raghuveer Murthy <raghuveer.murthy@xxxxxx>
[tony@xxxxxxxxxxx: fixed to be before .map_io as pointed out by Russell King]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit f389f4cb46e69fe2cea81e21fd01efc4daf07c8e
Author: Hemanth V <hemanthv@xxxxxx>
Date: Fri Dec 17 18:15:08 2010 -0800
omap4: Add platform changes for PWM LED
Register TWL6030 PWM, which is used as charging LED
Signed-off-by: Hemanth V <hemanthv@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit d048aca2e2e023204c10ca6b705642c1de54d95c
Author: Hemanth V <hemanthv@xxxxxx>
Date: Fri Dec 17 18:15:08 2010 -0800
omap4: Add platform changes for Ambient Light sensor
Register BH1780GLI Ambient light sensor, which is an I2C device
for 4430SDP board.
Signed-off-by: Hemanth V <hemanthv@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 70e77760639625e6ec4564c262552e6002eb5ba6
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Fri Dec 17 18:15:08 2010 -0800
omap3: igepv2: LED gpio-led:green:d1 is active low
Make sure the LED is turned off at boot time, and configure the GPIO LED
device as active low.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Acked-by: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 62d8e9e2613032c6c8397b554b5f789131bb3d60
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Fri Dec 17 18:15:07 2010 -0800
omap3: igepv2: Don't call gpio_set_value right aftergpio_direction_output
gpio_direction_output() has a value argument, there's no need to call
gpio_set_value() explicitly right after.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Acked-by: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 65dd4c1626b396af839881708fdf3bc726a16f73
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 17 18:37:08 2010 -0800
omap1: Fix innovator FPGA init for multi-omap
No need to call this early from init_irq. Also recent changes
initialize GPIO now later, so calling gpio_request from init_irq
will make it fail.
While at it, also remove the unnecessary EXPORT_SYMBOL.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit da07c0cff295d887427ad2519e452ee3c27e47ff
Author: Marc Zyngier <maz@xxxxxxxxxxxxxxx>
Date: Mon Dec 20 18:48:16 2010 -0800
Fix IGEPv2 second MMC channel power supply
Commit 72f381ba056 (omap3: Remove VMMC2 regulator on IGEP v2)
removed an unused regulator entry, but left the second MMC channel
(used by the Libertas WLAN module) without link to power regulator.
This causes the SDIO module to fail being detected.
This patch adds the two regulators that actually feed the WLAN module
(1v8 from the TWL4030 VIO LDO, and a fixed 3v3). With that patch, the
second channel is properly detected. Details of the power supply
implementation were kindly provided by Enric Balletbo i Serra.
Also change vmmc1 to use symbolic names instead of direct device
reference.
Tested on an IGEPv2 Rev-B.
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxxxxxxx>
Acked-by: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit cd303e1712e3ebdf174bb378bb8df851eac2701a
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Mon Dec 20 18:48:16 2010 -0800
omap2430: hwmod: remove stray declaration
Patch "OMAP2xxx: hwmod: add I2C hwmods for OMAP2420, 2430"
in linux-next as of 20101203 introduced the following build
warning - fix this by removing the stray i2c_dev_attr.
arch/arm/mach-omap2/omap_hwmod_2430_data.c:483: warning: 'i2c_dev_attr' defined but not used
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 60d24eeda7c7e3b0551f5a349224c7cc721206bd
Author: Srikar <ext-srikar.1.bhavanarayana@xxxxxxxxx>
Date: Mon Dec 20 18:48:16 2010 -0800
Added video data to support tvout on rx51
To support tvout on rx51,added Intilization data,
tvout as display device and enabled venc through gpio
on rx51
Signed-off-by: Srikar <ext-srikar.1.bhavanarayana@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit caeeb4aadfbff8d8efbb055594c0459cff94adad
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Mon Dec 20 18:48:16 2010 -0800
omap: rx51: Add supplies and data for codec b part ofTLV320AIC34
Upcoming ASoC core and tlv320aic3x changes makes possible to take b part of
TLV320AIC34 into use on RX51/N900. Prepare to this by adding virtual supplies
and platform data for b part of the codec.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 91db7b2985555bd0456ad30440dd615c985fc9c6
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Mon Dec 20 18:48:15 2010 -0800
omap: rx51: Remove extra tlv320aic3x.h inclusion
Remove second tlv320aic3x.h inclusion that came along the commit f0fba2a
"ASoC: multi-component - ASoC Multi-Component Support".
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 5690597fc648c92b94771993a56c7e4f614874bf
Author: Aaro Koskinen <Aaro.Koskinen@xxxxxxxxx>
Date: Mon Dec 20 18:48:15 2010 -0800
arm: mach-omap2: Kconfig: fix incorrect option
There is no MFD config option, MFD_SUPPORT should be selected instead.
This will prevent build errors when trying out different configurations.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 434c23a7ef48763fd8d4adfb0edebb4237770f9d
Author: Aaro Koskinen <Aaro.Koskinen@xxxxxxxxx>
Date: Mon Dec 20 18:48:15 2010 -0800
arm: mach-omap2: hsmmc_reset: fix clk_get() error handling
clk_get() return value should be checked with IS_ERR(). Furthermore,
clocks should be put and disabled properly.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 92971021c632876108ea2e06290a56a9157578f5
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Tue Dec 21 12:47:56 2010 +1000
Revert "drm: Don't try and disable an encoder that was never enabled"
This reverts commit 541cc966915b6756e54c20eebe60ae957afdb537.
Wei Yonjun reported this caused a regression against Intel VGA hotplug
on his G33 hw.
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit f31cc9622d75c1c6f041d786698daa425c0425c2
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:19 2010 -0800
OMAP: DMA: Convert DMA library into platform driver
Convert DMA library into DMA platform driver and make use of
platform data provided by hwmod data base for OMAP2+ onwards.
For OMAP1 processors, the DMA driver in mach-omap uses resource
structures for getting platform data.
Thanks to Tony Lindgren <tony@xxxxxxxxxxx> for fixing various
omap1 issues and testing the same on OSK5912 board.
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 59de3cf1ce9a961ba9ab657707727db2111e72fa
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:19 2010 -0800
OMAP2+: DMA: hwmod: Device registration
Prepare OMAP2+ DMA to use hwmod infrastructure so that DMA can register
as platform device.
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 6568f7c43a72f9631910e26092ef3ecf67cc99eb
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:19 2010 -0800
OMAP1: DMA: Implement in platform device model
Implement OMAP1 DMA as platform device and add support for
registering through platform device layer using resource
structures.
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 531ce0d57caf7e49073608873de6976558fd7e4f
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Mon Dec 20 18:27:19 2010 -0800
OMAP4: hwmod data: add system DMA
Add OMAP4 DMA hwmod data. In addition to original dma hwmod data,
the following changes are added.
1. DMA device attributes structure is introduced for diffenrenciating
OMAP cpu's based on DMA features.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 01438ab6a49b63ef02b2eb44b63345a09792f982
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:19 2010 -0800
OMAP3: hwmod data: add system DMA
Add OMAP3 DMA hwmod data
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 82cbd1aebafd126f40a8ed0725a6feb6ed710576
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:18 2010 -0800
OMAP2430: hwmod data: add system DMA
Add OMAP2430 DMA hwmod data and also add required
DMA device attributes.
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 745685df95961ebbf0bcafcf28f31217a75070ae
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:18 2010 -0800
OMAP2420: hwmod data: add system DMA
Add OMAP2420 DMA hwmod data and also add required
DMA device attributes.
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit d3c9be2f42223f256d06b2b69ed26afdcb02f64a
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:18 2010 -0800
OMAP: DMA: Introduce errata handling feature
Implement errata handling to use flags instead of cpu_is_* and
cpu_class_* in the code.
The errata flags are initialized at init time and during runtime we are
using the errata variable (via the IS_DMA_ERRATA macro) to execute the
required errata workaround.
Reused errata handling patch from: Peter Ujfalusi
<peter.ujfalusi@xxxxxxxxx>
https://patchwork.kernel.org/patch/231191/
Changes to above patch:
1. Changes are done for converting all the existing errata work arounds
to use this feature.
2. Detailed description for each errata is added.
3. Fixed bug in SET_DMA_ERRATA macro
4. Bit shifting in macro definitions are replaced with BIT() macro
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit a4c537c7f60704691efc5f833b3d440252275c3b
Author: G, Manjunath Kondaiah <manjugk@xxxxxx>
Date: Mon Dec 20 18:27:17 2010 -0800
OMAP: DMA: Replace read/write macros with functions
Prepare DMA library to get converted into DMA driver using platform
device model and hwmod infrastucture(for omap2+, resource structures
for omap1)
The low level read/write macros are replaced with static inline
functions and register offsets are handled through static register
offset tables mapped through enumeration constants.
These low level read/write functions along with static register offset
tables will be moved to respective mach-omap dma files in the later
patches of this series.
There are no functionality changes with these changes except change in
logic for handling 16bit registers of OMAP1.
Signed-off-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit f7bb0d9ab29e3159e22c3bfc843bd37c7d3c91a0
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Thu Dec 9 14:24:16 2010 +0000
I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c
The convention for omap device naming is omap_XXX.
Rename the device and driver name in order to stick
to this naming convention.
Change device name in clock nodes as well.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Rajendra Nayak <rnayak@xxxxxx>
Cc: Ben Dooks <ben-i2c@xxxxxxxxx>
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
Acked-by: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 05f185c774992f1d9edb646a3ecfdabdc8e358f3
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Mon Dec 6 13:23:48 2010 +0000
omap1: pm_bus: Fix compilation warning
Fix following compilation warning:
arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_resume':
arch/arm/mach-omap1/pm_bus.c:51: warning: unused variable 'ret'
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 16c8a3b0c193dca0826dde77423ec4f7a81ed9f6
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Mon Dec 6 12:49:05 2010 +0000
omap1: htc_herald: Fix compilation warning
Patch fix following compilation warning:
arch/arm/mach-omap1/board-htcherald.c:442:
warning: large integer implicitly truncated to unsigned type
Hopefully this is just a typo.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 374b8cfd61f33b3c1dd4b0f4c2b1bb20079d3090
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Thu Dec 9 14:24:17 2010 +0000
omap: serial: Change device name: omap-hsuart -> omap_uart
The naming convention for omap_device is omap_XXX.
Rename the device and driver name in order to stick
to this naming convention.
Remove the hs prefix that is implicit for every OMAP uarts.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Govindraj Raja <govindraj.raja@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit a56f7428d7534f162fbb089c5c79012bf38a7c29
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Wed Oct 6 16:39:07 2010 +0000
drm/radeon: Add early unregister of firmware fb's
Without this, we attempt the handover too late, the firmware fb
might be accessing the chip simultaneously to us re-initializing
various parts of it, which might frighten babies or cause all sort
of nasty psychologic trauma to kitten.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
[danvet: add cc: stable, forward ported and compile-fixed for X86]
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
[airlied: move to even earlier in module load.]
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit d9993be65a77f500ae926176baa264816bfe3816
Merge: c4266263249f22479eb1abb1a1709c38240b1597 aa3e219997e4b949be4199660936099ded0b401f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Dec 20 13:24:14 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit aa3e219997e4b949be4199660936099ded0b401f
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 20 13:18:16 2010 -0800
net_sched: sch_sfq: fix allot handling
When deploying SFQ/IFB here at work, I found the allot management was
pretty wrong in sfq, even changing allot from short to int...
We should init allot for each new flow, not using a previous value found
in slot.
Before patch, I saw bursts of several packets per flow, apparently
denying the default "quantum 1514" limit I had on my SFQ class.
class sfq 11:1 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 7p requeues 0
allot 11546
class sfq 11:46 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 1p requeues 0
allot -23873
class sfq 11:78 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 5p requeues 0
allot 11393
After patch, better fairness among each flow, allot limit being
respected, allot is positive :
class sfq 11:e parent 11:
(dropped 0, overlimits 0 requeues 86)
backlog 0b 3p requeues 86
allot 596
class sfq 11:94 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 3p requeues 0
allot 1468
class sfq 11:a4 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 4p requeues 0
allot 650
class sfq 11:bb parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 3p requeues 0
allot 596
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c4266263249f22479eb1abb1a1709c38240b1597
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 15 08:18:36 2010 +0000
net_sched: sch_sfq: add backlog info in sfq_dump_class_stats()
We currently return for each active SFQ slot the number of packets in
queue. We can also give number of bytes accounted for these packets.
tc -s class show dev ifb0
Before patch :
class sfq 11:3d9 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 0b 3p requeues 0
allot 1266
After patch :
class sfq 11:3e4 parent 11:
(dropped 0, overlimits 0 requeues 0)
backlog 4380b 3p requeues 0
allot 1212
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ba119204ff6ff722dcec387b305d9c2d23380726
Merge: cf7d7e5a1980d1116ee152d25dac382b112b9c17 0c521ccbd0c9ad5623ff9b37b20b3ff9d4ad65a7
Author: David Brown <davidb@xxxxxxxxxxxxxx>
Date: Mon Dec 20 13:11:10 2010 -0800
Merge branches 'msm-core' and 'msm-mmc' into for-next
* msm-core: (28 commits)
msm: initial framebuffer support
msm: add handling for clocks tagged as CLK_MINMAX
msm: trout: change name of pmdh_clk to mddi_clk
msm: add CLK_MINMAX to pmdh_clk
msm: trout: add gpio_to_irq
msm: iommu: Use the correct memory allocation flag
msm_serial: Remove redundant unlikely()
msm: iommu: Miscellaneous code cleanup
msm: iommu: Support cache-coherent memory access
msm: iommu: Definitions for extended memory attributes
msm: iommu: Kconfig dependency for the IOMMU API
msm: iommu: Check if device is already attached
msm: iommu: Kconfig item for cacheable page tables
msm: iommu: Don't flush page tables if no devices attached
msm: iommu: Mark functions with the right section names
msm: iommu: Support for the 2nd GFX core's IOMMU
msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings
msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings
msm: iommu: Use more consistent naming in platform data
msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU
...
* msm-mmc: (33 commits)
mmc: msm_sdcc: Check for only DATA_END interrupt to end a request
mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned
mmc: msm_sdcc: Reset SDCC in case of data transfer errors
mmc: msm_sdcc: Add prog done interrupt support
mmc: msm_sdcc: Fix possible circular locking dependency warning
msm: initial framebuffer support
msm: add handling for clocks tagged as CLK_MINMAX
msm: trout: change name of pmdh_clk to mddi_clk
msm: add CLK_MINMAX to pmdh_clk
msm: trout: add gpio_to_irq
msm: iommu: Use the correct memory allocation flag
msm_serial: Remove redundant unlikely()
msm: iommu: Miscellaneous code cleanup
msm: iommu: Support cache-coherent memory access
msm: iommu: Definitions for extended memory attributes
msm: iommu: Kconfig dependency for the IOMMU API
msm: iommu: Check if device is already attached
msm: iommu: Kconfig item for cacheable page tables
msm: iommu: Don't flush page tables if no devices attached
msm: iommu: Mark functions with the right section names
...
commit 0c521ccbd0c9ad5623ff9b37b20b3ff9d4ad65a7
Author: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:03:07 2010 +0530
mmc: msm_sdcc: Check for only DATA_END interrupt to end a request
The current code checks for both DATA_END and DATA_BLK_END bits in
MCI_STATUS register and ends a request only if both are set at a time.
The hardware doesn't always set DATA_BLK_END when DATA_END is set.
But DATA_END status itself is sufficient condition from hardware that
data transfer is done and hence, check for only DATA_END interrupt in
software to end a request.
Signed-off-by: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 71dd9106af54de0f758875fa4b595af42a327448
Author: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:03:06 2010 +0530
mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned
The current code for PIO doesn't transfer whole data when data size
is not in multiple of 4 bytes. The last few bytes are not written to
the card resulting in no DATAEND interrupt from SDCC. This patch
allows data transfer for non-aligned data size in PIO mode.
Signed-off-by: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit b08bb35d1a5ee5426198eb3a2861008c2e9e6fc4
Author: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:03:05 2010 +0530
mmc: msm_sdcc: Reset SDCC in case of data transfer errors
SDCC uses an asynchronous FIFOs for data synchronization (one for TX
and one for RX). For any error when DPSM (Data path state machine) is
involved the transfer is terminated with the remaining data stuck inside
FIFOs. Reset the controller in case of data errors to ensure that
any left over data in FIFOs is flushed out and DPSM is in good state.
The following problems are observed without this reset functionality -
1. After the card is removed in an unsafe way (removed when there
is an on going data transfer), the card will not be detected upon
its next insertion. This is because the controller wouldn't respond
to few initialization commands.
2. When an error occurs for a data transfer in non-DMA mode, sometimes
we get spurious PIO interrupt after the request is processed.
Signed-off-by: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit d5137bdd91b8267ada3973806443013f4bf079f6
Author: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:03:04 2010 +0530
mmc: msm_sdcc: Add prog done interrupt support
Enable prog done interrupt for stop command(CMD12) that is sent
after a multi-block write(CMD25). The PROG_DONE bit is set when
the card has finished its programming and is ready for next data.
After every write request the card will be polled for ready status
using CMD13. For a multi-block write(CMD25) before sending CMD13,
stop command (CMD12) will be sent. If we enable prog done interrupt
for CMD12, then CMD13 polling can be avoided. The prog done interrupt
means that the card is done with its programming and is ready for
next request.
Signed-off-by: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 62612cf9d97068dc75b48a7a3044ee907a3283ec
Author: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:03:03 2010 +0530
mmc: msm_sdcc: Fix possible circular locking dependency warning
In the context of request processing thread, data mover lock is
acquired after the host lock. In another context, in the completion
handler of data mover the locks are acquired in the reverse order,
resulting in possible circular lock dependency warning. Hence,
schedule a tasklet to process the dma completion so as to avoid
nested locks.
Signed-off-by: Sahitya Tummala <stummala@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 3d986b25b5faa50ba6afd94f60f270b6c3061e5e
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 16 14:59:49 2010 -0500
rtlwifi: use alloc_workqueue
create_workqueue is deprecated. The workqueue usage does not seem to
demand any special treatment, so do not set any flags either.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
commit d4d5dc3d6f86cc70f08e45b840f3e681588d2718
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 19 00:31:55 2010 +0100
ath9k: do not limit the chainmask to 1 for legacy mode
Restricting the chainmask to 1 for legacy mode disables useful features
such as MRC, and it reduces the available transmit power.
I can't think of a good reason to do this in legacy mode, so let's just
get rid of that code.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f1a8abb0459e96765bd1d300f434256d8dfac73d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 19 00:31:54 2010 +0100
ath9k_hw: fix PA predistortion HT40 mask
The commit 'ath9k_hw: Disable PAPRD for rates with low Tx power' changed
the code that sets the PAPRD rate masks to use only either the HT20 mask
or the HT40 mask. This is wrong, as the hardware can still use HT20 rates
even when configured for HT40, and the operating channel mode does not
affect PAPRD operation.
The register for the HT40 rate mask is applied as a mask on top of the
other registers to selectively disable PAPRD for specific rates on HT40
packets only.
This patch changes the code back to the old behavior which matches the
intended use of these registers. While with current cards this should not
make any practical difference (according to Atheros, the HT20 and HT40
mask should always be equal), it is more correct that way, and maybe
the HT40 mask will be used for some rare corner cases in the future.
Cc: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f8a0a781488ec7288d1049e5d2022850aa98f7b6
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Dec 18 19:30:50 2010 +0100
mac80211: fix potentially redundant skb data copying
When an skb is shared, it needs to be duplicated, along with its data buffer.
If the skb does not have enough headroom, using skb_copy might cause the data
buffer to be copied twice (once by skb_copy and once by pskb_expand_head).
Fix this by using skb_clone initially and letting ieee80211_skb_resize sort
out the rest.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4cd06a344db752f513437138953af191cbe9a691
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Dec 18 19:30:49 2010 +0100
mac80211: skip unnecessary pskb_expand_head calls
If the skb is not cloned and we don't need any extra headroom, there
is no point in reallocating the skb head.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 489ee9195a7de9e6bc833d639ff6b553ffdad90e
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Dec 18 19:30:48 2010 +0100
mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit
The change 'mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs'
added a check for copying the skb if it's shared, however the tx info variable
still points at the cb of the old skb
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ae29fbb189c7a80677500c718c9ce08095ccde01
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Dec 18 11:52:10 2010 +0300
wl1251: wl12xx_get_platform_data() returns an ERR_PTR
wl12xx_get_platform_data() returns an ERR_PTR on failure and it never
returns a NULL.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d704300fa546a613ec3821b908528b20685cb92a
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Fri Dec 17 19:36:25 2010 -0600
rtlwifi: Fix use of mutex in interrupt code
A previous conversion from semaphoreto mutexes missed the fact that one
of the semaphores was used in interrupt code. Fixed by changing to
a spinlock.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f0b3e4b7307f02a203029441b0473a84aebc6435
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Fri Dec 17 16:04:11 2010 -0600
MAINTAINERS: Fix typo in rtl8192ce entry
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b1c1d0003d6d07c3b269340b8ac3fd2b42fd5ebe
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Fri Dec 17 20:44:36 2010 +0530
ath9k: Properly initialize channel table for 2GHz
ath9k channel table for 2Ghz does not seems to initialize the 'band'
parameter.Though it does not seems to cause any visible issue it looks
odd when we initialize the 'band' parameter for 5Ghz channel table while
not so for 2Ghz.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 18db45c46eae31cee7cfdfd7e671b0201dcdbcd8
Author: Anisse Astier <anisse@xxxxxxxxx>
Date: Fri Dec 17 11:45:01 2010 +0100
rtl8192ce: Fix typo in Kconfig description
Signed-off-by: Anisse Astier <anisse@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 55821324dc6a10fab36871534a322bad159fad79
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Dec 17 00:57:01 2010 +0100
ath9k_hw: remove baseband rfsilent support
When rfkill is enabled, ath9k_hw unnecessarily configured the baseband to
turn off based on GPIO input, however that code was hardcoded to GPIO 0
instead of ah->rfkill_gpio.
Since ath9k uses software rfkill anyway, this code is completely unnecessary
and should be removed in case anything else ever uses GPIO 0.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4b3ba66a47311770b21e7aba481f4f2a90ba3084
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Dec 17 00:57:00 2010 +0100
ath9k: fix queue depth check for forming new aggregates
To improve aggregation length, there should not be more than two fully formed
A-MPDU frames in the hardware queue. To ensure this, the code checks the tx
queue length before forming new A-MPDUs. This can reduce the throughput (or
maybe even starve out A-MPDU traffic) when too many non-aggregated frames are
in the queue.
Fix this by keeping track of pending A-MPDU frames (even when they're sent out
as single frames), but exclude rate control probing frames to improve
performance.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5c405b5c3e435fd332058c59ee58eaa1ac9c513a
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 16 15:43:36 2010 -0500
rtl8192ce: drop 'rtl8192c-' prefix from files
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
commit 61ad5394590c5c5338ab4ec50553d809a9996d50
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Thu Dec 16 17:23:34 2010 -0800
mac80211: Remove unused third address from mesh address extension header.
The Mesh Control header only includes 0, 1 or 2 addresses. If there is
one address, it should be interpreted as Address 4. If there are 2,
they are interpreted as Addresses 5 and 6 (Address 4 being the 4th
address in the 802.11 header).
The address extension used to hold up to 3 addresses instead of the current 2.
I'm not sure which draft version changed this, but it is very unlikely that it
will change again given the state of the approval process of this draft. See
section 7.1.3.6.3 in current draft (8.0).
Also, note that the extra address that I'm removing was not being used, so this
change has no effect on over-the-air frame formats. But I thought I better
remove it before someone does start using it.
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3de135dba9341a3d10a7a5b9533ce11cb77d4f4d
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 16 11:30:33 2010 +0900
ath5k: Set available antenna information for cfg80211
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 39fd5de4472b7b222c6cec78d72b069133f694e4
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 16 11:30:28 2010 +0900
nl80211: Export available antennas
Export the information which antennas are available for configuration as TX or
RX antennas via nl80211.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7f531e03abf0162df3966c4fa5fa6fdd9302cb6b
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 16 11:30:22 2010 +0900
cfg80211: Separate available antennas for RX and TX
As has been pointed out by Daniel Halperin some devices (e.g. Intel IWL5100)
can only TX from a subset of RX antennas, so use separate availability masks
for RX and TX.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c7108a7111cd9e592d6ad498be37276dbea75d2b
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Thu Dec 16 17:37:50 2010 -0800
mac80211: Send mesh non-HWMP path selection frames to userspace
Let path selection frames for protocols other than HWMP be sent to
userspace via NL80211_CMD_REGISTER_FRAME. Also allow userspace to send
and receive mesh path selection frames.
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c80d545da3f7c0e534ccd4a780f322f80a92cff1
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Thu Dec 16 17:37:49 2010 -0800
mac80211: Let userspace enable and configure vendor specific path selection.
Userspace will now be allowed to toggle between the default path
selection algorithm (HWMP, implemented in the kernel), and a vendor
specific alternative. Also in the same patch, allow userspace to add
information elements to mesh beacons. This is accordance with the
Extensible Path Selection Framework specified in version 7.0 of the
802.11s draft.
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 24bdd9f4c9af75b33b438d60381a67626de0128d
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Thu Dec 16 17:37:48 2010 -0800
mac80211: Rename mesh_params to mesh_config to prepare for mesh_setup
Mesh parameters can be to setup a mesh or to configure it.
This patch renames the ambiguous name mesh_params to mesh_config
in preparation for mesh_setup.
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b2b7ab22fa2e619c20917e825c0da7212ca2efc9
Author: Meelis Roos <mroos@xxxxxxxx>
Date: Fri Dec 17 23:27:50 2010 +0200
hostap: remove netif_stop_queue from init
Fix runtime warning with backtrace from hostap by removing
netif_stop_queue() call before register_netdev. Tested to work fine on
hostap_pci Prism 2.5.
(This removes a warning about calling netif_stop_queue before
register_netdev is called. -- JWL)
Signed-off-by: Meelis Roos <mroos@xxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9f333281a7da4c3a59bccc0cb53f7590eb850d93
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Tue Nov 30 16:49:23 2010 +0100
mac80211/rt2x00: add ieee80211_tx_status_ni()
All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from
a workqueue, which causes "NOHZ: local_softirq_pending 08" messages.
To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni()
which can be called from process context, and call it from
rt2x00lib_txdone(). For the rt2800pci special case a driver
flag is introduced.
https://bugzilla.kernel.org/show_bug.cgi?id=24892
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f955e1415f381c7fa6ebe8630cd1fe5a694e8f4a
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 20 03:03:15 2010 +0000
vmxnet3: locking problems in xmit
There were several paths that didn't release their locks.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Bhavesh Davda <bhavesh@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 914e5cea14b2e4651cdb0707e0936b43246deda0
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 20 10:43:02 2010 -0800
typhoon: memory corruption in typhoon_get_drvinfo()
info->version only has space for 32 characters but my UTS_RELEASE is
"2.6.37-rc6-next-20101217-05817-ge935fc8-dirty" so it doesn't fit.
This is supposed to be the version of the driver, not the kernel
version. This driver doesn't have a version so lets just leave it
blank.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bbccc16c8a27d75dabe88326f7074181493a3b69
Author: Andreas Mohr <andi@xxxxxxxx>
Date: Mon Dec 20 10:38:47 2010 -0800
net: Add USB PID for new MOSCHIP USB ethernet controller MCS7832 variant
Due to active notification of the new MCS7832 version by the manufacturer
(Mr. Milton; thanks!) -- quote: "functionality same as MCS7830",
I'm now submitting this patch (on -rc6), intended for networking.git and -stable.
- add MCS7832 USB PID to be able to support this new device variant, too
- add related descriptions
Signed-off-by: Andreas Mohr <andi@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6561a3b12d62ed5317e6ac32182d87a03f62c8dc
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 19 21:11:20 2010 -0800
ipv4: Flush per-ns routing cache more sanely.
Flush the routing cache only of entries that match the
network namespace in which the purge event occurred.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
commit 782615aea84e57dc7f2f922cea823df3de635a78
Author: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 10:35:25 2010 -0800
ehea: Fixing some message level
Currently there are some info message that is set as error, and an error
message that is set as debug. This patch just fixes it.
Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8cad7f06e3b1d3f9a28bb7385e8fc09d5e1bf84c
Merge: 92d7c9b2312474ce1259d71b4e50e01ae9fa95ea 0e4d413af1a9ddd12f82617734eb535007e186a8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 10:35:04 2010 -0800
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] gspca - sonixj: Better handling of the bridge registers 0x01 and 0x17
[media] gspca - sonixj: Add the bit definitions of the bridge reg 0x01 and 0x17
[media] gspca - sonixj: Set the flag for some devices
[media] gspca - sonixj: Add a flag in the driver_info table
[media] gspca - sonixj: Fix a bad probe exchange
[media] gspca - sonixj: Move bridge init to sd start
[media] bttv: remove unneeded locking comments
[media] bttv: fix mutex use before init (BZ#24602)
[media] Don't export format_by_forcc on two different drivers
commit c8efcc2589464ac70255bb83e10cad61c7c6d295
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Mon Dec 20 19:32:04 2010 +0100
workqueue: allow chained queueing during destruction
Currently, destroy_workqueue() makes the workqueue deny all new
queueing by setting WQ_DYING and flushes the workqueue once before
proceeding with destruction; however, there are cases where work items
queue more related work items. Currently, such users need to
explicitly flush the workqueue multiple times depending on the
possible depth of such chained queueing.
This patch updates the queueing path such that a work item can queue
further work items on the same workqueue even when WQ_DYING is set.
The flush on destruction is automatically retried until the workqueue
is empty. This guarantees that the workqueue is empty on destruction
while allowing chained queueing.
The flush retry logic whines if it takes too many retries to drain the
workqueue.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
commit 53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5
Author: Sven Eckelmann <sven@xxxxxxxxxxxxx>
Date: Mon Dec 20 10:32:03 2010 -0800
batman-adv: Return hna count on local buffer fill
hna_local_fill_buffer must return the number of added hna entries and
not the last checked hash bucket.
Signed-off-by: Sven Eckelmann <sven@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 58231186c4532821cb815a3a3248ca02ce5f6f0d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 20 10:30:06 2010 -0800
pktgen: Remove unnecessary prefix from pr_<level>
Remove "pktgen: " prefix string from one pr_info.
pr_fmt adds it, so this is a duplicate.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8816624222b12e5d7e291e9d1973fc42b994eb6b
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date: Thu Dec 9 17:11:53 2010 -0800
[SCSI] bfa: rename log_level to bfa_log_level
Rename log_level to bfa_log_level to make the global variable more bfa
specific and avoid clashes with other drivers which was causing a
build failure.
Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 173021072e86a0a5b3d2271347493a3e0d5f68e8
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Mon Dec 20 04:35:30 2010 +0000
net_sched: always clone skbs
Pawel reported a panic related to handling shared skbs in ixgbe
incorrectly. So we need to revert my previous patch to work around
this bug. Instead of reverting the patch completely, I just revert
the essential lines, so we can add the previous optimization
back more easily in future.
commit 3511c9132f8b1e1b5634e41a3331c44b0c13be70
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Sat Oct 16 13:04:08 2010 +0000
net_sched: remove the unused parameter of qdisc_create_dflt()
Reported-by: Pawel Staszewski <pstaszewski@xxxxxxxxx>
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 92d7c9b2312474ce1259d71b4e50e01ae9fa95ea
Merge: 9e0afb9437c68be62085d74407b169732108a929 1cf215a5b43950d1a304373037828158057ff9fc
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:59:08 2010 -0800
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: INTC interrupt priority level demux fix
ARM: mach-shmobile: fix compile warning in mm/init.c
commit 9e0afb9437c68be62085d74407b169732108a929
Merge: 7aeb3be341cc7f1fbf2b98fbef980a816736fe8e 65ada547d68dc075aa06df92fe325bff07cbc606
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:53:50 2010 -0800
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
clocksource: sh_cmt: Remove nested spinlock fix
commit 7aeb3be341cc7f1fbf2b98fbef980a816736fe8e
Merge: 07058599b486fe342f371200ac4718fedbe9a354 e13416ae7f378f9963ceca596ac464d4120093f3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:49:54 2010 -0800
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
OMAP: OMAPFB: disable old omapfb for OMAP4 builds
OMAP: DSS: VRAM: Align start & size of vram to 2M
commit 07058599b486fe342f371200ac4718fedbe9a354
Merge: 7f8635cc9e66a26d7280ba680b044fa2f65104af cb1868869dce7b751b670aadfc1f1360bc224b29
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:46:46 2010 -0800
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV210: update MAX8998 platform data to get rid of WARN()
ARM S3C24XX: Fix compilation of PM code for S3C2416
ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry
commit 7f8635cc9e66a26d7280ba680b044fa2f65104af
Merge: 3cb50ddf97a0a1ca4c68bc12fa1e727a6b45fbf2 0fc13c8995cd96f4123de400c71c223d80400ed9
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:19:46 2010 -0800
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: fix cciss_revalidate panic
block: max hardware sectors limit wrapper
block: Deprecate QUEUE_FLAG_CLUSTER and use queue_limits instead
blk-throttle: Correct the placement of smp_rmb()
blk-throttle: Trim/adjust slice_end once a bio has been dispatched
block: check for proper length of iov entries earlier in blk_rq_map_user_iov()
drbd: fix for spin_lock_irqsave in endio callback
drbd: don't recvmsg with zero length
commit 3cb50ddf97a0a1ca4c68bc12fa1e727a6b45fbf2
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 15:53:18 2010 +0000
Fix btrfs b0rkage
Buggered-in: 76dda93c6ae2 ("Btrfs: add snapshot/subvolume destroy
ioctl")
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Chris Mason <chris.mason@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit b8da46d3d55807037b58f14621a0949f18053bde
Author: Nicolas Pitre <nico@xxxxxxxxxxx>
Date: Mon Dec 20 00:29:32 2010 -0500
clarify a usage constraint for cnt32_to_63()
The cnt32_to_63 algorithm relies on proper counter data evaluation
ordering to work properly. This was missing from the provided
documentation.
Let's augment the documentation with the missing usage constraint and
fix the only instance that got it wrong.
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit de5e9d58200aafea4a33abcadcd12eb69eaba5c4
Merge: 55ec86f848a5f872fd43f5d7206464a0af419110 050c6c9b896625d9fa498265be17b82c5fc65257
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 20 09:05:26 2010 -0800
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Remove debugging check
commit faabfa0816916b0a7cfc93f6a9be382830658c80
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 20 16:58:19 2010 +0000
ARM: SMP: ensure frame pointer is reinitialized for soft-CPU hotplug
When we soft-CPU hotplug a CPU, we reset the stack pointer and
jump back to start_secondary(). This allows us to restart as if
the CPU was actually reset.
However, we weren't resetting the frame pointer, which could cause
problems with backtracing. Reset the frame pointer to zero (which
means no parent frame) just like the early assembly code also does.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 1d3f33d541312acd34bd2fa780396d111a0f73b1
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Mon Dec 13 20:55:03 2010 +0800
ARM: mxs: Add build configuration for mxs
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 4afbbb7c1b20dc10513c522849735a3293243af8
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Sat Dec 18 21:39:35 2010 +0800
ARM: mxs: Add initial mx28evk support
Add initial mx28evk support with duart and fec0.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 55cf4183d371e00cf4a2fc4fb9a25ae3d806ff87
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Mon Dec 20 22:57:44 2010 +0800
ARM: mxs: Add initial mx23evk support
Add initial mx23evk support with duart.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit b9a2ada8ff2ace20b1518a18872319d8619fe1ab
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Thu Dec 9 23:12:47 2010 +0800
ARM: mxs: Dynamically allocate fec devices
Dynamically allocate fec devices for MX28, which gets dual
fec interface.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit dc38ad4052a50b9e73fdcc970ecdd4f69ee9d97a
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Thu Dec 9 23:12:46 2010 +0800
ARM: mxs: Dynamically allocate duart devices
Dynamically allocate duart devices for MX23 and MX28.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit faff3dc947738ce7c905a4a2936a089d3fa9ddda
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Thu Dec 9 23:12:45 2010 +0800
ARM: mxs: Add static memory mapping
Create static memory mapping for MX23 and MX28.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 30a7585ff7464ceb1dceb941700654923becb769
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Sat Dec 18 21:39:33 2010 +0800
ARM: mxs: Add clock support
Add clock for MXS-based SoCs, MX23 and MX28.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit bf985969e27b507f734435a99df8bf745a3dbb2b
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Mon Dec 20 22:57:43 2010 +0800
ARM: mxs: Add iomux support
MXS-based SoCs implements iomux functions in block PINCTRL.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit fba311fcf0987396f2760553fbe01ab61ec67139
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Sat Dec 18 21:39:31 2010 +0800
ARM: mxs: Add gpio support
MXS-based SoCs implement gpio support in block PINCTRL.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 4e472096fa4ef751e7ea90e304d971843a1e350d
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Sat Dec 18 21:39:30 2010 +0800
ARM: mxs: Add timer support
There are 2 versions of the timrot on Freescale MXS-based SoCs.
The v1 on MX23 only gets 16 bits counter, while v2 on MX28
extends the counter to 32 bits.
The implementation uses two timers, one for clock_event and
another for clocksource. MX28 uses timrot 0 and 1, while MX23
uses 0 and 2.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 41fa75bc09d31c47d6606233b60f595524c28cd4
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Mon Dec 20 22:57:42 2010 +0800
ARM: mxs: Add low-level debug UART support
- DEBUG_LL support, which is incompatible with multi-soc MXS image
because of different DUART base address on MX23 and MX28
- uncompress message support
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 501aaa110a4269c99eff9736a81b5f93bb8b59be
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Thu Dec 16 12:40:16 2010 -0300
[media] mceusb: set a default rx timeout
Its possible for the call to read rx timeout from the hardware to fail,
in which case we end up with a bogus rx timeout value. Set a default one
when filling in the rc struct, and we'll just overwrite it later w/the
value from hardware, but if that read fails, we've at least got a sane
rx timeout value to work with (1000ms is the default value I've seen
returned on most if not all mceusb hardware).
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d8cc7fd7e6371026c15254a35e618d2e5c5bf562
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Wed Dec 15 19:20:55 2010 -0300
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@xxxxxxxxxx>
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit fbb1f1b0db9b196928157f97515a7ea537310ebc
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Thu Dec 16 13:27:11 2010 -0300
[media] mceusb: add another Fintek device ID
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 250f7a5f62a08985af5cf7728ae7ba9edbfdc0a9
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Wed Nov 17 02:20:15 2010 -0300
[media] lirc_dev: fixes in lirc_dev_fop_read()
This makes several changes but they're in one function and sort of
related:
"buf" was leaked on error. The leak if we try to read an invalid
length is the main concern because it could be triggered over and
over.
If the copy_to_user() failed, then the original code returned the
number of bytes remaining. read() is supposed to be the opposite way,
where we return the number of bytes copied. I changed it to just return
-EFAULT on errors.
Also I changed the debug output from "-EFAULT" to just "<fail>" because
it isn't -EFAULT necessarily. And since we go though that path if the
length is invalid now, there was another debug print that I removed.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Reviewed-by: Jarod Wilson <jarod@xxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5c769a68beaee924e1dc90bf06e1b087b1d46237
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Wed Nov 17 02:12:23 2010 -0300
[media] lirc_dev: stray unlock in lirc_dev_fop_poll()
We shouldn't unlock here. I think this was a cut and paste error.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 635f76b2aa8ef3e8436dedddc8baa6f7f438dc40
Author: Paul Bender <pebender@xxxxxxxxx>
Date: Thu Dec 16 13:23:07 2010 -0300
[media] rc: fix sysfs entry for mceusb and streamzap
When trying to create persistent device names for mceusb and streamzap
devices, I noticed that their respective drivers are not creating the rc
device as a child of the USB device. Rather it creates it as virtual
device. As a result, udev cannot use the USB device information to
create persistent device names for event and lirc devices associated
with the rc device. Not having persistent device names makes it more
difficult to make use of the devices in userspace as their names can
change.
Signed-off-by: Paul Bender <pebender@xxxxxxxxx>
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1338c925a95cf2b95909d7967b4ebddefa255c02
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Wed Nov 17 12:25:45 2010 -0300
[media] streamzap: merge timeout space with trailing space
There are cases where we get an ending space, and our trailing timeout
space then gets sent right after it, which breaks repeat, at least for
lirc userspace decoding. Merge the two spaces by way of using
ir_raw_event_store_filter, set a timeout value, and we're back to good.
Successfully tested with streamzap and windows mce remotes.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2ee95db222137429407dfcd6801b0f1a8c689771
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Fri Nov 12 19:49:04 2010 -0300
[media] mceusb: fix keybouce issue after parser simplification
Something I failed to notice while testing the mceusb RLE buffer
decoding simplification patches was that we were getting an extra event
from the previously pressed key.
As was pointed out to me on irc by Maxim, this is actually due to using
ir_raw_event_store_with_filter without having set up a timeout value.
The hardware has a timeout value we're now reading and storing, which
properly enables the transition to idle in the raw event storage
process, and makes IR decode behave correctly w/o keybounce.
Also remove no-longer-used ir_raw_event struct from mceusb_dev struct
and add as-yet-unused enable flags for carrier reports and learning
mode, which I'll hopefully start wiring up sooner than later. While
looking into that, found evidence that 0x9f 0x15 responses are only
non-zero when the short-range learning sensor is used, so correct the
debug spew message, and then suppress it when using the standard
long-range sensor.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2d6e588c48d4ce6e5d6a2cec3f98ca9e23b2ac2c
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Tue Nov 9 18:42:37 2010 -0300
[media] IR: add tv power scancode to rc6 mce keymap
And clean up some stray spaces.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 29b4494b1ff0157c1816ce8e2aea2abfdeb7f763
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Tue Nov 9 18:41:46 2010 -0300
[media] mceusb: buffer parsing fixups for 1st-gen device
If we pass in an offset, we shouldn't skip 2 bytes. And the first-gen
hardware generates a constant stream of interrupts, always with two
header bytes, and if there's been no IR, with nothing else. Bail from
ir processing without calling ir_handle_raw_event when we get such a
buffer delivered to us.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1cd50f25614226e99ac7a1518311e8474ea024e3
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Tue Nov 9 18:41:03 2010 -0300
[media] mceusb: fix up reporting of trailing space
We were storing a bunch of spaces at the end of each signal, rather than
a single long space. The in-kernel decoders were actually okay with
this, but lirc isn't. As suggested by David Härdeman, switch to storing
samples using ir_raw_event_store_with_filter, which auto-merges the
consecutive space samples for us. This also allows us to bypass having
to store rawir samples in our device struct, further simplifying the
buffer parsing state machine. Both in-kernel decoders and lirc are happy
again with this change.
Also included in this patch is proper parsing of 0x9f 0x01 commands, the
removal of some magic number usage and some printk spew fixups.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b7582815b3fc772e23ee5da884e9a2307bdc1025
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Tue Nov 9 18:11:04 2010 -0300
[media] nuvoton-cir: improve buffer parsing responsiveness
Rather than waiting for trigger bits, the formula for which was slightly
messy, and apparently, not actually 100% complete for some remotes, just
call ir_raw_event_handle whenever we finish parsing a chunk of data from
the rx fifo, similar to mceusb, as well as whenever we see an 'end of
signal data' 0x80 packet.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6f6c625d32852ab2fbfd131ba9a1e5d55ff8032c
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Fri Oct 29 00:07:39 2010 -0300
[media] mceusb: add support for Conexant Hybrid TV RDU253S
Another multi-function Conexant device. Interface 0 is IR, though on
this model, TX isn't wired up at all, so I've mixed in support for
models without TX (and verified that lircd says TX isn't supported when
trying to send w/this device).
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 798174ab6257dc2ba2ee91e242e21491c3922355
Author: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Date: Thu Nov 25 10:49:21 2010 -0300
[media] s5p-fimc: Fix output DMA handling in S5PV310 IP revisions
FIMC IP in S5Pv310 series has extended DMA status registers
and some bit fields are marked as reserved comparing to S5PC100/110.
Use correct registers for getting DMA write pointer in each SoC variant
supported by the driver.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit a8365fc205180209bfefaf9d454736bb44071a0f
Author: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Date: Thu Nov 25 09:44:48 2010 -0300
[media] s5p-fimc: Use correct fourcc code for 32-bit RGB format
Replace V4L2_PIX_FMT_RGB24 code with V4L2_PIX_FMT_RGB32
since the hardware uses 24-bits for actual pixel data but pixels
are 4-byte aligned in memory.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 69e05e837d3b90ea2c58c1117092b8eb4fd4519b
Author: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Date: Thu Nov 18 07:36:34 2010 -0300
[media] s5p-fimc: Convert m2m driver to unlocked_ioctl
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit aee7126c4e4c0c776ed227751627c151877f2d59
Author: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Date: Mon Nov 22 14:49:06 2010 -0300
[media] s5p-fimc: Explicitly add required header file
Reported by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit e004e02f3a121e5293ef56eaca6ee6d4ad60bc64
Author: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Date: Thu Nov 25 11:01:51 2010 -0300
[media] s5p-fimc: Fix vidioc_g_crop/cropcap on camera sensor
Create separate vidioc_g_crop/vidioc_s_crop handlers for capture
video node and so image cropping parameters are properly queried
at FIMC input (image sensor) and not at FIMC output.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 09b693f0bdf360b6a8e099f26c771c9fca4c3447
Author: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Date: Tue Nov 30 06:23:10 2010 -0300
[media] s5p-fimc: BKL lock removal - compilation fix
Adapt to recent videobuf_queue_dma_contig_init signature change.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit cd05e79f72d318d57e625825a5212e3fb90ea4a3
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Oct 20 10:14:57 2010 -0300
[media] soc-camera: fix static build of the sh_mobile_csi2.c driver
The test for driver->owner != NULL in sh_mobile_ceu_camera.c is unneeded and it
breaks the static build of sh_mobile_csi2.c. Remove it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 42cc37fe20cc680fb58fe12ae5ba718d683b8ca2
Author: Baruch Siach <baruch@xxxxxxxxxx>
Date: Wed Oct 27 04:03:52 2010 -0300
[media] mx2_camera: fix pixel clock polarity configuration
When SOCAM_PCLK_SAMPLE_FALLING, just leave CSICR1_REDGE unset, otherwise we get
the inverted behaviour.
Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 623eb15647fc35c5a8cd38985d5958240eb072c1
Author: Alexey Charkov <alchark@xxxxxxxxx>
Date: Mon Dec 20 16:09:57 2010 +0300
fbdev: Modify vsync timing calculation in wm8505fb
This removes the '+1' in vsync timing calculation for wm8505fb to
directly use values provided from the board setup code.
Signed-off-by: Alexey Charkov <alchark@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a7f53284e97af9670a68993c31f61a4e62a19ea5
Author: Alexey Charkov <alchark@xxxxxxxxx>
Date: Mon Dec 20 16:03:14 2010 +0300
fbdev: Minor cleanup in WM8505-related code
This replaces the last remaining driver name reference with the
macro for uniformity in wm8505fb.
In addition, the error return path in wmt_ge_rops.c is made more
uniform by getting rid of goto's in remaining places.
Signed-off-by: Alexey Charkov <alchark@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 521bc83b0fcda6f323f1de0e7bf137401a8145a2
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Fri Dec 17 19:00:13 2010 -0800
s1d13xxxfb: drop unused code
Silence warnings such as -
drivers/video/s1d13xxxfb.c:421: warning: â??bltbit_wait_bitsetâ?? defined but not used
Just drop the unused code.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4959212c18669f254daa0ae796ad676b67939ba2
Author: Jingoo Han <jg1.han@xxxxxxxxxxx>
Date: Fri Dec 17 16:45:46 2010 +0900
s3c-fb: add support for runtime pm
This patch adds support for runtime pm using the functions.
- pm_runtime_get_sync()
- pm_runtime_put_sync()
pm_runtime_get_sync() and pm_runtime_put_sync() are called when
open or release function of framebufer driver is called to inform
the system if hardware is idle or not.
Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 55f88eccf9c288eed2f93f9ca7d7fe4dd2da762e
Author: Asbjoern Sloth Toennesen <asbjorn@xxxxxxxxxxx>
Date: Sun Dec 12 17:39:40 2010 +0000
kbuild, deb-pkg: support overriding userland architecture
Usefull if building for sparc64 userland, because the
sparc and sparc64 userlands use the same 64-bit kernel,
making it impossible to always select the correct userland
architecture for the resulting debian package.
Might also be usefull, if you want a i386 userland with a amd64 kernel.
Example usage:
make KBUILD_DEBARCH=i386 deb-pkg
LKML-reference: <alpine.DEB.2.02.1011051437500.13287@xxxxxxxxxxxxxxxx>
Signed-off-by: Asbjoern Sloth Toennesen <asbjorn@xxxxxxxxxxx>
Reviewed-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Acked-by: maximilian attems <max@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 8bcee1832d23869c2cdb6886ae5210b0143256f0
Merge: 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb 1cf215a5b43950d1a304373037828158057ff9fc
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 21 00:40:51 2010 +0900
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Mon Dec 20 11:00:19 2010 +0000
ARM: mach-shmobile: Bump up NR_IRQS to 1024
Increase NR_IRQS from 512 to 1024 on SH-Mobile ARM.
Needed to support vectors in the sh73a0 INTCS block.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6155f77d09b968f591876f368d4843168910449e
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Mon Dec 20 11:04:50 2010 +0000
ARM: mach-shmobile: Clean up headsmp.S
Use PAGE_OFFSET and PHYS_OFFSET for secondary_startup
entry point as recommended by Russell King.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 56e78dafc4137f86abf6f5f07282afa39ead4056
Author: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Date: Mon Dec 20 01:06:04 2010 +0000
ARM: mach-shmobile: mackerel: Add GPS support
Signed-off-by: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 59bdd133561a432c4655146e283caf85fa64c2fb
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Tue Oct 19 17:06:49 2010 +0200
ARM: pxa: Add Balloon3 NAND ready check
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 1b9169d8a0fe2b41fbbb8d152c8108190865f3cf
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Tue Oct 19 16:19:32 2010 +0200
ARM: pxa: Update Balloon3 for new FPGA firmware
The new FPGA firmware in Balloon3 uses different methods to control it's bus
control lines. In the new version, there are separate registers to set/clear
bus control lines. This patch updates affected places.
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit e60f137b715b0a19b84502c23a09c5af9107399d
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Tue Oct 19 16:17:24 2010 +0200
ARM: pxa: Fix number of IRQs on Balloon3
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 03b505eae6a276b8c38b6222694afb6cea10b1cc
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 20 14:44:32 2010 +0000
ARM: SMP: split out software TLB maintainence broadcasting
smp.c is becoming too large, so split out the TLB maintainence
broadcasting into a separate smp_tlb.c file.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 10034aabca9032246762daaca3152f3e79380ea0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 20 14:28:02 2010 +0000
ARM: localtimer: clean up local timer on hot unplug
When a CPU is hot unplugged, the generic tick code cleans up the
clock event device, but fails to call down to the device's set_mode
function to actually shut the device down.
To work around this, we've historically had a local_timer_stop()
callback out of the hotplug code. However, this adds needless
complexity when we have the clock event device itself available.
Explicitly call the clock event device's set_mode function with
CLOCK_EVT_MODE_UNUSED, so that the hardware can be cleanly shutdown
without any special external callbacks. When/if the generic code
is fixed, percpu_timer_stop() can be killed off.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e3d9c625f5e4158014e041f492b46e38ad10987e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 19 11:36:33 2010 +0000
ARM: CPU hotplug: fix hard-coded control register constants
Use the definition we've provided in asm/system.h rather than
numeric constants.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e9882777d992b76e0b80deadd66ad886c25f5d1f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 19 11:33:12 2010 +0000
ARM: CPU hotplug: add Versatile Express hotplug CPU support
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d4450261e546953c4a1ce8b48e29164a57c6ed33
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 19 11:30:43 2010 +0000
ARM: CPU hotplug: fix reporting of spurious wakeups
The original scheme for reporting spurious wakeups was broken - it
tried to use printk() from a context which wasn't coherent with the
other CPUs, which risks corrupting the printk() data.
Fix this by noting the number spurious wakeups, and only report them
when we are properly woken - when we will be coherent with the rest
of the system.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 58613cd1d4f8c2d5f25b6c57ad7fbed80e75a67b
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 12:34:39 2010 +0000
ARM: smp: improve CPU bringup failure diagnostics
We used to print a bland error message which gave no clue as to the
failure when we failed to bring up a secondary CPU. Resolve this by
separating the two failure cases.
If boot_secondary() fails, we print a message indicating the returned
error code from boot_secondary():
"CPU%u: failed to boot: %d\n", cpu, ret.
However, if boot_secondary() succeeded, but the CPU did not appear to
mark itself online within the timeout, indicate that it failed to come
online:
"CPU%u: failed to come online\n", cpu
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 90b44199e83ec780d6def11a602d825dc68438e3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 10:59:49 2010 +0000
ARM: VFP: re-initialize VFP coprocessor access enables on CPU hotplug
We can not guarantee that VFP will be enabled when CPU hotplug brings
a CPU back online from a reset state. Add a hotplug CPU notifier to
ensure that the VFP coprocessor access is enabled whenever a CPU comes
back online.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 3705ff6da538aff6dba535e2e9cbcbb9456d0d53
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 10:53:12 2010 +0000
ARM: Fix subtle race in CPU pen_release hotplug code
There is a subtle race in the CPU hotplug code, where a CPU which has
been offlined can online itself before being requested, which results
in things going astray on the next online/offline cycle.
What happens in the normal online/offline/online cycle is:
CPU0 CPU3
requests boot of CPU3
pen_release = 3
flush cache line
checks pen_release, reads 3
starts boot
pen_release = -1
... requests CPU3 offline ...
... dies ...
checks pen_release, reads -1
requests boot of CPU3
pen_release = 3
flush cache line
checks pen_release, reads 3
starts boot
pen_release = -1
However, as the write of -1 of pen_release is not fully flushed back to
memory, and the checking of pen_release is done with caches disabled,
this allows CPU3 the opportunity to read the old value of pen_release:
CPU0 CPU3
requests boot of CPU3
pen_release = 3
flush cache line
checks pen_release, reads 3
starts boot
pen_release = -1
... requests CPU3 offline ...
... dies ...
checks pen_release, reads 3
starts boot
pen_release = -1
requests boot of CPU3
pen_release = 3
flush cache line
Fix this by grouping the write of pen_release along with its cache line
flushing code to ensure that any update to pen_release is always pushed
out to physical memory.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ed3768a8d9dc2d345d4f27eb44ee1e4825056c08
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Wed Dec 1 15:39:23 2010 +0100
ARM: 6516/1: Allow SMP_ON_UP to work with Thumb-2 kernels.
* __fixup_smp_on_up has been modified with support for the
THUMB2_KERNEL case. For THUMB2_KERNEL only, fixups are split
into halfwords in case of misalignment, since we can't rely on
unaligned accesses working before turning the MMU on.
No attempt is made to optimise the aligned case, since the
number of fixups is typically small, and it seems best to keep
the code as simple as possible.
* Add a rotate in the fixup_smp code in order to support
CPU_BIG_ENDIAN, as suggested by Nicolas Pitre.
* Add an assembly-time sanity-check to ALT_UP() to ensure that
the content really is the right size (4 bytes).
(No check is done for ALT_SMP(). Possibly, this could be fixed
by splitting the two uses ot ALT_SMP() (ALT_SMP...SMP_UP versus
ALT_SMP...SMP_UP_B) into two macros. In the first case,
ALT_SMP needs to expand to >= 4 bytes, not == 4.)
* smp_mpidr.h (which implements ALT_SMP()/ALT_UP() manually due
to macro limitations) has not been modified: the affected
instruction (mov) has no 16-bit encoding, so the correct
instruction size is satisfied in this case.
* A "mode" parameter has been added to smp_dmb:
smp_dmb arm @ assumes 4-byte instructions (for ARM code, e.g. kuser)
smp_dmb @ uses W() to ensure 4-byte instructions for ALT_SMP()
This avoids assembly failures due to use of W() inside smp_dmb,
when assembling pure-ARM code in the vectors page.
There might be a better way to achieve this.
* Kconfig: make SMP_ON_UP depend on
(!THUMB2_KERNEL || !BIG_ENDIAN) i.e., THUMB2_KERNEL is now
supported, but only if !BIG_ENDIAN (The fixup code for Thumb-2
currently assumes little-endian order.)
Tested using a single generic realview kernel on:
ARM RealView PB-A8 (CONFIG_THUMB2_KERNEL={n,y})
ARM RealView PBX-A9 (SMP)
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 86e62b93368cffca9111996e3ed9e5b7bf6f0af3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 30 18:24:57 2010 +0000
ARM: SMP: remove smp_mpidr.h
With "ARM: CPU hotplug: remove bug checks in platform_cpu_die()", we
now do not use hard_smp_processor_id(), we no longer need to read the
hardware processor ID. Remove the include providing this function.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit f36d340122ae8744e64af0a92a6f77b97542c0a4
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 30 12:21:30 2010 +0000
ARM: CPU hotplug: ensure correct ordering of unplug
Don't call idle_task_exit() with interrupts disabled, and ensure
that we have a memory barrier after interrupts are disabled but
before signalling that this CPU has shut down.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit bbc81fd4327f9ed4480b05981e38acd48b1d184a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 30 11:12:30 2010 +0000
ARM: CPU hotplug: remove bug checks in platform_cpu_die()
platform_cpu_die() is entered from the CPU's own idle thread, which
can not be migrated to other CPUs. Moreover, the 'cpu' argument
comes from the thread info, which will always be the 'current'
CPU. So remove this useless bug check.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 3c030beabf937b1d3b4ecaedfd1fb2f1e2aa0c70
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 30 11:07:35 2010 +0000
ARM: CPU hotplug: move cpu_killed completion to core code
We always need to wait for the dying CPU to reach a safe state before
taking it down, irrespective of the requirements of the platform.
Move the completion code into the ARM SMP hotplug code rather than
having each platform re-implement this.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 2c0136dba4e43b0916ccc9ecc7f11e6d6b73f046
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Dec 3 15:00:49 2010 +0000
ARM: SMP: consolidate trace_hardirqs_off() into common SMP code
All platforms call trace_hardirqs_off() in their secondary startup code,
so move this into the core SMP code - it doesn't need to be in the
per-platform code.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 05c74a6cbcfb416286a947668ba32f63d99fe74a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Dec 3 11:09:48 2010 +0000
ARM: SMP: consolidate the common parts of smp_prepare_cpus()
There is a certain amount of smp_prepare_cpus() which doesn't belong
in the platform support code - that is, code which is invariant to the
SMP implementation. Move this code into arch/arm/kernel/smp.c, and
add a platform_ prefix to the original function.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit aec66ba1f75c2030cf66f5a21d1c81aa83aa5d95
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Dec 2 19:10:01 2010 +0000
ARM: SMP: get rid of references to poke_milo and Milo
Milo is an old boot loader, which is no longer relevant for these
platforms. References to it are misleading. Move the code out
of poke_milo(), and remove references to milo in comments.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit fd778f0ad7dda1108281410ddca0d07936256d3c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Dec 2 18:09:37 2010 +0000
ARM: SMP: get rid of get_core_count()
We don't need this small function as well as scu_get_core_count()
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 8975b6c0fdd57e061f4d1040163778ceaf340ad8
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Dec 3 19:29:53 2010 +0000
ARM: SMP: Clean up ncores sanity checks
scu_get_core_count() never returns zero cores, so we don't need to
check and correct if ncores is zero.
Tegra was missing the check against NR_CPUS, leading to a potential
bitfield overflow if this becomes the case.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit bbc3d14e9aca023bb98e580aa1c9350af8effdb1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Dec 3 10:42:58 2010 +0000
ARM: SMP: move CPU number sanity checks to smp_init_cpus()
Ensure that the number of CPUs is sanity checked before setting
the number of possible CPUs. This avoids any chance of overflowing
the cpu_possible bitmap.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 28e18293cf0f8d23a0950d7b1d2212d11af494dc
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Dec 2 09:53:54 2010 +0000
ARM: SMP: ensure smp_send_stop() waits for CPUs to stop
Wait for CPUs to indicate that they've stopped, after sending the
stop IPI, rather than blindly continuing on and hoping that they've
stopped in time. Print a warning if we fail to stop the other CPUs.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 0eb0511d176534674600a1986c3c766756288908
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 22 12:06:28 2010 +0000
ARM: SMP: use more sane register allocation for __fixup_smp_on_up
Use r0,r3-r6 rather than r0,r3,r4,r6,r7, which makes it easier to
understand which registers can be modified. Also document which
registers hold values which must be preserved.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b54992fe1b4bad7b7488d58b8696e4e8974fdab0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 14:46:46 2010 +0000
ARM: SMP: collect IPI and local timer IRQs for /proc/stat
The IPI and local timer interrupts weren't being properly accounted
for in /proc/stat. Collect them from the irq_stat structure, and
return their sum.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4a88abd7b48e8ec8084b1252d0f5ebdab43c2508
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 14:40:29 2010 +0000
ARM: SMP: provide individual IPI interrupt statistics
This separates out the individual IPI interrupt counts from the
total IPI count, which allows better visibility of what IPIs are
being used for.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 3534cccd26afdfd3ce0915a4942afca185f2a39b
Author: Bjorn Forsman <bjorn.forsman@xxxxxxxxx>
Date: Wed Nov 3 00:46:04 2010 +0100
ARM: pxa/colibri: setup pins for USB host port 3
Tested on a Colibri Evaluation Board Rev.2.1 with a Colibri PXA310 module.
Signed-off-by: Bjorn Forsman <bjorn.forsman@xxxxxxxxx>
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
commit e97d0fac8492dd6566f71f9c81ed453c2105f459
Author: Mark F. Brown <mark.brown314@xxxxxxxxx>
Date: Mon Dec 13 22:56:59 2010 -0500
ARM: mmp: refactored 5V regulator support using fixed-regulator
Signed-off-by: Mark F. Brown <mark.brown314@xxxxxxxxx>
Reviewed-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit a8fb0b55314144a37755729d3b40b027b0020e3c
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Sat Dec 18 21:57:07 2010 +0800
ARM: mmp: correct the naming of GPIOxx_GPIO definitions
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 5fe2acce127638ccf1123e8a079ca12e8db5b7c1
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Mon Aug 9 06:13:06 2010 +0200
ARM: pxa: Add gpio-leds and vibrator support to PalmTC
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 4c6a832d2841a3bacc3327380dfc0660c22a71fb
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Mon Aug 9 05:01:45 2010 +0200
ARM: pxa: Modularize Palm Tungsten|C
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit fd62999bad9fc3b176ef6bc9d2a71be940efd908
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Wed Aug 11 05:04:53 2010 +0200
ARM: pxa: Colibri PXA320 PCMCIA driver
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit c085052bc52d7caaca1172aabbedc06777253961
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Mon Nov 29 22:56:00 2010 +0800
ARM: pxa: add clock for static memory controller
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit a3172e5413a06af772c6ad34c0f68a2ebbdbcf86
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Thu Aug 12 01:45:05 2010 +0200
ARM: pxa: Rename Colibri evalboard
Rename colibri-pxa270-evalboard to colibri-evalboard as this board is used with
all Colibri modules.
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 072e1ae73c65496355279505de378b33c916e364
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Thu Aug 12 01:30:39 2010 +0200
ARM: pxa: Add M41T00 RTC support into Colibri evalboard
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 9b6956f45132f9bf696e9f6c2e457bdfa8e08721
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Thu Aug 12 01:18:38 2010 +0200
ARM: pxa: Push Colibri evalboard MFP into module files
This change -- pushing the MFP configuration back into Module files -- is
necessary because some evalboards can be used with multiple modules, where MFP
differs from module to module. Therefore MFP isn't board-specific, but
module-specific and the module should preconfigure itself for the board.
(And there is also the C preprocesor limitation and conflicting #define-s)
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 960c0acaabf603e39b121ae5c0580aaca6f8aa7b
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Wed Aug 11 03:32:53 2010 +0200
ARM: pxa: Toradex Colibri PXA270 CF support
This driver also contains structures to eventually support PXA320. This is
planned to be added in a later patch.
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit a4257af5b0c5479bb81597579841e9daaeccd7f6
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Wed Nov 3 16:26:42 2010 +0100
ARM: pxa: Add pxa320 PCMCIA check
On PXA320, there's only one PCMCIA slot available. Check for cases where the
user would want to register multiple. Also, rework failpath.
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit ef6c84454f8567d4968c210d7d194fb711ed3739
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 24 11:54:25 2010 +0800
ARM: pxa: add iwmmx support for PJ4
iwmmxt is used in XScale, XScale3, Mohawk and PJ4 core. But the instructions
of accessing CP0 and CP1 is changed in PJ4. Append more files to support
iwmmxt in PJ4 core.
Signed-off-by: Zhou Zhu <zzhu3@xxxxxxxxxxx>
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit f13cd4170ee789f63b3c9585c1ae34e028bd549d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 14:33:51 2010 +0000
ARM: fix /proc/interrupts formatting
As per x86, align the initial column according to how many IRQs we
have. Also, provide an english explaination for the 'LOC:' and
'IPI:' lines.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cab8c6f3053c1b147bba825844c8e208f8b3b9f4
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 14:20:41 2010 +0000
ARM: SMP: move ipi_count into irq_stat structure
Move the ipi_count into irq_stat, which allows the ipi_data structure
to be entirely removed.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 46c48f222f568decb881a552caa1c8f9c96c521e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 14:15:03 2010 +0000
ARM: SMP: provide accessors for irq_stat data
Provide __inc_irq_stat() and __get_irq_stat() to increment and
read the irq stat counters.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ec405ea9fe5fdeb40824edba7082803b3e98f176
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 13:38:06 2010 +0000
ARM: include local timer irq stats only when local timers configured
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e3fbb087650df130788d8e3ac29875ee56819249
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 20 14:47:19 2010 +0000
ARM: SMP: remove send_ipi_message()
send_ipi_message() does nothing except call smp_cross_call(). As
this is a static function, nothing external to this file calls it,
so we can easily clean up this now unnecessary indirection.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6e5f6856427abe5418f535cb46c454ae8ea7f8e7
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Wed Aug 25 12:22:40 2010 +0200
checksyscalls: Fix stand-alone usage
The usage help in the comments
- refers to the wrong script name,
- doesn't mention that $srctree must be set.
Hence correct the script name, and derive the source tree path from the script
path, so we no longer need to rely on $srctree being set by the caller.
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 22f075a8d8bb5a8d203392df809739c1817e578f
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Dec 20 15:09:27 2010 +0100
input: mt: Document interface updates
This patch documents the recent input-mt interface changes.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 763eef8b5b64dbbfc0f6273af9a57024069785a9
Author: Vincent Guittot <vincent.guittot@xxxxxxxxxxxxxx>
Date: Fri Dec 3 18:18:39 2010 +0100
ux500: add debugfs support for powerdebug
Signed-off-by: Vincent Guittot <vincent.guittot@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit abda3a24a99998279fe890ea8a789ebe4d605d78
Author: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Date: Mon Dec 20 13:01:30 2010 +0100
mfd: Use dummy_irq_chip for tc3589x
This also converts tc3589x to the new irq API.
Cc: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit ee81e7a0a86a3b40837de4a5f514c2d3758af20e
Merge: 1ae1b5f053cf36bd0f913e83f3b136fec8152d4d 6d3e6d3640052cac958d61c44597cc216f6ee09f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 20 11:03:35 2010 +0000
Merge branch 'kmap_atomic_fixes' of git://git.linaro.org/people/nico/linux
commit 289569f902dc70fc42b8c7cab627f9d615a720f1
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Sat Dec 18 21:39:28 2010 +0800
ARM: mxs: Add interrupt support
Add Interrupt Collector (ICOLL) support for MXS-based.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 65d7d94405dcc1845ad2680eeb6af43ced74fdc4
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Sat Dec 18 21:39:27 2010 +0800
ARM: mxs: Add reset routines
- The mxs wdog is implemented in RTC block.
- There is a generic software reset routine for most modules on mxs.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 022c92befa539174125b0a1b5e52dd57affefe9f
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Fri Dec 17 20:43:04 2010 +0100
ALSA: HDA: Add auto-mute for Thinkpad SL410/SL510
BugLink: http://launchpad.net/bugs/580006
SKU turns off auto-mute for these machines, so ignore the SKU.
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit fcd3027abbbcc26248714eddae40af3fb3c8a82e
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Sat Dec 18 20:28:26 2010 +0100
Input: fix double equality sign in uevent
Looking at the uevent stream for input devices, all properties are on
the form "A=B" except the bitmap values, which are on the form
"A==B". This bug has been around at least since 2007, and the input
uevent code has been untouched since. The recent addition of device
properties suggests this is a good time for a remedy.
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 85b7720039fc000b561c20fe2aaa3b54cddae4a7
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Sat Dec 18 20:51:13 2010 +0100
Input: introduce device properties
Today, userspace sets up an input device based on the data it emits.
This is not always enough; a tablet and a touchscreen may emit exactly
the same data, for instance, but the former should be set up with a
pointer whereas the latter does not need to. Recently, a new type of
touchpad has emerged where the buttons are under the pad, which
changes logic without changing the emitted data. This patch introduces
a new ioctl, EVIOCGPROP, which enables user access to a set of device
properties useful during setup. The properties are given as a bitmap
in the same fashion as the event types, and are also made available
via sysfs, uevent and /proc/bus/input/devices.
Acked-by: Ping Cheng <pingc@xxxxxxxxx>
Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 4c306a9291a077879fc3e933326caac3bc319caa
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Sun Dec 19 21:59:35 2010 -0800
net: kill unused macros
These macros never be used, so remove them.
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ba27d85c96c57111ae8acfa959643e5ce8e4bcbe
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Wed Dec 15 04:03:29 2010 +0000
vxge: add missing flush of reset_task
Commit 6e07ebd84 (drivers/net: remove unnecessary
flush_scheduled_work() calls) incorrectly removed the flush call
without replacing it with the appropriate work specific operation.
Fix it by flushing vdev->reset_task explicitly.
Pointed out by Jon Mason.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jon Mason <jon.mason@xxxxxxxx>
Acked-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 71d9dec24dce548bf699815c976cf063ad9257e2
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Wed Dec 15 19:57:25 2010 +0000
net: increase skb->users instead of skb_clone()
In dev_queue_xmit_nit(), we have to clone skbs as we need to mangle skbs,
however, we don't need to clone skbs for all the packet_types.
Except for the first packet_type, we increase skb->users instead of
skb_clone().
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1a75972c61f2c224eb5283c183f9f6b17fb09b6b
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Dec 14 22:39:58 2010 +0000
ifb: use netif_receive_skb() instead of netif_rx()
In ri_tasklet(), we run from softirq, so can directly handle packet
through netif_receive_skb() instead of netif_rx().
There is no risk of recursion.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ad0081e43af6de3fecf308b0d098f9611835766b
Author: David Stevens <dlstevens@xxxxxxxxxx>
Date: Fri Dec 17 11:42:42 2010 +0000
ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.
This patch modifies IPsec6 to fragment IPv6 packets that are
locally generated as needed.
This version of the patch only fragments in tunnel mode, so that fragment
headers will not be obscured by ESP in transport mode.
Signed-off-by: David L Stevens <dlstevens@xxxxxxxxxx>
Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 68d3059665c4a57223f855eb02f9ab7ce5b3a593
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Mon Dec 20 10:54:48 2010 +1000
drm/radeon: use aperture size not vram size for overlap tests
This fixes a problem where the wrong card conflicts with vesafb in my
x2 system.
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 050c6c9b896625d9fa498265be17b82c5fc65257
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Sun Dec 19 23:24:27 2010 +0100
sched: Remove debugging check
Linus reported that the new warning introduced by commit f26f9aff6aaf
"Sched: fix skip_clock_update optimization" triggers. The need_resched
flag can be set by other CPUs asynchronously so this debug check is
bogus - remove it.
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
LKML-Reference: <AANLkTinJ8hAG1TpyC+CSYPR47p48+1=E7fiC45hMXT_1@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3c5728edbeb44819dba25a3c1b56702c87c9e419
Author: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
Date: Wed Dec 15 08:36:02 2010 +0100
ux500: platsmp: Fix section mismatch
Signed-off-by: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 556fb03869ad4d14e5336093a7a8565456a26c21
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Fri Dec 3 20:35:38 2010 +0530
mach-ux500: add STMPE1601 platform data
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
[Minor fixups to GPIO enumerators]
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit e43abe6f98641e40460d74a002f09c7751db48f9
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Fri Dec 3 20:35:36 2010 +0530
mach-ux500: move keymaps to new file
Move keylayouts to a dedicated file and plug these keylayouts
for input platform data. This will make addition of new and custom
keylayouts localized.
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 55ec86f848a5f872fd43f5d7206464a0af419110
Merge: 21228e455756be11fbbcae7e1a184ad9d842f687 147dd5610c8d1bacb88a6c1dfdaceaf257946ed0 d949750fed168b6553ca11ed19e4affd19d7a4d7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 19 10:44:54 2010 -0800
Merge branches 'x86-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-32: Make sure we can map all of lowmem if we need to
x86, vt-d: Handle previous faults after enabling fault handling
x86: Enable the intr-remap fault handling after local APIC setup
x86, vt-d: Fix the vt-d fault handling irq migration in the x2apic mode
x86, vt-d: Quirk for masking vtd spec errors to platform error handling logic
x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem()
bootmem: Add alloc_bootmem_align()
x86, gcc-4.6: Use gcc -m options when building vdso
x86: HPET: Chose a paranoid safe value for the ETIME check
x86: io_apic: Avoid unused variable warning when CONFIG_GENERIC_PENDING_IRQ=n
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix off by one in perf_swevent_init()
perf: Fix duplicate events with multiple-pmu vs software events
ftrace: Have recordmcount honor endianness in fn_ELF_R_INFO
scripts/tags.sh: Add magic for trace-events
tracing: Fix panic when lseek() called on "trace" opened for writing
commit 21228e455756be11fbbcae7e1a184ad9d842f687
Merge: 0a59228168d3722b71f8e3dbc623316fb4be78f4 8e92c20183ed0579d94501311b81c42b65cb2129
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 19 10:37:37 2010 -0800
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix the irqtime code for 32bit
sched: Fix the irqtime code to deal with u64 wraps
nohz: Fix get_next_timer_interrupt() vs cpu hotplug
Sched: fix skip_clock_update optimization
sched: Cure more NO_HZ load average woes
commit 593e9d70fb0f1ece1cf2a61c701dec35d8e41f8d
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:18 2010 +0530
mfd/tc3589x: add suspend/resume support
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 523bc3820f023169671e9726b8dc075669d14bec
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:17 2010 +0530
mfd/tc3589x: undo gpio module reset during chip init
Skip putting the GPIO module into a reset during the chip init. This makes
sure to preserve any existing GPIO configurations done by pre-kernel boot code.
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit bd77efd0cea80865d4cfcc1e4b62789c51a74b2d
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:16 2010 +0530
mfd/tc3589x: fix random interrupt misses
On the TC35892, a random delayed interrupt clear (GPIO IC) write locks up the
child interrupts. In such a case, the original interrupt is active and not yet
acknowledged. Re-check the IRQST bit for any pending interrupts and handle
those.
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 611b7590afa6e6c6b0942b1d3efef17fbb348ef5
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:15 2010 +0530
mfd/tc3589x: add block identifier for multiple child devices
Add block identifier to be able to add multiple mfd clients
to the mfd core
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 20406ebff4a298e6e3abbc1717a90bb3e55dc820
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:14 2010 +0530
mfd/tc3589x: rename tc35892 structs/registers to tc359x
Most of the register layout, client IRQ numbers on the TC35892 is shared also
by other variants. Make this generic as tc3589x
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit f4e8afdc7ab1b5a0962be02a9dd15d29a81f4c53
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:13 2010 +0530
mfd/tc35892: rename tc35892 core driver to tc3589x
Rename the tc35892 core/gpio drivers to tc3589x to include
new variants in the same mfd core
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit c6eda6c5eeb357ff231121619fb49d2bc0605faf
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:12 2010 +0530
mfd/tc35892: rename tc35892 header to tc3589x
Rename the header file to include further variants within
the same mfd core driver
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit d5d228158e77998a1659c1783fb204f275fab93b
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Mon Dec 13 09:33:11 2010 +0530
mach-ux500: deprecate spi support for ab8500
Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 6d3e6d3640052cac958d61c44597cc216f6ee09f
Author: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Date: Thu Dec 16 14:56:34 2010 -0500
ARM: fix cache-feroceon-l2 after stack based kmap_atomic()
Since commit 3e4d3af501 "mm: stack based kmap_atomic()", it is actively
wrong to rely on fixed kmap type indices (namely KM_L2_CACHE) as
kmap_atomic() totally ignores them and a concurrent instance of it may
happily reuse any slot for any purpose. Because kmap_atomic() is now
able to deal with reentrancy, we can get rid of the ad hoc mapping here.
While the code is made much simpler, there is a needless cache flush
introduced by the usage of __kunmap_atomic(). It is not clear if the
performance difference to remove that is worth the cost in code
maintenance (I don't think there are that many highmem users on that
platform anyway) but that should be reconsidered when/if someone cares
enough to do some measurements.
Signed-off-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
commit 25cbe45440ea89a3b0f6f7ed326d3d476d53068b
Author: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Date: Wed Dec 15 23:29:04 2010 -0500
ARM: fix cache-xsc3l2 after stack based kmap_atomic()
Since commit 3e4d3af501 "mm: stack based kmap_atomic()", it is actively
wrong to rely on fixed kmap type indices (namely KM_L2_CACHE) as
kmap_atomic() totally ignores them and a concurrent instance of it may
happily reuse any slot for any purpose. Because kmap_atomic() is now
able to deal with reentrancy, we can get rid of the ad hoc mapping here,
and we even don't have to disable IRQs anymore (highmem case).
While the code is made much simpler, there is a needless cache flush
introduced by the usage of __kunmap_atomic(). It is not clear if the
performance difference to remove that is worth the cost in code
maintenance (I don't think there are that many highmem users on that
platform if at all anyway).
Signed-off-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
commit 39af22a79232373764904576f31572f1db76af10
Author: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Date: Wed Dec 15 15:14:45 2010 -0500
ARM: get rid of kmap_high_l1_vipt()
Since commit 3e4d3af501 "mm: stack based kmap_atomic()", it is no longer
necessary to carry an ad hoc version of kmap_atomic() added in commit
7e5a69e83b "ARM: 6007/1: fix highmem with VIPT cache and DMA" to cope
with reentrancy.
In fact, it is now actively wrong to rely on fixed kmap type indices
(namely KM_L1_CACHE) as kmap_atomic() totally ignores them now and a
concurrent instance of it may reuse any slot for any purpose.
Signed-off-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
commit 991a86e182203913b71607f0695955d7e23075d7
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Fri Dec 10 09:35:53 2010 +0100
ARM: 6530/1: mmci: partially revert clock divisor code
I misread the datasheet as if bypass mode was not available at all
on the ux500's, I was wrong. It is there, the datasheet just
states that you should not have to use it.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b70a67f938e4a7544ca4dea2856b88f3c47669ff
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Mon Dec 6 09:24:14 2010 +0100
ARM: 6526/1: mmci: corrected calculation of clock div for ux500
The Ux500 variant of this block has a different divider.
The value used right now is too big and which means a loss
in performance. This fix corrects it. Also expand the math
comments a bit so it's clear what's happening. Further
the Ux500 variant does not like if we use the BYPASS bit,
instead we are supposed to set the clock divider to zero.
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 132b16325fae0742a02075894af16197e83febe8
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 13:14:55 2010 +0000
ARM: AT91: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 40cc52440073903f3b7477a3391c4ca0761445d0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 19 15:43:34 2010 +0000
ARM: clockevents: fix IOP clock events initialization
Ensure that no interrupt is pending before registering the clock
event device, and properly initialize the periodic tick in the
->set_mode callback.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 19e5eebb8eaa5ca3ff8aa18cb57ccb7a9f67277d
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Wed Dec 15 19:10:18 2010 -0800
sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight
Mike Galbraith reported poor interactivity[*] when the new shares distribution
code was combined with autogroups.
The root cause turns out to be a mis-ordering of accounting accrued execution
time and shares updates. Since update_curr() is issued hierarchically,
updating the parent entity weights to reflect child enqueue/dequeue results in
the parent's unaccounted execution time then being accrued (vs vruntime) at the
new weight as opposed to the weight present at accumulation.
While this doesn't have much effect on processes with timeslices that cross a
tick, it is particularly problematic for an interactive process (e.g. Xorg)
which incurs many (tiny) timeslices. In this scenario almost all updates are
at dequeue which can result in significant fairness perturbation (especially if
it is the only thread, resulting in potential {tg->shares, MIN_SHARES}
transitions).
Correct this by ensuring unaccounted time is accumulated prior to manipulating
an entity's weight.
[*] http://xkcd.com/619/ is perversely Nostradamian here.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <20101216031038.159704378@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 43365bd7ff37979d2afdccbe953299ed64a4649b
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Wed Dec 15 19:10:17 2010 -0800
sched: Move periodic share updates to entity_tick()
Long running entities that do not block (dequeue) require periodic updates to
maintain accurate share values. (Note: group entities with several threads are
quite likely to be non-blocking in many circumstances).
By virtue of being long-running however, we will see entity ticks (otherwise
the required update occurs in dequeue/put and we are done). Thus we can move
the detection (and associated work) for these updates into the periodic path.
This restores the 'atomicity' of update_curr() with respect to accounting.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101216031038.067028969@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ca680888d5d0d03862ec311a83c6a1c7a1e00a01
Merge: 40dc11ffb35e8c4e8fa71092048e0f8de9db758c b0c3844d8af6b9f3f18f31e1b0502fbefa2166be
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Sun Dec 19 16:35:08 2010 +0100
Merge commit 'v2.6.37-rc6' into sched/core
Merge reason: Update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c16714704bb35165e5b85d927873dcc643772648
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 22:22:33 2010 +0100
firewire: net: set carrier state at ifup
At ifup, carrier status would be shown on even if it actually was off.
Also add an include for ethtool_ops rather than to rely on the one from
netdevice.h.
Note, we can alas not use fwnet_device_mutex to serialize access to
dev->peer_count (as I originally wanted). This would cause a lock
inversion:
- fwnet_probe | takes fwnet_device_mutex
+ register_netdev | takes rtnl_mutex
- devinet_ioctl | takes rtnl_mutex
+ fwnet_open | ...must not take fwnet_device_mutex
Hence use the dev->lock spinlock for serialization.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 18bb36f9fab5980efeff063755c037a622f0231c
Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Date: Wed Dec 8 04:22:57 2010 +0200
firewire: net: add carrier detection
To make userland, e.g. NetworkManager work with firewire, we need to
detect whether cable is plugged or not. Simple and correct way of doing
that is just counting number of peers. No peers - no link and vice
versa.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit da169f5df2764a6a937cb3b07562e269edfb1c0e
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Fri Sep 24 15:54:43 2010 +0200
oprofile, x86: Add support for 6 counters (AMD family 15h)
This patch adds support for up to 6 hardware counters for AMD family
15h cpus. There is a new MSR range for hardware counters beginning at
MSRC001_0200 Performance Event Select (PERF_CTL0).
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
commit 30570bced107243d5227527dd5317b22883dcf0c
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Tue Aug 31 10:44:38 2010 +0200
oprofile, x86: Add support for AMD family 15h
This patch adds support for AMD family 15h (Interlagos/Valencia/
Zambezi) cpus.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
commit d03a5d888fb688c832d470b749acc5ed38e0bc1d
Author: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 19 12:54:22 2010 +0900
MAINTAINERS: Add tomoyo-dev-en ML.
MAINTAINERS: Add tomoyo-dev-en ML.
Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit d1ed113f1669390da9898da3beddcc058d938587
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Thu Dec 16 17:42:54 2010 +0000
ipv6: remove duplicate neigh_ifdown
When device is being set to down, neigh_ifdown was being called
twice. Once from addrconf notifier and once from ndisc notifier.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bc3ef6605ea325e41b586a76aadc3f731c317504
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Thu Dec 16 17:42:40 2010 +0000
ipv6: fib6_ifdown cleanup
Remove (unnecessary) casts to make code cleaner.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0a59228168d3722b71f8e3dbc623316fb4be78f4
Merge: 2ba16c4f456eb63f54b1d8b065377d41a1cd6a14 81711cee933599fa114abb0d258d8bbabef8adfb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 18 10:28:54 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: handle rt_sigreturn() more cleanly
arch/tile: handle CLONE_SETTLS in copy_thread(), not user space
commit 2ba16c4f456eb63f54b1d8b065377d41a1cd6a14
Merge: 46bdfe6a50b88942f5323f837a3afd93a1c86e60 081d835fa4ce70ad1e42ac76de850a49e23a1557
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 18 10:23:29 2010 -0800
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Fix build errors in sc-mips.c
commit 46bdfe6a50b88942f5323f837a3afd93a1c86e60
Merge: c15524a40a1603dc56a8691c4f50172fb86c23d8 a2c606d53ab71dee6410f10ef0adf67321d60e06
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 18 10:13:24 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86: avoid high BIOS area when allocating address space
x86: avoid E820 regions when allocating address space
x86: avoid low BIOS area when allocating address space
resources: add arch hook for preventing allocation in reserved areas
Revert "resources: support allocating space within a region from the top down"
Revert "PCI: allocate bus resources from the top down"
Revert "x86/PCI: allocate space from the end of a region, not the beginning"
Revert "x86: allocate space within a region top-down"
Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive decode"
PCI: Update MCP55 quirk to not affect non HyperTransport variants
commit b89cd71a159b5edca4c429687e4af01708eb1b26
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Fri Nov 19 23:01:06 2010 +0530
omap4: l2x0: Enable early BRESP bit
The AXI protocol specifies that the write response can only
be sent back to an AXI master when the last write data has been
accepted. This optimization enables the PL310 to send the write
response of certain write transactions as soon as the store buffer
accepts the write address. This behavior is not compatible with
the AXI protocol and is disabled by default. You enable this
optimization by setting the Early BRESP Enable bit in the
Auxiliary Control Register (bit [30]).
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Mans Rullgard <mans@xxxxxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit b0f20ff9d7e347c284ea7718597c978a2969ad7b
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Fri Nov 19 23:01:05 2010 +0530
omap4: l2x0: Set share override bit
Clearing bit 22 in the PL310 Auxiliary Control register (shared
attribute override enable) has the side effect of transforming Normal
Shared Non-cacheable reads into Cacheable no-allocate reads.
Coherent DMA buffers in Linux always have a Cacheable alias via the
kernel linear mapping and the processor can speculatively load cache
lines into the PL310 controller. With bit 22 cleared, Non-cacheable
reads would unexpectedly hit such cache lines leading to buffer
corruption
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 11e0264046e00544eb044fafc27125babd105e41
Author: Mans Rullgard <mans@xxxxxxxxx>
Date: Fri Nov 19 23:01:04 2010 +0530
omap4: l2x0: enable instruction and data prefetching
Enabling L2 prefetching improves performance as shown on Panda
ES2.1 board with mem test, and it has measurable impact on
performances. I think we should consider it, even though it damages
"writes" a bit. (rebased to k.org)
Usually the prefetch is used at both levels together L1 + L2, however,
to enable the CP15 prefetch engines, these are under security, and on
GP devices, we cannot enable it(e.g. on PandaBoard). However, just
enabling PL310 prefetch seems to provide performance improvement,
as shown in the data below (from Ubuntu) and would be a great thing
to pull in.
What prefetch does is enable automatic next line prefetching. With this
enabled, whenever the PL310 receives a cachable read request, it
automatically prefetches the following cache line as well.
Measurement Data:
==
STOCK 10.10 WITHOUT PATCH
========================
~# ./memspeed
size 8388608 8192k 8M
offset 8388608, 0
buffers 0x2aaad000 0x2b2ad000
copy libc 133 MB/s
copy Android v5 273 MB/s
copy Android NEON 235 MB/s
copy INT32 116 MB/s
copy ASM ARM 187 MB/s
copy ASM VLDM 64 204 MB/s
copy ASM VLDM 128 173 MB/s
copy ASM VLD1 216 MB/s
read ASM ARM 286 MB/s
read ASM VLDM 242 MB/s
read ASM VLD1 286 MB/s
write libc 1947 MB/s
write ASM ARM 1943 MB/s
write ASM VSTM 1942 MB/s
write ASM VST1 1935 MB/s
10.10 + PATCH
=============
~# ./memspeed
size 8388608 8192k 8M
offset 8388608, 0
buffers 0x2ab17000 0x2b317000
copy libc 129 MB/s
copy Android v5 256 MB/s
copy Android NEON 356 MB/s
copy INT32 127 MB/s
copy ASM ARM 321 MB/s
copy ASM VLDM 64 337 MB/s
copy ASM VLDM 128 321 MB/s
copy ASM VLD1 350 MB/s
read ASM ARM 496 MB/s
read ASM VLDM 470 MB/s
read ASM VLD1 488 MB/s
write libc 1701 MB/s
write ASM ARM 1682 MB/s
write ASM VSTM 1693 MB/s
write ASM VST1 1681 MB/s
Signed-off-by: Mans Rullgard <mans@xxxxxxxxx>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 1773e60a816b28f4084810f96e9195aaaa7fb8c3
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Fri Nov 19 23:01:03 2010 +0530
omap4: l2x0: Construct the AUXCTRL value using defines
This patch removes the hardcoded value of auxctrl value and
construct it using bitfields
Bit 25 is reserved and is always set to 1. Same value
of this bit is retained in this patch
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Nishanth Menon <nm@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 0aaa6f8f1da195ae1a993d3e9c80d600480cf947
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Fri Nov 19 23:01:02 2010 +0530
ARM: l2x0: Add aux control register bitfields
This patch adds the PL310 Auxiliary Control Register bitfields
so that SOC's can use these bit fields to construct the AUXCTRL
value to be passed/programmed instead of hardcoding it.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7c83912062c801738d7d19acaf8f7fec25ea663c
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Tue Dec 14 10:28:46 2010 -0600
vmstat: User per cpu atomics to avoid interrupt disable / enable
Currently the operations to increment vm counters must disable interrupts
in order to not mess up their housekeeping of counters.
So use this_cpu_cmpxchg() to avoid the overhead. Since we can no longer
count on preremption being disabled we still have some minor issues.
The fetching of the counter thresholds is racy.
A threshold from another cpu may be applied if we happen to be
rescheduled on another cpu. However, the following vmstat operation
will then bring the counter again under the threshold limit.
The operations for __xxx_zone_state are not changed since the caller
has taken care of the synchronization needs (and therefore the cycle
count is even less than the optimized version for the irq disable case
provided here).
The optimization using this_cpu_cmpxchg will only be used if the arch
supports efficient this_cpu_ops (must have CONFIG_CMPXCHG_LOCAL set!)
The use of this_cpu_cmpxchg reduces the cycle count for the counter
operations by %80 (inc_zone_page_state goes from 170 cycles to 32).
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
commit 20b876918c065818b3574a426d418f68b4f8ad19
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Tue Dec 14 10:28:45 2010 -0600
irq_work: Use per cpu atomics instead of regular atomics
The irq work queue is a per cpu object and it is sufficient for
synchronization if per cpu atomics are used. Doing so simplifies
the code and reduces the overhead of the code.
Before:
christoph@xxxxxxxxx$ size kernel/irq_work.o
text data bss dec hex filename
451 8 1 460 1cc kernel/irq_work.o
After:
christoph@xxxxxxxxx$ size kernel/irq_work.o
text data bss dec hex filename
438 8 1 447 1bf kernel/irq_work.o
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
commit 05c2d088d0eb904e50460b04d77324c26cef4637
Merge: 3ea9f6833c8f865a221b59ce37d7650dcf3b3e17 8270137a0d50507a5b40f880db636527045b8466
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sat Dec 18 15:54:36 2010 +0100
Merge branch 'this_cpu_ops' into for-2.6.38
commit 8270137a0d50507a5b40f880db636527045b8466
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Tue Dec 14 10:28:47 2010 -0600
cpuops: Use cmpxchg for xchg to avoid lock semantics
Use cmpxchg instead of xchg to realize this_cpu_xchg.
xchg will cause LOCK overhead since LOCK is always implied but cmpxchg
will not.
Baselines:
xchg() = 18 cycles (no segment prefix, LOCK semantics)
__this_cpu_xchg = 1 cycle
(simulated using this_cpu_read/write, two prefixes. Looks like the
cpu can use loop optimization to get rid of most of the overhead)
Cycles before:
this_cpu_xchg = 37 cycles (segment prefix and LOCK (implied by xchg))
After:
this_cpu_xchg = 11 cycle (using cmpxchg without lock semantics)
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 7296e08abac0a22a2534a4f6e493c764f2c77583
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Tue Dec 14 10:28:44 2010 -0600
x86: this_cpu_cmpxchg and this_cpu_xchg operations
Provide support as far as the hardware capabilities of the x86 cpus
allow.
Define CONFIG_CMPXCHG_LOCAL in Kconfig.cpu to allow core code to test for
fast cpuops implementations.
V1->V2:
- Take out the definition for this_cpu_cmpxchg_8 and move it into
a separate patch.
tj: - Reordered ops to better follow this_cpu_* organization.
- Renamed macro temp variables similar to their existing
neighbours.
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 2b7124428561c7c3cfa4a58cc4c6feea53f3148e
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Sat Dec 18 15:54:04 2010 +0100
percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
Generic code to provide new per cpu atomic features
this_cpu_cmpxchg
this_cpu_xchg
Fallback occurs to functions using interrupts disable/enable
to ensure correct per cpu atomicity.
Fallback to regular cmpxchg and xchg is not possible since per cpu atomic
semantics include the guarantee that the current cpus per cpu data is
accessed atomically. Use of regular cmpxchg and xchg requires the
determination of the address of the per cpu data before regular cmpxchg
or xchg which therefore cannot be atomically included in an xchg or
cmpxchg without segment override.
tj: - Relocated new ops to conform better to the general organization.
- This patch contains a trivial comment fix.
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 9326845f45650f6af9953a4b6a31e89b54fab82f
Merge: 2f841ed13b9f10037e25ddf417d01700ecd886d0 5af244fdf2a2405b2181da2a32636f3ca5ef162e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 14:28:31 2010 +0000
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
commit 2f841ed13b9f10037e25ddf417d01700ecd886d0
Merge: 961ec6daa7b14f376c30d447a830fa4783a2112c 8fbf397c3389c1dedfa9ee412715046ab28fd82d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 14:27:55 2010 +0000
Merge branch 'hw-breakpoint' of git://repo.or.cz/linux-2.6/linux-wd into devel-stable
commit 1ae1b5f053cf36bd0f913e83f3b136fec8152d4d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 18 13:57:00 2010 +0000
ARM: smp: avoid incrementing mm_users on CPU startup
We should not be incrementing mm_users when we startup a secondary
CPU - doing so results in mm_users incrementing by one each time we
hotplug a CPU, which will eventually wrap, and will cause problems.
Other architectures such as x86 do not increment mm_users, but only
mm_count, so we follow that pattern.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit a79a9ad94acdbd0106491f5a444167636562460f
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 24 11:54:22 2010 +0800
ARM: pxa: sanitize IRQ registers access based on offset
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
commit 3f408fa071418183742110f7314d6b596916e31e
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 24 11:54:21 2010 +0800
ARM: mmp: select CPU_PJ4
Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2
configuration.
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit c9b5ef47dc9d154a79f320eeaddc4bc9684ae1ea
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 24 11:54:20 2010 +0800
ARM: pxa: support saarb platform
Saarb platform is a handheld platform that supports Marvell PXA955 silicon.
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit a4553358d94b4a1f3e6f24aacfd076022ac14855
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 24 11:54:19 2010 +0800
ARM: pxa: support pxa95x
The core of PXA955 is PJ4. Add new PJ4 support. And add new macro
CONFIG_PXA95x.
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit aae8224ddd72e045bb92eaf6b73b89282c771c69
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Tue Nov 23 17:07:48 2010 +0800
ARM: pxa: introduce pxa3xx_clock_sysclass for clock suspend/resume
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 4dd295a73e80b55c3fec25555bf0a5d253023740
Author: Andy Ross <andy@xxxxxxxxxxxxx>
Date: Thu Dec 16 15:53:19 2010 -0800
hid: egalax: Add support for Wetab (726b)
This patch adds support for another Wetab device (726b), and grabs it
accordingly in hid-core.
[rydberg@xxxxxxxxxxx: rename and log message changes]
Signed-off-by: Andy Ross <andy@xxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit c7d3e9e801d72e86eb8a0f311453192a84f14412
Merge: 28257f7fdee0facc3b7f934e82c2485f27120d41 1cd25df4e53b9507f7abbb8aff8ce2ba644a1468
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 17 19:19:50 2010 -0800
Merge branch 'for_2.6.38' of git://gitorious.org/iommu_mailbox/iommu_mailbox into devel-iommu-mailbox
commit 6bc56aaecce78113500b150f1f1506029145a370
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Fri Dec 3 17:26:56 2010 +0000
omap: remove dead wdt code in plat-omap/devices.c
Commit f2ce62312650 (OMAP: WDT: Split OMAP1 and OMAP2PLUS device
registration) removed omap_init_wdt and related structures from
plat-omap/devices.c. However a subsequent commit or merge
seems to have reintroduced these by accident. The caller of
omap_init_wdt was also removed by that commit, and this did
not get restored. So we have the following build warning now:
CC arch/arm/plat-omap/devices.o
arch/arm/plat-omap/devices.c:252: warning: 'omap_init_wdt' defined but not used
Fix this by removing this dead code.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit fe297dde5ae8f8bf67d3a87759289a99b48ecb2c
Author: John Rigby <john.rigby@xxxxxxxxxx>
Date: Wed Dec 1 05:57:51 2010 +0000
OMAP4: enable smc instruction in new assembler versions
New assemblers need -march=armv7-a+sec on command line or
.arch_extension sec inline to enable use of the smc instruction.
This patch uses as-instr to check the latter to conditionally
enable the former in AFLAGS for files that use smc.
Checked on both old and new binutils to verify that it does
not break old versions.
Signed-off-by: John Rigby <john.rigby@xxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 1a6b59232bbaf612265e364c9e06ba1d15bbe7e0
Author: Bryan Wu <bryan.wu@xxxxxxxxxxxxx>
Date: Wed Dec 8 02:41:25 2010 +0000
omap: kill all section mismatch warning for omap2plus_defconfig
This patch will kill following section mismatch warnings:
WARNING: vmlinux.o(.text+0x24a00): Section mismatch in reference from the function zoom_twl_gpio_setup() to the (unknown reference) .init.data:(unknown)
The function zoom_twl_gpio_setup() references
the (unknown reference) __initdata (unknown).
This is often because zoom_twl_gpio_setup lacks a __initdata
annotation or the annotation of (unknown) is wrong.
WARNING: vmlinux.o(.text+0x24bfc): Section mismatch in reference from the function cm_t35_twl_gpio_setup() to the (unknown reference) .init.data:(unknown)
The function cm_t35_twl_gpio_setup() references
the (unknown reference) __initdata (unknown).
This is often because cm_t35_twl_gpio_setup lacks a __initdata
annotation or the annotation of (unknown) is wrong.
WARNING: vmlinux.o(.data+0x1d3e0): Section mismatch in reference from the variable h4_config to the (unknown reference) .init.data:(unknown)
The variable h4_config references
the (unknown reference) __initdata (unknown)
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
WARNING: vmlinux.o(.data+0x1dc08): Section mismatch in reference from the variable sdp2430_config to the (unknown reference) .init.data:(unknown)
The variable sdp2430_config references
the (unknown reference) __initdata (unknown)
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
WARNING: vmlinux.o(.data+0x1e1d8): Section mismatch in reference from the variable apollon_config to the (unknown reference) .init.data:(unknown)
The variable apollon_config references
the (unknown reference) __initdata (unknown)
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
Signed-off-by: Bryan Wu <bryan.wu@xxxxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7c50152f0851e44ef7491546a29fddbbea47735b
Author: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Date: Wed Nov 24 10:04:50 2010 +0000
omap: boards w/ wl12xx should select REGULATOR_FIXED_VOLTAGE
Power to the wl12xx wlan device is controlled by a fixed regulator.
Boards that have the wl12xx should select REGULATOR_FIXED_VOLTAGE so
users will not be baffled.
Signed-off-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 447b8da5d78ac8f2815a7824c0eb4ad66ba3e11e
Author: Jean Pihet <jean.pihet@xxxxxxxxxxxxxx>
Date: Wed Nov 17 17:52:11 2010 +0000
OMAP3: add comments for erratas i540 and i478 workarounds
Add comments and IDs for the following erratas:
- i540: MPU cannot exit from Standby,
- i478: Unexpected Cold-Reset is generated when device is coming
back from OFF mode
Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit fea83f6a9b0a90fefca16ac3534e308f6c34144b
Merge: df127ee375af4cb40b979605e0c336fc79bd38e7 2d200665c37f544f648d77a05a06ab63328f0d3a
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 17 15:14:02 2010 -0800
Merge branch 'devel-board' into omap-for-linus
commit 2d200665c37f544f648d77a05a06ab63328f0d3a
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:47 2010 -0800
arm: omap: add minimal support for RM-680
Add minimal support for Nokia RM-680 board.
Tested with omap2plus_defconfig.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
[tony@xxxxxxxxxxx: updated to remove omap_gpio_init
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 20dbeb1081327aefaac7044d9908c97bf445858c
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:46 2010 -0800
arm: omap: sdram-nokia: add 97.6/195.2 MHz timing data
Introduce 97.6/195.2 MHz memory timing data. Based on patches by Eduardo
Valentin, Igor Dmitriev and Juha Keski-Saari.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Cc: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
Cc: Igor Dmitriev <ext-dmitriev.igor@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 15d24e118d51601a5cc2f021005aa7354b03b1c8
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:46 2010 -0800
arm: omap: sdram-nokia: delete redundant timing data
41.5 MHz SDRAM clock is not usable.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 2b1af87ace4776f0d0c3513923a79529fc1b5a00
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:46 2010 -0800
arm: omap: sdram-nokia: improve error handling
Actually check for errors: print an error log and return NULL.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit e5f5b5422d064b7a393e39332da31af68e975f91
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:45 2010 -0800
arm: omap: sdram-nokia: use array to list timings
Use an array to make it easier to add new values.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit fbd208e9772005c193459d1a0575c0787ad52f69
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:45 2010 -0800
arm: omap: sdram-nokia: prepare for new memory timings
Rename the current timings to indicate they're for 166 MHz. Based on
patches by Eduardo Valentin and Juha Keski-Saari.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Cc: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit fcd8d84633902fd1717d80f36a38b8a4305ca3d4
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:44 2010 -0800
arm: omap: add sdram-nokia.h
Add a header file for Nokia SDRAM functions. Based on patches by Juha
Keski-Saari.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 6c3bc4eb5608665b7330b3d2044fca976cbd1a50
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Fri Dec 17 15:13:44 2010 -0800
arm: omap: rename board-rx51-sdram.c to sdram-nokia.c
Rename the file and functions so that it can be reused by future Nokia
boards. Based on patches by Juha Keski-Saari.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7f8595bfacef279f06c82ec98d420ef54f2537e0
Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 19:20:41 2010 -0800
x86, kexec: Limit the crashkernel address appropriately
Keep the crash kernel address below 512 MiB for 32 bits and 896 MiB
for 64 bits. For 32 bits, this retains compatibility with earlier
kernel releases, and makes it work even if the vmalloc= setting is
adjusted.
For 64 bits, we should be able to increase this substantially once a
hard-coded limit in kexec-tools is fixed.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <20101217195035.GE14502@xxxxxxxxxx>
commit 81711cee933599fa114abb0d258d8bbabef8adfb
Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Date: Tue Dec 14 16:07:25 2010 -0500
arch/tile: handle rt_sigreturn() more cleanly
The current tile rt_sigreturn() syscall pattern uses the common idiom
of loading up pt_regs with all the saved registers from the time of
the signal, then anticipating the fact that we will clobber the ABI
"return value" register (r0) as we return from the syscall by setting
the rt_sigreturn return value to whatever random value was in the pt_regs
for r0.
However, this breaks in our 64-bit kernel when running "compat" tasks,
since we always sign-extend the "return value" register to properly
handle returned pointers that are in the upper 2GB of the 32-bit compat
address space. Doing this to the sigreturn path then causes occasional
random corruption of the 64-bit r0 register.
Instead, we stop doing the crazy "load the return-value register"
hack in sigreturn. We already have some sigreturn-specific assembly
code that we use to pass the pt_regs pointer to C code. We extend that
code to also set the link register to point to a spot a few instructions
after the usual syscall return address so we don't clobber the saved r0.
Now it no longer matters what the rt_sigreturn syscall returns, and the
pt_regs structure can be cleanly and completely reloaded.
Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>
commit bc4cf2bb271b2d557fc510426755da786fc985be
Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Date: Tue Dec 14 15:57:49 2010 -0500
arch/tile: handle CLONE_SETTLS in copy_thread(), not user space
Previously we were just setting up the "tp" register in the
new task as started by clone() in libc. However, this is not
quite right, since in principle a signal might be delivered to
the new task before it had its TLS set up. (Of course, this race
window still exists for resetting the libc getpid() cached value
in the new task, in principle. But in any case, we are now doing
this exactly the way all other architectures do it.)
This change is important for 2.6.37 since the tile glibc we will
be submitting upstream will not set TLS in user space any more,
so it will only work on a kernel that has this fix. It should
also be taken for 2.6.36.x in the stable tree if possible.
Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
commit b581a7f9c3abc6c7afacd021747543d32ff17adb
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 17 22:34:01 2010 +0100
ACPI: Execute _PRW for devices reported as inactive or not present
If a device is reported as inactive or not present by its _STA
control method, acpi_bus_check_add() skips it without evaluating its
_PRW method. This leads to a problem when the device's _PRW method
points to a GPE, because in that case the GPE may be enabled by
ACPICA during the subsequent acpi_update_gpes() call which, in
turn, may cause a GPE storm to appear.
To avoid this issue, make acpi_bus_check_add() evaluate _PRW for
inactive or not present devices and register the wakeup GPE
information returned by them, so that acpi_update_gpes() does not
enable their GPEs unnecessarily.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Reported-by: Matthew Garrett <mjg@xxxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 0e4d413af1a9ddd12f82617734eb535007e186a8
Author: Jean-Francois Moine <moinejf@xxxxxxx>
Date: Tue Dec 14 16:17:40 2010 -0300
[media] gspca - sonixj: Better handling of the bridge registers 0x01 and 0x17
The initial values of the registers 0x01 and 0x17 are taken from the sensor
table at capture start and updated according to the flag PDN_INV.
Their values are updated at each step of the capture initialization and
memorized for reuse in capture stop.
This patch also fixed automatically some bad hardcoded values of these
registers.
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4fd350ee2bf129acb933ad5104bc4754b2c7c9ef
Author: Jean-Francois Moine <moinejf@xxxxxxx>
Date: Tue Dec 14 16:16:58 2010 -0300
[media] gspca - sonixj: Add the bit definitions of the bridge reg 0x01 and 0x17
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit b2272a49e7df37732d73988f00468ce31e1ebc92
Author: Jean-Francois Moine <moinejf@xxxxxxx>
Date: Tue Dec 14 16:16:16 2010 -0300
[media] gspca - sonixj: Set the flag for some devices
The flag PDN_INV indicates that the sensor pin S_PWR_DN has not the same
value as other webcams with the same sensor. For now, only two webcams have
been so detected: the Microsoft's VX1000 and VX3000.
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c6c14330717f9850b4b4c054b81424b9979cd07d
Author: Jean-Francois Moine <moinejf@xxxxxxx>
Date: Tue Dec 14 16:15:37 2010 -0300
[media] gspca - sonixj: Add a flag in the driver_info table
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4f67f3adefadbb056c1ce2c228916701b566e6fc
Author: Jean-Francois Moine <moinejf@xxxxxxx>
Date: Tue Dec 14 16:15:00 2010 -0300
[media] gspca - sonixj: Fix a bad probe exchange
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 5e68f400aad4e2c29e2531cc4413c459fa88cb62
Author: Jean-Francois Moine <moinejf@xxxxxxx>
Date: Tue Dec 14 16:14:10 2010 -0300
[media] gspca - sonixj: Move bridge init to sd start
Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 692e42df12e8427219958468301f3d03ca5f0f0d
Author: Brandon Philips <brandon@xxxxxxxx>
Date: Fri Dec 17 12:58:22 2010 -0300
[media] bttv: remove unneeded locking comments
After Mauro's "bttv: Fix locking issues due to BKL removal code" there
are a number of comments that are no longer needed about lock ordering.
Remove them.
Signed-off-by: Brandon Philips <bphilips@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 587f0d5d6d44e3529028bf197d424f866fb2411d
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Date: Wed Dec 15 18:45:42 2010 -0300
[media] bttv: fix mutex use before init (BZ#24602)
Fix a regression where bttv driver causes oopses when loading, since it
were using some non-initialized mutexes. While it would be possible to
fix the issue, there are some other lock troubles, like to the presence of
lock code at free_btres_lock().
It is possible to fix, but the better is to just use the core-assisted
locking schema. This way, V4L2 core will serialize access to all
ioctl's/open/close/mmap/read/poll operations, avoiding to have two
processes accessing the hardware at the same time. Also, as there's just
one lock, instead of 3, there's no risk of dead locks.
The net result is a cleaner code, with just one lock.
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Reported-by: Brandon Philips<brandon@xxxxxxxx>
Reported-by: Chris Clayton <chris2553@xxxxxxxxxxxxxx>
Reported-by: Torsten Kaiser <just.for.lkml@xxxxxxxxxxxxxx>
Tested-by: Chris Clayton <chris2553@xxxxxxxxxxxxxx>
Tested-by: Torsten Kaiser <just.for.lkml@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 3c2dcf2aed5ea22ecf65a9a871c4963faec421b3
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 15 21:12:15 2010 -0800
rcu: remove unused __list_for_each_rcu() macro
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 8a9c1cee26c0ece23b38c45b92b724438878f842
Author: Mariusz Kozlowski <mk@xxxxxxxxxxxx>
Date: Wed Dec 15 23:11:12 2010 +0100
rculist: fix borked __list_for_each_rcu() macro
This restores parentheses blance.
Signed-off-by: Mariusz Kozlowski <mk@xxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit b52573d2796274f7f31cfeff7185c320adcd4f12
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:36:02 2010 -0800
rcu: reduce __call_rcu()-induced contention on rcu_node structures
When the current __call_rcu() function was written, the expedited
APIs did not exist. The __call_rcu() implementation therefore went
to great lengths to detect the end of old grace periods and to start
new ones, all in the name of reducing grace-period latency. Now the
expedited APIs do exist, and the usage of __call_rcu() has increased
considerably. This commit therefore causes __call_rcu() to avoid
worrying about grace periods unless there are a large number of
RCU callbacks stacked up on the current CPU.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 0209f6490b030f35349a2bb71294f3fd75b0f36d
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 16:07:52 2010 -0800
rcu: limit rcu_node leaf-level fanout
Some recent benchmarks have indicated possible lock contention on the
leaf-level rcu_node locks. This commit therefore limits the number of
CPUs per leaf-level rcu_node structure to 16, in other words, there
can be at most 16 rcu_data structures fanning into a given rcu_node
structure. Prior to this, the limit was 32 on 32-bit systems and 64 on
64-bit systems.
Note that the fanout of non-leaf rcu_node structures is unchanged. The
organization of accesses to the rcu_node tree is such that references
to non-leaf rcu_node structures are much less frequent than to the
leaf structures.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 121dfc4b3eba9e2f3c42d35205a3510cc65b9931
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Fri Dec 10 15:02:47 2010 -0800
rcu: fine-tune grace-period begin/end checks
Use the CPU's bit in rnp->qsmask to determine whether or not the CPU
should try to report a quiescent state. Handle overflow in the check
for rdp->gpnum having fallen behind.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 5ff8e6f0535fe730e921ca347bc38dcb9e01791a
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Fri Dec 10 22:11:11 2010 +0100
rcu: Keep gpnum and completed fields synchronized
When a CPU that was in an extended quiescent state wakes
up and catches up with grace periods that remote CPUs
completed on its behalf, we update the completed field
but not the gpnum that keeps a stale value of a backward
grace period ID.
Later, note_new_gpnum() will interpret the shift between
the local CPU and the node grace period ID as some new grace
period to handle and will then start to hunt quiescent state.
But if every grace periods have already been completed, this
interpretation becomes broken. And we'll be stuck in clusters
of spurious softirqs because rcu_report_qs_rdp() will make
this broken state run into infinite loop.
The solution, as suggested by Lai Jiangshan, is to ensure that
the gpnum and completed fields are well synchronized when we catch
up with completed grace periods on their behalf by other cpus.
This way we won't start noting spurious new grace periods.
Suggested-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 20377f32dcb77941d450728da18cce5b1a7faec5
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Fri Dec 10 22:11:10 2010 +0100
rcu: Stop chasing QS if another CPU did it for us
When a CPU is idle and others CPUs handled its extended
quiescent state to complete grace periods on its behalf,
it will catch up with completed grace periods numbers
when it wakes up.
But at this point there might be no more grace period to
complete, but still the woken CPU always keeps its stale
qs_pending value and will then continue to chase quiescent
states even if its not needed anymore.
This results in clusters of spurious softirqs until a new
real grace period is started. Because if we continue to
chase quiescent states but we have completed every grace
periods, rcu_report_qs_rdp() is puzzled and makes that
state run into infinite loops.
As suggested by Lai Jiangshan, just reset qs_pending if
someone completed every grace periods on our behalf.
Suggested-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit e27fc9641e8ddc8146f8e01f06e5eba2469698de
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Mon Nov 22 21:36:11 2010 -0800
rcu: increase synchronize_sched_expedited() batching
The fix in commit #6a0cc49 requires more than three concurrent instances
of synchronize_sched_expedited() before batching is possible. This
patch uses a ticket-counter-like approach that is also not unrelated to
Lai Jiangshan's Ring RCU to allow sharing of expedited grace periods even
when there are only two concurrent instances of synchronize_sched_expedited().
This commit builds on Tejun's original posting, which may be found at
http://lkml.org/lkml/2010/11/9/204, adding memory barriers, avoiding
overflow of signed integers (other than via atomic_t), and fixing the
detection of batching.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit b4aa9e05a61b845541fa6f5b1d246976922601f0
Merge: 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 4b8fe66300acb2fba8b16d62606e0d30204022fc
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 17 12:27:22 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
commit 4b8fe66300acb2fba8b16d62606e0d30204022fc
Author: Dmitry V. Levin <ldv@xxxxxxxxxxxx>
Date: Fri Dec 17 12:03:14 2010 -0800
netlink: fix gcc -Wconversion compilation warning
$ cat << EOF | gcc -Wconversion -xc -S -o/dev/null -
unsigned f(void) {return NLMSG_HDRLEN;}
EOF
<stdin>: In function 'f':
<stdin>:3:26: warning: negative integer implicitly converted to unsigned type
Signed-off-by: Dmitry V. Levin <ldv@xxxxxxxxxxxx>
Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4680d3db71f13d2764340a9880745bf54f2469d
Author: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Date: Wed Dec 15 12:16:30 2010 +0000
asix: add USB ID for Logitec LAN-GTJ U2A
Logitec LAN-GTJ U2A (http://www.pro.logitec.co.jp/pro/g/gLAN-GTJU2A/)
USB 2.0 10/10/1000 Ethernet adapter is based on ASIX AX88178 chipset.
This patch adds missing USB ID for the device.
Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 081d835fa4ce70ad1e42ac76de850a49e23a1557
Author: Kevin Cernekee <cernekee@xxxxxxxxx>
Date: Tue Nov 2 22:28:01 2010 -0700
MIPS: Fix build errors in sc-mips.c
Seen with malta_defconfig on Linus' tree:
CC arch/mips/mm/sc-mips.o
arch/mips/mm/sc-mips.c: In function 'mips_sc_is_activated':
arch/mips/mm/sc-mips.c:77: error: 'config2' undeclared (first use in this function)
arch/mips/mm/sc-mips.c:77: error: (Each undeclared identifier is reported only once
arch/mips/mm/sc-mips.c:77: error: for each function it appears in.)
arch/mips/mm/sc-mips.c:81: error: 'tmp' undeclared (first use in this function)
make[2]: *** [arch/mips/mm/sc-mips.o] Error 1
make[1]: *** [arch/mips/mm] Error 2
make: *** [arch/mips] Error 2
[Ralf: Cosmetic changes to minimize the number of arguments passed to
mips_sc_is_activated]
Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1752/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 1dc0f3c54ce1df957f99c17b145488fd03eb1a59
Author: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Date: Thu Dec 16 22:59:02 2010 +0000
qlcnic: reset pci function unconditionally during probe
Some boot code drivers dont have cleanup routine, so pci function
remains in unknown state prior to driver load. So during driver load
issue FLR unconditionally.
Update driver version to 5.0.14.
Signed-off-by: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b5006dcb10a4b19e86f413b46787c55bd0d1277b
Author: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Date: Thu Dec 16 22:59:01 2010 +0000
qlcnic: fix ocm window register offset calculation
OCM window register offset was calculated incorrectly for
pci function greater than zero.
Signed-off-by: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c75822a3091a899d982d59cd2b4454fe7c3e0318
Author: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Date: Thu Dec 16 22:59:00 2010 +0000
qlcnic: fix LED test when interface is down.
When interface is down, create temporary context to config LED.
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 46814e08d80f87449b5adb3d549a3cae6f9f8148
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Fri Dec 17 10:16:23 2010 -0800
tehuti: Firmware filename is tehuti/bdx.bin
My conversion of tehuti to use request_firmware() was confused about
the filename of the firmware blob. Change the driver to match the
blob.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Signed-off-by: Andy Gospodarek <andy@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a2c606d53ab71dee6410f10ef0adf67321d60e06
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:39:02 2010 -0700
x86: avoid high BIOS area when allocating address space
This prevents allocation of the last 2MB before 4GB.
The experiment described here shows Windows 7 ignoring the last 1MB:
https://bugzilla.kernel.org/show_bug.cgi?id=23542#c27
This patch ignores the top 2MB instead of just 1MB because H. Peter Anvin
says "There will be ROM at the top of the 32-bit address space; it's a fact
of the architecture, and on at least older systems it was common to have a
shadow 1 MiB below."
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 4dc2287c1805e7fe8a7cb90bbcd44abee8cdb914
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:56 2010 -0700
x86: avoid E820 regions when allocating address space
When we allocate address space, e.g., to assign it to a PCI device, don't
allocate anything mentioned in the BIOS E820 memory map.
On recent machines (2008 and newer), we assign PCI resources from the
windows described by the ACPI PCI host bridge _CRS. On many Dell
machines, these windows overlap some E820 reserved areas, e.g.,
BIOS-e820: 00000000bfe4dc00 - 00000000c0000000 (reserved)
pci_root PNP0A03:00: host bridge window [mem 0xbff00000-0xdfffffff]
If we put devices at 0xbff00000, they don't work, probably because
that's really RAM, not I/O memory. This patch prevents that by removing
the 0xbfe4dc00-0xbfffffff area from the "available" resource.
I'm not very happy with this solution because Windows solves the problem
differently (it seems to ignore E820 reserved areas and it allocates
top-down instead of bottom-up; details at comment 45 of the bugzilla
below). That means we're vulnerable to BIOS defects that Windows would not
trip over. For example, if BIOS described a device in ACPI but didn't
mention it in E820, Windows would work fine but Linux would fail.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=16228
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 30919b0bf356a8ee0ef4f7d38ca8ad99b96820b2
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:51 2010 -0700
x86: avoid low BIOS area when allocating address space
This implements arch_remove_reservations() so allocate_resource() can
avoid any arch-specific reserved areas. This currently just avoids the
BIOS area (the first 1MB), but could be used for E820 reserved areas if
that turns out to be necessary.
We previously avoided this area in pcibios_align_resource(). This patch
moves the test from that PCI-specific path to a generic path, so *all*
resource allocations will avoid this area.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit fcb119183c73bf0781009713f303e28b1fb13d3e
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:46 2010 -0700
resources: add arch hook for preventing allocation in reserved areas
This adds arch_remove_reservations(), which an arch can implement if it
needs to protect part of the address space from allocation.
Sometimes that can be done by just putting a region in the resource tree,
but there are cases where that doesn't work well. For example, x86 BIOS
E820 reservations are not related to devices, so they may overlap part of,
all of, or more than a device resource, so they may not end up at the
correct spot in the resource tree.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit c0f5ac5426f7fd82b23dd5c6a1e633b290294a08
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:41 2010 -0700
Revert "resources: support allocating space within a region from the top down"
This reverts commit e7f8567db9a7f6b3151b0b275e245c1cef0d9c70.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 6db45b76eaa08133187f2cb44d496de7e9503aa8
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:36 2010 -0700
Revert "PCI: allocate bus resources from the top down"
This reverts commit b126b4703afa4010b161784a43650337676dd03b.
We're going back to the old behavior of allocating from bus resources
in _CRS order.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit d14125ecfee05473de46f06d992db109308c57a3
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:31 2010 -0700
Revert "x86/PCI: allocate space from the end of a region, not the beginning"
This reverts commit dc9887dc02e37bcf83f4e792aa14b07782ef54cf.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 5e52f1c5e85fdc3831eeae8b546577e94a586f81
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:25 2010 -0700
Revert "x86: allocate space within a region top-down"
This reverts commit 1af3c2e45e7a641e774bbb84fa428f2f0bf2d9c9.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit ac57cd5ee1935d1e60de86d75f13f377775f1c96
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date: Thu Dec 16 10:38:20 2010 -0700
Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive decode"
This reverts commit 82e3e767c21fef2b1b38868e20eb4e470a1e38e3.
We're going back to considering bus resources in the order we found
them (in _CRS order, when we're using _CRS), so we don't need to
define any ordering.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 361cf40519a491f68b28ad90225e4611c4bf8e12
Author: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:55:59 2010 -0800
ceph: handle partial result from get_user_pages
The get_user_pages() helper can return fewer than the requested pages.
Error out in that case, and clean up the partial result.
Signed-off-by: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit b6aa5901c7a2bd90d0b6b9866300d2648b2568f3
Author: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 15 20:45:41 2010 -0800
ceph: mark user pages dirty on direct-io reads
For read operation, we have to set the argument _write_ of get_user_pages
to 1 since we will write data to pages. Also, we need to SetPageDirty before
releasing these pages.
Signed-off-by: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit 92cf765237e2787eb168096305c448caf25ac7f8
Author: Sage Weil <sage@xxxxxxxxxxxx>
Date: Fri Dec 17 09:53:41 2010 -0800
ceph: fix null pointer dereference in ceph_init_dentry for nfs reexport
The fh_to_dentry etc. methods use ceph_init_dentry(), which assumes that
d_parent is defined. It isn't for those callers, so check!
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit c15524a40a1603dc56a8691c4f50172fb86c23d8
Merge: a6ac1f0af4b39f41fa69477cc44621c612403374 c20b4dd31820a551d0fb60bf27b99345905c2eb6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:45:25 2010 -0800
Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
* 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
at91: Refactor Stamp9G20 and PControl G20 board file
at91: Fix uhpck clock rate in upll case
commit a6ac1f0af4b39f41fa69477cc44621c612403374
Merge: 508817e7cd8cb585148d12b5673202142ece2330 3e26f23091da06d02fa62da14c95f3688d27857c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:32:39 2010 -0800
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Fix preemption counter leak in kvm_timer_init()
KVM: enlarge number of possible CPUID leaves
KVM: SVM: Do not report xsave in supported cpuid
KVM: Fix OSXSAVE after migration
commit 508817e7cd8cb585148d12b5673202142ece2330
Merge: 8efc1a1a22e6daf9d669e6095460c77df683c325 f08f5a0add20834d3f3d876dfe08005a5df656db
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:31:59 2010 -0800
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Runtime: Fix pm_runtime_suspended()
PM / Hibernate: Restore old swap signature to avoid user space breakage
PM / Hibernate: Fix PM_POST_* notification with user-space suspend
commit 8efc1a1a22e6daf9d669e6095460c77df683c325
Merge: 74280817e5013af83089a5dd511f6fb3b2362e09 673eb9ff33e26ee6f4278cdab06749aef1bbef5b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:28:17 2010 -0800
Merge branch 'bkl_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'bkl_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] uvcvideo: Convert to unlocked_ioctl
[media] uvcvideo: Lock stream mutex when accessing format-related information
[media] uvcvideo: Move mmap() handler to uvc_queue.c
[media] uvcvideo: Move mutex lock/unlock inside uvc_free_buffers
[media] uvcvideo: Lock controls mutex when querying menus
[media] v4l2-dev: fix race condition
[media] V4L: improve the BKL replacement heuristic
[media] v4l2-dev: use mutex_lock_interruptible instead of plain mutex_lock
[media] cx18: convert to unlocked_ioctl
[media] radio-timb: convert to unlocked_ioctl
[media] sh_vou: convert to unlocked_ioctl
[media] cafe_ccic: replace ioctl by unlocked_ioctl
[media] et61x251_core: trivial conversion to unlocked_ioctl
[media] sn9c102: convert to unlocked_ioctl
[media] BKL: trivial ioctl -> unlocked_ioctl video driver conversions
[media] typhoon: convert to unlocked_ioctl
[media] si4713: convert to unlocked_ioctl
[media] tea5764: convert to unlocked_ioctl
[media] cadet: use unlocked_ioctl
[media] BKL: trivial BKL removal from V4L2 radio drivers
commit 74280817e5013af83089a5dd511f6fb3b2362e09
Merge: a3383e8372c0c11238f9bb9777929bfc3a2d320a 5aad6c5f7733b94e666e3bf8b57beb7bbee15886
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:27:30 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix conflict of Mic Boot controls
ALSA: HDA: Enable subwoofer on Asus G73Jw
ALSA: HDA: Fix auto-mute on Lenovo Edge 14
ASoC: Fix bias power down of non-DAPM codec
ASoC: WM8580: Fix R8 initial value
ASoC: fix deemphasis control in wm8904/55/60 codecs
commit 403047754cf690b012369b8fb563b738b88086e6
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 17 15:47:04 2010 +0100
percpu,x86: relocate this_cpu_add_return() and friends
- include/linux/percpu.h: this_cpu_add_return() and friends were
located next to __this_cpu_add_return(). However, the overall
organization is to first group by preemption safeness. Relocate
this_cpu_add_return() and friends to preemption-safe area.
- arch/x86/include/asm/percpu.h: Relocate percpu_add_return_op() after
other more basic operations. Relocate [__]this_cpu_add_return_8()
so that they're first grouped by preemption safeness.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
commit 5aad6c5f7733b94e666e3bf8b57beb7bbee15886
Merge: 8cd1fd2526a78eaa1785a8ae3fe9f45a8ddd0e17 862af8adbe6b9ccb7c00c13717b1f92465f79aa2
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 17 15:28:37 2010 +0100
Merge branch 'fix/asoc' into for-linus
commit 8cd1fd2526a78eaa1785a8ae3fe9f45a8ddd0e17
Merge: d70ab7f7ee0692efc880d772dc5c212174d67e3b 53e8c3239bcc7b89c76179fd33fb6faa3413c00d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 17 15:28:33 2010 +0100
Merge branch 'fix/hda' into for-linus
commit 53e8c3239bcc7b89c76179fd33fb6faa3413c00d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 17 15:23:41 2010 +0100
ALSA: hda - Fix conflict of Mic Boot controls
Due to the recent change for multiple mics assignment, we need to handle
the index of each Mic Boost control respectively. Otherwise the driver
gets the control element conflicts, and gives the unsable state.
Reference: kernel bug 25002
https://bugzilla.kernel.org/show_bug.cgi?id=25002
Reported-and-tested-by: Adam Williamson <awilliam@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 3ea9f6833c8f865a221b59ce37d7650dcf3b3e17
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Wed Dec 8 17:42:23 2010 +0100
connector: Use this_cpu operations
The patch was originally in the use cpuops patchset but it needs an
inc_return and is therefore dependent on an extension of the cpu ops.
Fixed up and verified that it compiles.
get_seq can benefit from this_cpu_operations. Address calculation is
avoided and the increment is done using an xadd.
Cc: Scott James Remnant <scott@xxxxxxxxxx>
Cc: Mike Frysinger <vapier@xxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit b2e4ae69757cdfef4c612a04f097c1e20489a565
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:40:07 2010 -0600
xen: Use this_cpu_inc_return
__this_cpu_inc_return reduces code and simplifies code.
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
commit cd85fc58cd71bf6b89612efafb9a84e655ed7d66
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Wed Dec 8 17:42:22 2010 +0100
taskstats: Use this_cpu_ops
Use this_cpu_inc_return in one place and avoid ugly __raw_get_cpu in
another.
V3->V4:
- Fix off by one.
V4-V4f:
- Use &listener_array
Cc: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit b29c617af3b09d150d3889836c24d39564b39180
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:40:06 2010 -0600
random: Use this_cpu_inc_return
__this_cpu_inc can create a single instruction to do the same as
__get_cpu_var()++.
Cc: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Cc: Matt Mackall <mpm@xxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit ee1be8626355e6a1f3f8c44e2351ff2661c5998d
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:40:05 2010 -0600
fs: Use this_cpu_inc_return in buffer.c
__this_cpu_inc can create a single instruction with the same effect
as the _get_cpu_var(..)++ construct in buffer.c.
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit cfb824349556904b319464139be5c75fce983b0d
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:40:03 2010 -0600
highmem: Use this_cpu_xx_return() operations
Use this_cpu operations to optimize access primitives for highmem.
The main effect is the avoidance of address calculations through the
use of a segment prefix.
V3->V4
- kmap_atomic_idx: Do not return a value.
- Use __this_cpu_dec without HIGHMEM_DEBUG
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 908ee0f122bf2a67414854af5b90c6621d186a71
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:40:02 2010 -0600
vmstat: Use this_cpu_inc_return for vm statistics
this_cpu_inc_return() saves us a memory access there. Code
size does not change.
V1->V2:
- Fixed the location of the __per_cpu pointer attributes
- Sparse checked
V2->V3:
- Move fixes to __percpu attribute usage to earlier patch
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 275c8b93288ef0c2281e414e069ea8ed4bad03f7
Merge: 909ea96468096b07fbb41aaf69be060d92bd9271 8f1d97c79eb65de1d05799d6b81d79cd94169114
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 17 15:16:46 2010 +0100
Merge branch 'this_cpu_ops' into for-2.6.38
commit 8f1d97c79eb65de1d05799d6b81d79cd94169114
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:40:00 2010 -0600
x86: Support for this_cpu_add, sub, dec, inc_return
Supply an implementation for x86 in order to generate more efficient code.
V2->V3:
- Cleanup
- Remove strange type checking from percpu_add_return_op.
tj: - Dropped unused typedef from percpu_add_return_op().
- Renamed ret__ to paro_ret__ in percpu_add_return_op().
- Minor indentation adjustments.
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit a663ffff1d2e94a7c549a37d08ed9169ce83bdd6
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:39:59 2010 -0600
percpu: Generic support for this_cpu_add, sub, dec, inc_return
Introduce generic support for this_cpu_add_return etc.
The fallback is to realize these operations with simpler __this_cpu_ops.
tj: - Reformatted __cpu_size_call_return2() to make it more consistent
with its neighbors.
- Dropped unnecessary temp variable ret__ from
__this_cpu_generic_add_return().
Reviewed-by: Tejun Heo <tj@xxxxxxxxxx>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 909ea96468096b07fbb41aaf69be060d92bd9271
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Wed Dec 8 16:22:55 2010 +0100
core: Replace __get_cpu_var with __this_cpu_read if not used for an address.
__get_cpu_var() can be replaced with this_cpu_read and will then use a
single read instruction with implied address calculation to access the
correct per cpu instance.
However, the address of a per cpu variable passed to __this_cpu_read()
cannot be determined (since it's an implied address conversion through
segment prefixes). Therefore apply this only to uses of __get_cpu_var
where the address of the variable is not used.
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 780f36d8b3fa9572f731d4fb85067b2e45e6f993
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:29 2010 -0600
xen: Use this_cpu_ops
Use this_cpu_ops to reduce code size and simplify things in various places.
V3->V4:
Move instance of this_cpu_inc_return to a later patchset so that
this patch can be applied without infrastructure changes.
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit c7b92516a9c68fa5403879225a5a19974a801ef6
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:28 2010 -0600
fs: Use this_cpu_xx operations in buffer.c
Optimize various per cpu area operations through these new percpu
operations. These operations avoid address calculations through the
use of segment prefixes and multiple memory references through RMW
instructions etc.
Reduces code size:
Before:
christoph@xxxxxxxxx$ size fs/buffer.o
text data bss dec hex filename
19169 80 28 19277 4b4d fs/buffer.o
After:
christoph@xxxxxxxxx$ size fs/buffer.o
text data bss dec hex filename
19138 80 28 19246 4b2e fs/buffer.o
V3->V4:
- Move the use of this_cpu_inc_return into a later patch so that
this one can go in without percpu infrastructure changes.
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 5309665dcc1143d659d82568da8d00f0e08a58f9
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:26 2010 -0600
fakekey: Simplify speakup_fake_key_pressed through this_cpu_ops
The whole function can be expressed as a simple this_cpu_read() operation.
The function overhead is now likely multiple times that of the single
instruction that is executed in it.
Sedat: fixed compile failure caused by an extra ')'.
Cc: William Hubbs <w.d.hubbs@xxxxxxxxx>
Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit b76834bc1b6db0a0923eed85c81b1113021b0612
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:25 2010 -0600
kprobes: Use this_cpu_ops
Use this_cpu ops in various places to optimize per cpu data access.
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 4a6f4fe8377720e5a279fdbb769946c242e936d3
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:24 2010 -0600
drivers: Replace __get_cpu_var with __this_cpu_read if not used for an address.
__get_cpu_var() can be replaced with this_cpu_read and will then use a single
read instruction with implied address calculation to access the correct per cpu
instance.
However, the address of a per cpu variable passed to __this_cpu_read() cannot be
determed (since its an implied address conversion through segment prefixes).
Therefore apply this only to uses of __get_cpu_var where the addres of the
variable is not used.
V3->V4:
- Move one instance of this_cpu_inc_return to a later patch
so that this one can go in without percpu infrastructrure
changes.
Sedat: fixed compile failure caused by an extra ')'.
Cc: Neil Horman <nhorman@xxxxxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 12938a9220a38d555e38dc9b40021e664b99a1f1
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:20 2010 -0600
vmstat: Optimize zone counter modifications through the use of this cpu operations
this cpu operations can be used to slightly optimize the function. The
changes will avoid some address calculations and replace them with the
use of the percpu segment register.
If one would have this_cpu_inc_return and this_cpu_dec_return then it
would be possible to optimize inc_zone_page_state and
dec_zone_page_state even more.
V1->V2:
- Fix __dec_zone_state overflow handling
- Use s8 variables for temporary storage.
V2->V3:
- Put __percpu annotations in correct places.
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 819a72af8d6653daa48334f24ce0a935ccdd33c7
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Mon Dec 6 11:16:19 2010 -0600
percpucounter: Optimize __percpu_counter_add a bit through the use of this_cpu() options.
The this_cpu_* options can be used to optimize __percpu_counter_add a bit. Avoids
some address arithmetic and saves 12 bytes.
Before:
00000000000001d3 <__percpu_counter_add>:
1d3: 55 push %rbp
1d4: 48 89 e5 mov %rsp,%rbp
1d7: 41 55 push %r13
1d9: 41 54 push %r12
1db: 53 push %rbx
1dc: 48 89 fb mov %rdi,%rbx
1df: 48 83 ec 08 sub $0x8,%rsp
1e3: 4c 8b 67 30 mov 0x30(%rdi),%r12
1e7: 65 4c 03 24 25 00 00 add %gs:0x0,%r12
1ee: 00 00
1f0: 4d 63 2c 24 movslq (%r12),%r13
1f4: 48 63 c2 movslq %edx,%rax
1f7: 49 01 f5 add %rsi,%r13
1fa: 49 39 c5 cmp %rax,%r13
1fd: 7d 0a jge 209 <__percpu_counter_add+0x36>
1ff: f7 da neg %edx
201: 48 63 d2 movslq %edx,%rdx
204: 49 39 d5 cmp %rdx,%r13
207: 7f 1e jg 227 <__percpu_counter_add+0x54>
209: 48 89 df mov %rbx,%rdi
20c: e8 00 00 00 00 callq 211 <__percpu_counter_add+0x3e>
211: 4c 01 6b 18 add %r13,0x18(%rbx)
215: 48 89 df mov %rbx,%rdi
218: 41 c7 04 24 00 00 00 movl $0x0,(%r12)
21f: 00
220: e8 00 00 00 00 callq 225 <__percpu_counter_add+0x52>
225: eb 04 jmp 22b <__percpu_counter_add+0x58>
227: 45 89 2c 24 mov %r13d,(%r12)
22b: 5b pop %rbx
22c: 5b pop %rbx
22d: 41 5c pop %r12
22f: 41 5d pop %r13
231: c9 leaveq
232: c3 retq
After:
00000000000001d3 <__percpu_counter_add>:
1d3: 55 push %rbp
1d4: 48 63 ca movslq %edx,%rcx
1d7: 48 89 e5 mov %rsp,%rbp
1da: 41 54 push %r12
1dc: 53 push %rbx
1dd: 48 89 fb mov %rdi,%rbx
1e0: 48 8b 47 30 mov 0x30(%rdi),%rax
1e4: 65 44 8b 20 mov %gs:(%rax),%r12d
1e8: 4d 63 e4 movslq %r12d,%r12
1eb: 49 01 f4 add %rsi,%r12
1ee: 49 39 cc cmp %rcx,%r12
1f1: 7d 0a jge 1fd <__percpu_counter_add+0x2a>
1f3: f7 da neg %edx
1f5: 48 63 d2 movslq %edx,%rdx
1f8: 49 39 d4 cmp %rdx,%r12
1fb: 7f 21 jg 21e <__percpu_counter_add+0x4b>
1fd: 48 89 df mov %rbx,%rdi
200: e8 00 00 00 00 callq 205 <__percpu_counter_add+0x32>
205: 4c 01 63 18 add %r12,0x18(%rbx)
209: 48 8b 43 30 mov 0x30(%rbx),%rax
20d: 48 89 df mov %rbx,%rdi
210: 65 c7 00 00 00 00 00 movl $0x0,%gs:(%rax)
217: e8 00 00 00 00 callq 21c <__percpu_counter_add+0x49>
21c: eb 04 jmp 222 <__percpu_counter_add+0x4f>
21e: 65 44 89 20 mov %r12d,%gs:(%rax)
222: 5b pop %rbx
223: 41 5c pop %r12
225: c9 leaveq
226: c3 retq
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Reviewed-by: Tejun Heo <tj@xxxxxxxxxx>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit e72df0b847adf064e64bcbd5141f0031524e723e
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 10 17:02:49 2010 +0100
MAINTAINERS: Add percpu allocator entry
Add me and Christoph Lameter as maintainers for the percpu memory
allocator.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
commit c20b4dd31820a551d0fb60bf27b99345905c2eb6
Author: Christian Glindkamp <christian.glindkamp@xxxxxxxxx>
Date: Thu Dec 9 11:15:59 2010 +0100
at91: Refactor Stamp9G20 and PControl G20 board file
As PControl G20 is a carrier board for the Stamp9G20 SoM, some code can
be shared. Therefore board-stamp9g20.c is refactored to allow reusing the
SoM initialization and board-pcontrol-g20.c is modified to use it.
Signed-off-by: Christian Glindkamp <christian.glindkamp@xxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
commit 8251544f9e28058e54c4f35b7cd13b0d191d7555
Author: Ryan Mallon <ryan@xxxxxxxxxxxxxxxx>
Date: Wed Jun 2 12:55:36 2010 +1200
at91: Fix uhpck clock rate in upll case
The uhpck clock should be divided from the utmi clock, not its parent
(main). This change is mostly cosmetic as the uhpck rate value is not
used anywhere except for the debugfs clock output.
Signed-off-by: Ryan Mallon <ryan@xxxxxxxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
commit 41491b9adc6ba47b73100991e9295ae70c58db0f
Author: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Date: Wed Dec 15 08:31:04 2010 +0000
ARM: mach-shmobile: mackerel: Add mmcif support
v2
Add comment of J22 and OCR field.
Signed-off-by: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1cf215a5b43950d1a304373037828158057ff9fc
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Fri Dec 17 15:15:48 2010 +0900
ARM: mach-shmobile: INTC interrupt priority level demux fix
Fix interrupt priority level handling on SH-Mobile ARM.
SH-Mobile ARM platforms using multiple interrupt priority
levels need this patch to fix a potential dead lock that
may occur if multiple interrupts with different levels
are pending simultaneously.
The default INTC configuration is to use the same priority
level for all interrupts, so this issue does not trigger by
default. It is however common for board code to override the
interrupt priority for certain interrupt sources depending
on the application. Without this fix such boards may lock up.
In detail, this patch updates the INTC code in entry-macro.S
to make sure that the INTLVLA register gets set as expected.
To trigger this bug modify the board specific code to adjust
the interrupt priority level for the ethernet chip. After
changing the priority level simply use flood ping to drown
the board with interrupts.
This patch applies to INTCA-based processors such as sh7372,
sh7377 and sh7372. GIC-based processors are not affected.
Suitable for v2.6.37-rc and stable from v2.6.34 to v2.6.36.
Cc: stable@xxxxxxxxxx
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 676b14c36de5bea83f7666e5f5965188426b97a7
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Dec 15 10:59:24 2010 +0000
ARM: mach-shmobile: fix compile warning in mm/init.c
Turn down the warning noise from the compiler,
basically a SH-Mobile specific version of the
patch located in the RMK patch tracker:
6484/1: "fix compile warning in mm/init.c",
Without this patch the following warning triggers:
CC arch/arm/kernel/sys_arm.o
arch/arm/mm/init.c: In function 'mem_init':
arch/arm/mm/init.c:606: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int'
CC arch/arm/kernel/traps.o
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 65ada547d68dc075aa06df92fe325bff07cbc606
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Fri Dec 17 07:25:09 2010 +0000
clocksource: sh_cmt: Remove nested spinlock fix
There are control flow that sh_cmt_set_next() does double
spin-lock. The callers sh_cmt_{start,stop}() already have
lock. But another callers sh_cmt_clock_event_{start,next}()
does not.
Now sh_cmt_set_next() does not lock by itself. All the
callers should hold spin-lock before calling it.
[damm@xxxxxxxxxxxxx: use __sh_cmt_set_next() to simplify code]
[damm@xxxxxxxxxxxxx: added stable, suitable for v2.6.35 + v2.6.36]
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 03aa18f550900855c1d3d17ac83c14a3d668d344
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 17 19:16:10 2010 +0900
dma: shdma: NMI support.
Presently DMA transfers are interrupted and aborted by the NMI. This
implements some basic logic for more gracefully handling and clearing
each controller's NMIF flag via the NMI die chain, needed to resume
transfers post-NMI.
Reported-by: Michael Szafranek <Michael.Szafranek@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 76496f8f2e104b8bb08db09c063a6817d18829a6
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 17 18:58:04 2010 +0900
sh: mach-sdk7786: Handle baseboard NMI source selection.
The on-board NMI switch is routed through and mangled by the FPGA prior
to its delivery to the NMI pin, so add some glue for the various
configuration options. The default is to unmask it and enable all input
sources.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0fc13c8995cd96f4123de400c71c223d80400ed9
Author: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
Date: Fri Dec 17 09:01:37 2010 +0100
cciss: fix cciss_revalidate panic
If you delete a logical drive, and then run BLKRRPART (e.g. via fdisk)
on a logical drive which is "after" the deleted logical drive in the h->drv[]
array, then cciss_revalidate panics because it will access the null pointer
h->drv[x] when x hits the deleted drive.
Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit 72d4cd9f38b5ed96b75df4c622be25e1c2648dd3
Author: Mike Snitzer <snitzer@xxxxxxxxxx>
Date: Fri Dec 17 08:34:20 2010 +0100
block: max hardware sectors limit wrapper
Implement blk_limits_max_hw_sectors() and make
blk_queue_max_hw_sectors() a wrapper around it.
DM needs this to avoid setting queue_limits' max_hw_sectors and
max_sectors directly. dm_set_device_limits() now leverages
blk_limits_max_hw_sectors() logic to establish the appropriate
max_hw_sectors minimum (PAGE_SIZE). Fixes issue where DM was
incorrectly setting max_sectors rather than max_hw_sectors (which
caused dm_merge_bvec()'s max_hw_sectors check to be ineffective).
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Acked-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit e692cb668fdd5a712c6ed2a2d6f2a36ee83997b4
Author: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Date: Wed Dec 1 19:41:49 2010 +0100
block: Deprecate QUEUE_FLAG_CLUSTER and use queue_limits instead
When stacking devices, a request_queue is not always available. This
forced us to have a no_cluster flag in the queue_limits that could be
used as a carrier until the request_queue had been set up for a
metadevice.
There were several problems with that approach. First of all it was up
to the stacking device to remember to set queue flag after stacking had
completed. Also, the queue flag and the queue limits had to be kept in
sync at all times. We got that wrong, which could lead to us issuing
commands that went beyond the max scatterlist limit set by the driver.
The proper fix is to avoid having two flags for tracking the same thing.
We deprecate QUEUE_FLAG_CLUSTER and use the queue limit directly in the
block layer merging functions. The queue_limit 'no_cluster' is turned
into 'cluster' to avoid double negatives and to ease stacking.
Clustering defaults to being enabled as before. The queue flag logic is
removed from the stacking function, and explicitly setting the cluster
flag is no longer necessary in DM and MD.
Reported-by: Ed Lin <ed.lin@xxxxxxxxxxx>
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Acked-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit cb1868869dce7b751b670aadfc1f1360bc224b29
Author: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Date: Fri Dec 17 14:47:42 2010 +0900
ARM: S5PV210: update MAX8998 platform data to get rid of WARN()
This patch adds new entries required by the new version of MAX8998
driver. Without them, the driver fails to init. See commit 50f19a4596
Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
commit 0f8f9c2b6c1326e99e51729a5d4aeb9c3ce164e1
Author: Yauhen Kharuzhy <jekhor@xxxxxxxxx>
Date: Fri Dec 17 14:45:01 2010 +0900
ARM S3C24XX: Fix compilation of PM code for S3C2416
S3C2416 PM code uses low-level sleep routines from S3C2412 code,
but these routines are compiled only for S3C2412 SoC.
Split S3C2412_PM to two parts: S3C2412_PM, S3C2412_PM_SLEEP and
select last in S3C2416's Kconfig.
Signed-off-by: Yauhen Kharuzhy <jekhor@xxxxxxxxx>
Signed-off-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
commit 258b78c364b9d3f730b5e3187fc500d472b5c237
Author: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
Date: Fri Dec 3 21:22:42 2010 +0900
ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry
Should be CONFIG_S3C_DEV_NAND instead of CONFIG_S3C_DEVICE_NAND.
Cc: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
commit 147dd5610c8d1bacb88a6c1dfdaceaf257946ed0
Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 19:11:09 2010 -0800
x86-32: Make sure we can map all of lowmem if we need to
A relocatable kernel can be anywhere in lowmem -- and in the case of a
kdump kernel, is likely to be fairly high. Since the early page
tables map everything from address zero up we need to make sure we
allocate enough brk that we can map all of lowmem if we need to.
Reported-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Tested-by: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <4D0AD3ED.8070607@xxxxxxxxxx>
commit 29ba5fed1bbd09c2cba890798c8f9eaab251401d
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Thu Dec 16 11:28:12 2010 +0000
ipv6: don't flush routes when setting loopback down
When loopback device is being brought down, then keep the route table
entries because they are special. The entries in the local table for
linklocal routes and ::1 address should not be purged.
This is a sub optimal solution to the problem and should be replaced
by a better fix in future.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Acked-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b7b8de087384cc1954a8cd075af3f9e5977caa2e
Author: Werner Fink <werner@xxxxxxx>
Date: Fri Dec 3 12:48:23 2010 +0100
TTY: Add tty ioctl to figure device node of the system console.
This has been in the SuSE kernels for a very long time.
Signed-off-by: Werner Fink <werner@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fbc92a3455577ab17615cbcb91826399061bd789
Author: Kay Sievers <kay.sievers@xxxxxxxx>
Date: Wed Dec 1 18:51:05 2010 +0100
tty: add 'active' sysfs attribute to tty0 and console device
tty: add 'active' sysfs attribute to tty0 and console device
Userspace can query the actual virtual console, and the configured
console devices behind /dev/tt0 and /dev/console.
The last entry in the list of devices is the active device, analog
to the console= kernel command line option.
The attribute supports poll(), which is raised when the virtual
console is changed or /dev/console is reconfigured.
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
index 0000000..b138b66
commit dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 16 15:52:30 2010 -0800
Revert "USB: gadget: Allow function access to device ID data during bind()"
This reverts commit 1ab83238740ff1e1773d5c13ecac43c60cf4aec4.
Turns out this doesn't allow for the device ids to be overridden
properly, so we need to revert the thing.
Reported-by: Jef Driesen <jefdriesen@xxxxxxxxxx>
Cc: Robert Lukassen <Robert.Lukassen@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a3383e8372c0c11238f9bb9777929bfc3a2d320a
Merge: 68a4ec9c03461e94a9577cf499069621bb074833 7d13162332f2b67a941d18cee20f1c0413e020de
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 15:45:49 2010 -0800
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify:
fanotify: fill in the metadata_len field on struct fanotify_event_metadata
fanotify: split version into version and metadata_len
fanotify: Dont try to open a file descriptor for the overflow event
fanotify: Introduce FAN_NOFD
fanotify: do not leak user reference on allocation failure
inotify: stop kernel memory leak on file creation failure
fanotify: on group destroy allow all waiters to bypass permission check
fanotify: Dont allow a mask of 0 if setting or removing a mark
fanotify: correct broken ref counting in case adding a mark failed
fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
fanotify: remove packed from access response message
fanotify: deny permissions when no event was sent
commit ecc1624a2fff45780959efbcb73ace18fdb3c58d
Author: Thomas Sailer <t.sailer@xxxxxxxxxxxxxx>
Date: Tue Dec 14 16:04:05 2010 +0100
USB: misc: uss720.c: add another vendor/product ID
Fabio Battaglia report that he has another cable that works with this
driver, so this patch adds its vendor/product ID.
Signed-off-by: Thomas Sailer <t.sailer@xxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d73a9b3001f29271c2e9f2a806b05a431c5d9591
Author: Vitaly Kuznetsov <vitty@xxxxxxxxxxx>
Date: Tue Dec 14 10:16:49 2010 -0500
USB: usb-storage: unusual_devs entry for the Samsung YP-CP3
Add an unusual_devs entry for the Samsung YP-CP3 MP4 player.
User was getting the following errors in dmesg:
usb 2-6: reset high speed USB device using ehci_hcd and address 2
usb 2-6: reset high speed USB device using ehci_hcd and address 2
usb 2-6: reset high speed USB device using ehci_hcd and address 2
usb 2-6: USB disconnect, address 2
sd 3:0:0:0: [sdb] Assuming drive cache: write through
sdb:<2>ldm_validate_partition_table(): Disk read failed.
Dev sdb: unable to read RDB block 0
unable to read partition table
Signed-off-by: Vitaly Kuznetsov <vitty@xxxxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
CC: Matthew Dharm <mdharm-usb@xxxxxxxxxxxxxxxxxx>
CC: stable@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit daba58035a044cae75488175a96cc18362a64518
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Thu Dec 16 14:32:25 2010 +0530
USB: gadget: Remove suspended sysfs file before freeing cdev
cdev struct is accessed in suspended sysfs show function. So
remove sysfs file before freeing the cdev in composite_unbind.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f4ce9084476dc518bfd0f35f62f4bd0a130893e0
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Thu Dec 16 14:32:24 2010 +0530
USB: core: Add input prompt and help text for USB_OTG config
bd6882 commit (usb: gadget: fix Kconfig warning) removes
the duplicate USB_OTG config from gadget/Kconfig. But
does not copy the input prompt and help text to the original
config defined in core/Kconfig. Add them now.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 68a4ec9c03461e94a9577cf499069621bb074833
Merge: b3444d164be8f977f4133ef0c6f4a18f2741373f c9bace7ca1e2aeb95754ebc92c8f88a9f215691d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 15:45:25 2010 -0800
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (28 commits)
MIPS: Add a CONFIG_FORCE_MAX_ZONEORDER Kconfig option.
MIPS: LD/SD o32 macro GAS fix update
MIPS: Alchemy: fix build with SERIAL_8250=n
MIPS: Rename mips_dma_cache_sync back to dma_cache_sync
MIPS: MT: Fix typo in comment.
SSB: Fix nvram_get on BCM47xx platform
MIPS: BCM47xx: Swap serial console if ttyS1 was specified.
MIPS: BCM47xx: Use sscanf for parsing mac address
MIPS: BCM47xx: Fill values for b43 into SSB sprom
MIPS: BCM47xx: Do not read config from CFE
MIPS: FDT size is a be32
MIPS: Fix CP0 COUNTER clockevent race
MIPS: Fix regression on BCM4710 processor detection
MIPS: JZ4740: Fix pcm device name
MIPS: Separate two consecutive loads in memset.S
MIPS: Send proper signal and siginfo on FP emulator faults.
MIPS: AR7: Fix loops per jiffies on TNETD7200 devices
MIPS: AR7: Fix double ar7_gpio_init declaration
MIPS: Rework GENERIC_HARDIRQS Kconfig.
MIPS: Alchemy: Add return value check for strict_strtoul()
...
commit 63d5e5a727240b317b0c2fa2abeb32b367aea196
Author: Sven Eckelmann <sven@xxxxxxxxxxxxx>
Date: Thu Dec 16 23:28:17 2010 +0100
Staging: batman-adv: Remove batman-adv from staging
batman-adv is now moved to net/batman-adv/ and can be removed from
staging.
Signed-off-by: Sven Eckelmann <sven@xxxxxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7edc3453e54432a9f1c636b6481f1107c9db19bd
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 15 23:52:55 2010 +0000
ifb: fix a lockdep splat
After recent ifb changes, we must use lockless __skb_dequeue() since
lock is not anymore initialized.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Jamal Hadi Salim <hadi@xxxxxxxxxx>
Cc: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7d743b7e952261f4d9ee091100b6403f3ce8a2af
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Tue Dec 14 16:10:41 2010 +0000
sctp: fix the return value of getting the sctp partial delivery point
Get the sctp partial delivery point using SCTP_PARTIAL_DELIVERY_POINT
socket option should return 0 if success, not -ENOTSUPP.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Acked-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0d0b16727f24f8258eeb33818347ca0f4557f982
Author: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Date: Tue Dec 14 15:24:08 2010 +0000
net: Fix drivers advertising HW_CSUM feature to use csum_start
Some drivers are using skb_transport_offset(skb) instead of skb->csum_start
for NETIF_F_HW_CSUM offload. This does not matter now, but if someone
implements checksumming of encapsulated packets then this will break silently.
TSO output paths are left as they are, since they are for IP+TCP only
(might be worth converting though).
Signed-off-by: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 55508d601dab7df5cbcc7a63f4be8620eface204
Author: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Date: Tue Dec 14 15:24:08 2010 +0000
net: Use skb_checksum_start_offset()
Replace skb->csum_start - skb_headroom(skb) with skb_checksum_start_offset().
Note for usb/smsc95xx: skb->data - skb->head == skb_headroom(skb).
Signed-off-by: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 04fb451eff978ca059399eab83d5594b073caf6f
Author: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Date: Tue Dec 14 15:24:08 2010 +0000
net: Introduce skb_checksum_start_offset()
Introduce skb_checksum_start_offset() to replace repetitive calculation.
Signed-off-by: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0b7967503dc97864f283a3a06fbe23e041876138
Author: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Date: Tue Dec 14 12:35:13 2010 +0000
net/veth: Fix packet checksumming
We can't change ip_summed from CHECKSUM_PARTIAL to CHECKSUM_NONE
or CHECKSUM_UNNECESSARY because checksum in packet's headers is
not valid and will cause invalid checksum when frame is forwarded.
Signed-off-by: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 76d661586c8131453ba75a2e027c1f21511a893a
Author: David Stevens <dlstevens@xxxxxxxxxx>
Date: Tue Dec 14 08:42:16 2010 +0000
bridge: fix IPv6 queries for bridge multicast snooping
This patch fixes a missing ntohs() for bridge IPv6 multicast snooping.
Signed-off-by: David L Stevens <dlstevens@xxxxxxxxxx>
Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fcbdf09d9652c8919dcf47072e3ae7dcb4eb98ac
Author: Octavian Purdila <opurdila@xxxxxxxxxxx>
Date: Thu Dec 16 14:26:56 2010 -0800
net: fix nulls list corruptions in sk_prot_alloc
Special care is taken inside sk_port_alloc to avoid overwriting
skc_node/skc_nulls_node. We should also avoid overwriting
skc_bind_node/skc_portaddr_node.
The patch fixes the following crash:
BUG: unable to handle kernel paging request at fffffffffffffff0
IP: [<ffffffff812ec6dd>] udp4_lib_lookup2+0xad/0x370
[<ffffffff812ecc22>] __udp4_lib_lookup+0x282/0x360
[<ffffffff812ed63e>] __udp4_lib_rcv+0x31e/0x700
[<ffffffff812bba45>] ? ip_local_deliver_finish+0x65/0x190
[<ffffffff812bbbf8>] ? ip_local_deliver+0x88/0xa0
[<ffffffff812eda35>] udp_rcv+0x15/0x20
[<ffffffff812bba45>] ip_local_deliver_finish+0x65/0x190
[<ffffffff812bbbf8>] ip_local_deliver+0x88/0xa0
[<ffffffff812bb2cd>] ip_rcv_finish+0x32d/0x6f0
[<ffffffff8128c14c>] ? netif_receive_skb+0x99c/0x11c0
[<ffffffff812bb94b>] ip_rcv+0x2bb/0x350
[<ffffffff8128c14c>] netif_receive_skb+0x99c/0x11c0
Signed-off-by: Leonard Crestez <lcrestez@xxxxxxxxxxx>
Signed-off-by: Octavian Purdila <opurdila@xxxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2984961c388381c1830f95e1c2dc2137301b1009
Author: Ivan Vecera <ivecera@xxxxxxxxxx>
Date: Tue Dec 14 05:43:19 2010 +0000
be2net: use mutex instead of spin lock for mbox_lock
Since the mbox polling uses the schedule_timeout, the mbox_lock should be
a mutex and not a spin lock.
The commit f25b03a replaced udelay() with schedule_timeout() but didn't
change mbox_lock to semaphore or mutex.
Signed-off-by: Ivan Vecera <ivecera@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bc2ce894e113ed95b92541134b002fdc641e8080
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Dec 16 14:08:34 2010 -0800
tcp: relax tcp_paws_check()
Some windows versions have wrong RFC1323 implementations, with SYN and
SYNACKS messages containing zero tcp timestamps.
We relaxed in commit fc1ad92dfc4e363 the passive connection case
(Windows connects to a linux machine), but the reverse case (linux
connects to a Windows machine) has an analogue problem when tsvals from
windows machine are 'negative' (high order bit set) : PAWS triggers and
we drops incoming messages.
Fix this by making zero ts_recent value special, allowing frame to be
processed.
Based on a report and initial patch from Dmitiy Balakin
Bugzilla reference : https://bugzilla.kernel.org/show_bug.cgi?id=24842
Reported-by: dmitriy.balakin@xxxxxxxxxxxx
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 49c2fa08a77a7eefa4cbc73601f64984aceacfa7
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Wed Dec 8 09:47:48 2010 -0500
PCI: Update MCP55 quirk to not affect non HyperTransport variants
I wrote this quirk awhile ago to properly setup MCP55 chips on hypertransport
busses so that interrupts reached whatever cpu happend to boot the kdump kernel.
while that works well, it was recently shown to me that a a non-hypertransport
variant of the MCP55 exists, and on those system the register that this quirk
manipulates causes hangs if you write to it. Since the quirk was only meant to
handle errors found on MCP55 chips that have a HT interface, this patch adds a
filter to make sure the chip is an HT capable before making the needed register
adjustment. This lets the broken MCP55s work with kdump while not breaking the
non-HT variants.
Resolves https://bugzilla.kernel.org/show_bug.cgi?id=23952
Tested successfully by the reporter and myself.
Cc: stable@xxxxxxxxxx
Reported-by: Mathieu Bérard <mathieu@xxxxxxxxxx>
Acked-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 1121584f5db8a99a7ad94c6c5d62431b3187ad98
Author: H.J. Lu <hjl.tools@xxxxxxxxx>
Date: Wed Dec 15 17:11:22 2010 -0800
modpost: Put .zdebug* section on white list
"as --compress-debug-sections" will generate compressed debug sections
with section names ".zdebug*". This patch puts .zdebug* section on
white list.
Signed-off-by: H.J. Lu <hjl.tools@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 443457242beb6716b43db4d62fe148eab5515505
Author: Octavian Purdila <opurdila@xxxxxxxxxxx>
Date: Mon Dec 13 12:44:07 2010 +0000
net: factorize sync-rcu call in unregister_netdevice_many
Add dev_close_many and dev_deactivate_many to factorize another
sync-rcu operation on the netdevice unregister path.
$ modprobe dummy numdummies=10000
$ ip link set dev dummy* up
$ time rmmod dummy
Without the patch With the patch
real 0m 24.63s real 0m 5.15s
user 0m 0.00s user 0m 0.00s
sys 0m 6.05s sys 0m 5.14s
Signed-off-by: Octavian Purdila <opurdila@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5155e2c70fc50bc475911dab5dba2f80130523c7
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Wed Dec 8 13:37:08 2010 +0530
MSM: Add USB support for MSM7x30
Add USB OTG, peripheral and host devices. This patch also adds
usb_phy_clk which is required for resetting the PHY. VBUS power up
and shutdown routines depends on PMIC module. As PMIC driver is
unavailable, configure USB in peripheral only mode.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 7032d512cff979319f308e02223d0cf39b6e9a91
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Wed Dec 8 13:37:07 2010 +0530
MSM: Add USB suport for QSD8x50
OTG driver takes care of putting hardware into low power mode. Hence
make peripheral and host devices as children of OTG device and let
runtime PM takes care of notifying peripheral and host state to
OTG device. VBUS power up and shutdown routines are implemented by
modem processor. As RPC infrastructure is not available, configure
USB in peripheral only mode.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit c6c8fea29769d998d94fcec9b9f14d4b52b349d3
Author: Sven Eckelmann <sven@xxxxxxxxxxxxx>
Date: Mon Dec 13 11:19:28 2010 +0000
net: Add batman-adv meshing protocol
B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing
protocol for multi-hop ad-hoc mesh networks. The networks may be wired or
wireless. See http://www.open-mesh.org/ for more information and user space
tools.
Signed-off-by: Sven Eckelmann <sven@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c466cd2bb9cee2e576fc9663b828f51e322d7b4b
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 16 13:40:42 2010 -0800
USB: serial: ftdi_sio: add support for TIOCSERGETLSR
Willem-Jan noticed that the ftdi_sio driver did not support the
TIOCSERGETLSR ioctl, and some userspace programs rely on it. This patch
adds the support.
Reported-by: Willem-Jan de Hoog <wdehoog@xxxxxxxxxxxxxx>
Tested-by: Willem-Jan de Hoog <wdehoog@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0247a7bcd4273fa10c4aba9b3f567c659bab2d2b
Author: Fabio Estevam <festevam@xxxxxxxxx>
Date: Wed Dec 15 22:31:28 2010 -0200
USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
In order to read/write to the i.MX OTG viewport register it is necessary to setup
the PORTSCx register first.
By default i.MX OTG port is configured for USB serial PHY. In order to use a ULPI PHY
the PORTSCx register needs to be configured properly.
commit 724c852 (USB: ehci/mxc: compile fix) placed the PORTSC setup after the OTG
viewport is accessed and this causes ULPI read/write to fail.
Revert the PORTSC setup order.
Tested on a MX31PDK board with a ISP1504 transceiver:
ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
mxc-ehci mxc-ehci.0: initializing i.MX USB Controller
ULPI transceiver vendor/product ID 0x04cc/0x1504
Found NXP ISP1504 ULPI transceiver.
ULPI integrity check: passed.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2c8245c4990e75d86ab30bb0af9bb90cbe04985d
Author: Rob Emanuele <rje@xxxxxxxxxxxxxxxx>
Date: Tue Dec 14 19:00:30 2010 +0100
USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
Add a free_irq() call on vbus gpio when we remove udc so that the
vbus irq is properly released.
Signed-off-by: Rob Emanuele <rje@xxxxxxxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6ef9fc657bd69c708ada2ee9fd3b2e13f7600a3d
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Mon Dec 13 22:00:34 2010 +0530
usb: ehci-omap: fix tll channel enable mask
The TLL channel enable code searches for the wrong mask, and
could end up enabling the wrong port. Fix this.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a0c9e95dfc6898dbc178d7b962916f3823434e6e
Author: Keshava Munegowda <keshava_mgowda@xxxxxx>
Date: Mon Dec 13 22:00:51 2010 +0530
usb: ohci-omap3: fix trivial typo
This is the ohci-omap3 driver, not ehci-omap. Correct this
obvious typo.
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0a313c4d2435ed0d86cf2295514f02de34cecd88
Author: Artem Leonenko <tikkeri@xxxxxxxxx>
Date: Tue Dec 14 23:47:06 2010 -0800
USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
Page size for transaction descriptors for CI13XXX has nothing
common with page size from MM. Using platform and configuration
specific PAGE_SIZE is wrong.
Signed-off-by: Artem Leonenko <tikkeri@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7c25a82684364da44643cbe3bdbd0f8835293767
Author: Artem Leonenko <tikkeri@xxxxxxxxx>
Date: Tue Dec 14 23:46:55 2010 -0800
USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
CI13xxx UDC driver doesn't call complete() callback for requests
with flag no_interrupt set. Thus gadget drivers (like g_ether) are
never notifed about successfully (or not) transmitted requests. As
a result in case of g_ether and queued request with no_interrupt=1
fields g_ether is never notifed about sent packets and TX stalls.
Solution: treat no_interrupt flag like all other UDC drivers do and
call complete() callback for all requests.
Signed-off-by: Artem Leonenko <tikkeri@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d9bb9c1820cb2a7aeb5e42a5470cf208002d9aa8
Author: Artem Leonenko <tikkeri@xxxxxxxxx>
Date: Tue Dec 14 23:45:50 2010 -0800
USB: gadget: update ci13xxx to work with g_ether
There is one nasty scenario when CI13xxx driver fails:
a) two or more rx requests are queued (g_ether does that)
b) rx request completed, interrupt fires and ci13xxx dequeues rq
c) request complete() callback gets called and in turn it calls ep_queue()
c1) in ep_queue() request gets added to the TAIL of the rx queue list
d) ep gets primed with rq from (b)
e) interrupt fires
f) request gets popped from queue head for hw dequeue
G) requets from queue head wasn't enqueued
g1) isr_tr_complete_low() doesn't
enqueue more requests and it doesn't prime EP,
rx traffic stalls
Solution:
a) enque queued requests ASAP, i.e. before calling complete() callback.
b) don't HW enqueue and prime endpoint with recently added request and
use the oldest request in the queue.
Fixed issues:
a) ep_queue() may return an error code despite request was successfully
added to the queue (if _hardware_enqueue() fails)
b) Added requests are always processed in LIFO order, even if they are
added in complete() callback
c) Finally more than two and more queued requests are processed consistently,
even if they were added in complete() callback
The fix was successfully tested on MIPS based SoC with 4KEc CPU core and
CI13612 USB core. Board successfully boots with NFS root using g_ether
on ci13xxx udc.
Signed-off-by: Artem Leonenko <tikkeri@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6549e8b7f34b456d5689b98c2c0cf38c98414e47
Author: Artem Leonenko <tikkeri@xxxxxxxxx>
Date: Tue Dec 14 23:46:40 2010 -0800
USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
Built-in gadget drivers have NULL-ifed unbind() function. Checking
whether unbind() is NULL will never let any compiled into kernel
driver attach.
Signed-off-by: Artem Leonenko <tikkeri@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b236da6931e2482bfe44a7865dd4e7bb036f3496
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Tue Dec 14 03:09:15 2010 +0000
net: use NUMA_NO_NODE instead of the magic number -1
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit caafa84251b886feb6cdf23d50e2cc99dcdaaaf3
Author: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Date: Sun Dec 12 19:04:43 2010 +0000
bonding: add the debugfs interface to see RLB hash table
This patch provices the debugfs interface to see RLB hash table
like the following:
# cat /sys/kernel/debug/bonding/bond0/rlb_hash_table
SourceIP DestinationIP Destination MAC DEV
10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4
10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3
10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0
This is helpful to check if the receive load balancing works as expected.
Signed-off-by: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 411204a5a1ec1a35363d8ef450c77e2b8235da4d
Author: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Date: Sun Dec 12 19:03:24 2010 +0000
bonding: migrate some macros from bond_alb.c to bond_alb.h
This patch simply migrates some macros from bond_alb.c to bond_alb.h.
Signed-off-by: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ad6bad3efbb82206837daad8cba2bc9343d778bf
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:55 2010 +0000
cxgb4: NUMA-aware Tx queue allocations
Allocate Tx queue memory on the node indicated by the new
netdev_queue_numa_node_read.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 23d88e1d3e4a5b807ce6725f9294b7b9dfcd89a1
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:54 2010 +0000
cxgb4: extend VPD parsing
Current code parses the VPD RO section for keywords but makes static
assumptions about the location of the section. Remove them and parse
the VPD to find it.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 005b5717faac22264c1f61908ec5ac5b98108d99
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:53 2010 +0000
cxgb4: add const to static arrays
Patch originally from Joe Perches, unmodified.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8f3a76769ee50a839282f70d07d5f3429524b68a
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:52 2010 +0000
cxgb4: remove a bitmap
The driver keeps a bitmap of the netdevs it registered so it knows what to
unregister later. Remove that and look at reg_state instead.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b1a3c2b698ec333edc86bf8b5a636162ca309870
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:51 2010 +0000
cxgb4: remove the name field from the adapter structure
Remove a field the driver uses to keep track of the name of the first
netdev it manages to register. Do this by changing the registration
loop to stop the first time it fails so the first registered device is
trivial to tell.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ba27816cd8167c64652406d86ca78bcc5989f20f
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:50 2010 +0000
cxgb4: correct formatting of MSI-X interrupt names
The last byte of the buffer for MSI-X names could not be used due to a
bogus -1. Also do not explicitly clear the last byte, snprintf will do
the right thing.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8cd18ac47f9642bcd0d30d4b3521359b1896c208
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:49 2010 +0000
cxgb4: allocate more space for MSI-X interrupt names
Currently MSI-X names for netdevs with long names are truncated in
/proc/interrupts due to insufficient space. Use IFNAMSIZ to size the
needed space.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 118969ed21b6895045b0a5a8a32feac1c9341096
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:48 2010 +0000
cxgb4: print port information after registering each netdev
Print information about each port when its netdev is registered instead
of looping separately over the ports at the end. The bulk of this patch
is due to indentation change.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7d5e77aafa39f3210b6273a44fe07508e837c3cb
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:47 2010 +0000
cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports
And fix the supported flags ethtool reports for the two cases.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a57cabe09f843a3f71277c485494496b3b9ee84a
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:46 2010 +0000
cxgb4: set the number of queues before device registration
The number of queues is known early, move the calls to
netif_set_real_num_[rt]x_queues before register_netdev.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ec16400823ce63bc0cfe89df78c6b7bf4a4d684b
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:45 2010 +0000
cxgb4: do not read the clock frequency from VPD
No need to read the clock frequency from VPD, we already get it a bit
later from FW, after any potential adjustments.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ef306b50b983be4873aed453c1feeaab22f3a098
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Tue Dec 14 21:36:44 2010 +0000
cxgb4: enable PCIe relaxed ordering
Enable relaxed ordering for descriptor reads and packet I/O.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 986d730a696277520084180071ac4873aac63905
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 05:44:50 2010 +0000
bnx2x: update version to 1.62.00-2
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b0200e250b5eef29e5ed8aa17979499affcc11cd
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 22:34:37 2010 +0200
bnx2x: remove old FW files
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5928c8baf67a36f553fe23a1b7820c7745e8bb2e
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 05:44:35 2010 +0000
bnx2x: replace FW to 6.2.5
Includes FCoE releated fixes in FW flows
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 40392d4e49c29bf5e939803d804dc8c7b600f297
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 22:28:42 2010 +0200
bnx2x: add FW 6.2.5 files
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bcab15c5d780bafb38311f00fcb263d03d2b00f1
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 05:44:25 2010 +0000
bnx2x: Add DCB/PFC support - link layer
Add appropriate HW DCB/PFC configuration
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4901dde12d92b70dd13fa8b3bbc9df7a6129aab
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 05:44:18 2010 +0000
bnx2x: add DCB support
Adding DCB initialization and handling on 57712 FW/HW
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8307fa3e86a83924dd7f8310ce1e051f34986fe8
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 05:44:09 2010 +0000
bnx2x: add a select queue callback
This callback required to allow FCoE traffic to be
sent on separate priority queue from other L2 traffic,
which is managed by PFC in HW.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr@xxxxxxxxxxxx>
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ec6ba945211b1c1f97d3d19fe60f166c9a92241d
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 05:44:01 2010 +0000
bnx2x: add FCoE ring
Includes new driver structures and FW/HW configuration for FCoE ring
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr@xxxxxxxxxxxx>
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a3d22a68d752ccc1a01bb0a64dd70b7a98bf9e23
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Mon Dec 13 06:27:10 2010 +0000
bnx2x: Take the distribution range definition out of skb_tx_hash()
Move the calcualation of the Tx hash for a given hash range into a separate
function and define the skb_tx_hash(), which calculates a Tx hash for a
[0; dev->real_num_tx_queues - 1] hash values range, using this
function (__skb_tx_hash()).
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 35c64e5d13c3d7d8c4ad061ad5e20498b9160c24
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Thu Dec 16 13:06:35 2010 +0000
drivers: serial: apbuart: Handle OF failures gracefully
The apbuart driver depends on OF and relies on everything being
available. So if it's probed on a platform which has OF support, but
no device tree is available it crashes. Triggered by the upcoming x86
OF support in randconfig testing.
Further it's inconsistent vs. the probing and exiting from the
of_match loop.
Make it robust and consistent:
- check the availablility of OF nodes before dereferencing
- return -ENODEV when the device tree lookup fails
- return -ENODEV when no uart port configuration is found
- return -ENODEV when invalid uart port configuration is found
Remove the enum_done check while at it. Driver init functions are only
called once. Remove the pointless vendor and device queries as well.
Reported-by: Ingo Molnar <mingo.elte.hu>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Kristoffer Glembo <kristoffer@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3f960dbb9dfe29ff283810624c4340c79fde87f5
Author: Govindraj.R <govindraj.raja@xxxxxx>
Date: Thu Dec 16 18:12:47 2010 +0530
Serial: Avoid unbalanced IRQ wake disable during resume
To avoid unbalanced IRQ wake disable, ensure that wakeups are disabled
only when wakeups have been successfully enabled.
Tested on OMAP3630SDP/ZOOM3.
Signed-off-by: Govindraj.R <govindraj.raja@xxxxxx>
Reported-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6ce5b1ce5f6922db32599e73bcb22f5cdcbf241f
Author: Timur Tabi <timur@xxxxxxxxxxxxx>
Date: Mon Dec 13 14:08:53 2010 -0600
tty: fix typos/errors in tty_driver.h comments
Fix various typos and other errors in comments of tty_driver.h. The most
significant is the wrong name of a function for the description of
TTY_DRIVER_DYNAMIC_DEV.
Signed-off-by: Timur Tabi <timur@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1c5189976ffc130416e808f41049c12615a6380c
Author: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 16:13:29 2010 +0900
pch_uart : fix warnings for 64bit compile
Fix the following warnings
drivers/serial/pch_uart.c: In function â??dma_handle_rxâ??:
drivers/serial/pch_uart.c:685:24: warning: cast from pointer to integer of different size
drivers/serial/pch_uart.c: In function â??dma_handle_txâ??:
drivers/serial/pch_uart.c:778:23: warning: cast from pointer to integer of different size
drivers/serial/pch_uart.c: In function â??pch_uart_init_portâ??:
drivers/serial/pch_uart.c:1289:20: warning: cast to pointer from integer of different size
drivers/serial/pch_uart.c: In function â??pch_uart_exit_portâ??:
drivers/serial/pch_uart.c:1328:2: warning: cast from pointer to integer of different size
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Reported-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 093d804611b9a38fe59753b37c29f840518406a9
Author: Ken Mills <ken.k.mills@xxxxxxxxx>
Date: Mon Dec 13 15:28:03 2010 +0000
n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked
gsm_data_alloc buffer allocation could fail and it is not being checked.
Add check for allocated buffer and return if the buffer allocation
fails.
Signed-off-by: Ken Mills <ken.k.mills@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit be7a7411d63ccad165d66fe8e0b11b2ee336159b
Author: Ken Mills <ken.k.mills@xxxxxxxxx>
Date: Mon Dec 13 15:27:27 2010 +0000
n_gsm: Fix message length handling when building header
Fix message length handling when building header
When the message length is greater than 127, the length field in the header
is built incorrectly. According to the spec, when the length is less than 128
the length field is a single byte formatted as: bbbbbbb1. When it is greater
than 127 then the field is two bytes of the format: bbbbbbb0 bbbbbbbb.
Signed-off-by: Ken Mills <ken.k.mills@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f88a4a9b65a6f3422b81be995535d0e69df11bb8
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 13 08:20:24 2010 +0000
bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion
bond_na_send() attempts to insert a VLAN tag in between building and
sending packets of the respective formats. If the slave does not
implement hardware VLAN tag insertion then vlan_put_tag() will mangle
the network-layer header because the Ethernet header is not present at
this point (unlike in bond_arp_send()).
Fix this by adding the tag out-of-line and relying on
dev_hard_start_xmit() to insert it inline if necessary.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Reviewed-by: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ffa95ed50f9fb2d8faaa6bd73086a7056ea46a06
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 13 08:19:56 2010 +0000
bonding: Change active slave quietly when bond is down
bond_change_active_slave() may be called when a slave is added, even
if the bond has not been brought up yet. It may then attempt to send
packets, and further it may use mcast_work which is uninitialised
before the bond is brought up. Add the necessary checks for
netif_running(bond->dev).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8387451e558853f7b513790c0070e3b6f0c135aa
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 13 08:19:28 2010 +0000
bonding/vlan: Remove redundant VLAN tag insertion logic
A bond may have a mixture of slave devices with and without hardware
VLAN tag insertion capability. Therefore it always claims this
capability and performs software VLAN tag insertion if the slave does
not.
Since commit 7b9c60903714bf0a19d746b228864bad3497284e, this has
also been done by dev_hard_start_xmit(). The result is that VLAN-
tagged skbs are now double-tagged when transmitted through slave
devices without hardware VLAN tag insertion!
Remove the now-redundant logic from bond_dev_queue_xmit().
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Reviewed-by: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 42dccd1f757d674a6604077a61d1577d1578c755
Author: Ken Kawasaki <ken_kawasaki@xxxxxxxxxxxxxxx>
Date: Mon Dec 13 02:27:24 2010 +0000
axnet_cs: move id (0x1bf, 0x2328) to axnet_cs
axnet_cs:
Accton EN2328 or compatible (id: 0x01bf, 0x2328) uses Asix chip.
So it works better with axnet_cs instead of pcnet_cs.
Signed-off-by: Ken Kawasaki <ken_kawasaki@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 45241e50e3e741ee2a148693888b48e90e806de9
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 13 16:23:36 2010 -0800
Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
Correct issue with not checking kmalloc return value.
This fix now only uses one receive buffer for all hv_utils
channels, and will do only one kmalloc on init and will return
with a -ENOMEM if kmalloc fails on initialize.
And properly clean up memory on failure.
Thanks to Evgeniy Polyakov <zbr@xxxxxxxxxxx> for pointing this out.
And thanks to Jesper Juhl <jj@xxxxxxxxxxxxx> and Ky Srinivasan
<ksrinivasan@xxxxxxxxxx> for suggesting a better implementation of
my original patch.
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Reviewed-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Cc: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Ky Srinivasan <ksrinivasan@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 244ba85606b567e6e990d2fac61e3bde5ff8f0ad
Author: Timo Teräs <timo.teras@xxxxxx>
Date: Wed Dec 15 20:48:10 2010 +0200
staging: hv: remove unneeded osd_schedule_callback
No one calls it anymore, so remove it.
Reviewed-By: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Timo Teräs <timo.teras@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4b2f9abea52af3782d349080fca5e189b0693792
Author: Timo Teräs <timo.teras@xxxxxx>
Date: Wed Dec 15 20:48:09 2010 +0200
staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
The additional abstraction is unneeded.
The three calls are assumed to not be pending simultaneously:
- vmbus_onoffer queues work exactly once when a new channel is
created, the channel is not attached to lists until the work
is executed
- vmbus_onoffer_rescind is received only when the channel is
active it is enough to process the work once
- free_channel is called exactly once when the channel is getting
destroyed; I assumed that vmbus_process_rescind_offer cannot be
pending while free_channel is called
Reviewed-By: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Timo Teräs <timo.teras@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit bf6506f60c46c8a709df534408cc6d470df657ff
Author: Timo Teräs <timo.teras@xxxxxx>
Date: Wed Dec 15 20:48:08 2010 +0200
staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
The additional abstraction is unneeded. This also fixes a sleeping
while atomic issue as osd_schedule_callback can sleep which is
not allowed for vmbus_on_msg_dpc running in a tasklet.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16701
Reviewed-By: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Timo Teräs <timo.teras@xxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d3052b557a1c94c21f50465702fa886753ce6b43
Author: Andrey Vagin <avagin@xxxxxxxxxx>
Date: Sat Dec 11 15:20:11 2010 +0000
ipv6: delete expired route in ip6_pmtu_deliver
The first big packets sent to a "low-MTU" client correctly
triggers the creation of a temporary route containing the reduced MTU.
But after the temporary route has expired, new ICMP6 "packet too big"
will be sent, rt6_pmtu_discovery will find the previous EXPIRED route
check that its mtu isn't bigger then in icmp packet and do nothing
before the temporary route will not deleted by gc.
I make the simple experiment:
while :; do
time ( dd if=/dev/zero bs=10K count=1 | ssh hostname dd of=/dev/null ) || break;
done
The "time" reports real 0m0.197s if a temporary route isn't expired, but
it reports real 0m52.837s (!!!!) immediately after a temporare route has
expired.
Signed-off-by: Andrey Vagin <avagin@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4528696d803749892eac27422a6fd7748cffee1
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Dec 14 12:51:52 2010 -0800
staging: brcm80211: Fix WL_<type> logging macros
These macros use the equivalent of "#define WL_<type>(x) printk x"
which requires an extra level of parentheses.
Convert the macros to use the normal WL_<type>(fmt, args...) style
and remove the extra parentheses from the uses.
Add format argument verification using no_printk as appropriate.
Couple of spelling typo fixes in the formats and argument alignment
at the same time. Also coalesced long formats.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit af3e5bd5f650163c2e12297f572910a1af1b8236
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date: Fri Dec 10 18:54:11 2010 +0000
bonding: Fix slave selection bug.
The returned slave is incorrect, if the net device under check is not
charged yet by the master.
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 12b9d5bf76bfa20d3207ef24fca9c8254a586a58
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Tue Dec 14 17:04:02 2010 +0100
Staging: IIO: DDS: AD9833 / AD9834 driver
Changes since RFC/v1:
IIO: Apply list review feedback
Apply list review feedback:
Rename attributes to fit IIO convention used in other drivers.
Fix typos.
Provide ddsX_out_enable as opposed to ddsX_out_disable.
Use proper __devexit marking.
Use strict_strtoul() to avoid negatives.
Changes since v2:
IIO: ad9834.c: Apply more list review feedback
Update use of dds convenience macros.
Fix tabbing.
Remove superfluous brackets.
Keep output disabled after probe.
Remove unnecessary code.
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Reviewed-by: Datta Shubhrajyoti <shubhrajyoti@xxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4851d97d87c8dfa8c97037965690cdefe99a767d
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Tue Dec 14 17:04:01 2010 +0100
Staging: IIO: dds.h convenience macros
Changes since RFC/v1:
IIO: Apply list review feedback
Apply list review feedback:
Rename attributes to fit IIO convention used in other drivers.
Provide ddsX_out_enable as opposed to ddsX_out_disable.
Fix typos.
Changes since v2:
IIO: dds.h: Apply more list review feedback
Fix mixture of X and [n] notation for indices.
Remove duplicated descriptions.
Add store methods to some dds convenience macros.
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Reviewed-by: Jonathan Cameron <jic23@xxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f8ce33bbd57a0c9c302ebb273fd963c5efb1a264
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Tue Dec 14 17:04:00 2010 +0100
Staging: IIO: Direct digital synthesis abi documentation
Changes since RFC/v1:
IIO: Apply list review feedback:
Apply list review feedback:
Restructure documentation according to list feedback.
Rename attributes to fit IIO convention used in other drivers.
Fix typos.
Provide ddsX_out_enable as opposed to ddsX_out_disable
Changes since v2:
IIO: sysfs-bus-iio-dds: Apply more list review feedback
Fix mixture of X and [n] notation for indices.
Fix some wording in the descriptions.
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8a09d6d80c90c02f2f8c89f69c702cab0c8d9b42
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Thu Dec 16 11:13:57 2010 -0600
rtlwifi: Switch locking from semaphores to mutexes
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3cf0c8ad94ba1ba241b970cd19c11a4f3cea93c2
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Thu Dec 16 09:13:21 2010 -0600
rtl8192ce: Update MAINTAINERS
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f15a4bb2637253680f09f0161d51e22446b6478f
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 16 16:22:20 2010 +0900
ath5k: Fix survey
The old survey implementation was broken and returned nonsense data.
Clear cycle counters and survey data on reset. Since the cycle counters easily
overflow it's better to keep a local version of collected survey data (in ms
resolution, instead of clockrate) and update this every time survey is
retrieved. If survey is retrieved often enough to avoid cycle counter overflows
this works fine, otherwise we could update survey more often, like ath9k does.
Still only the survey for the current channel is kept.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4aea248dd7a67097d683a97f94a0aeaf0d248f3f
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Wed Dec 15 22:55:34 2010 -0600
rtl8192ce: Fix build on powerpc
After merge of the rtl8192ce driver, a powerpc build fails with:
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_init_sw_vars':
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: error: implicit declaration of function 'vmalloc'
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: warning: cast to pointer from integer of different size
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_deinit_sw_vars':
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:91: error: implicit declaration of function 'vfree'
The problem is fixed by explicitly including the appropriate header.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 931299cf87701962ea1811dc216f48f3f7a4ebc8
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Dec 15 19:24:12 2010 -0800
ath: fix NULL pointer dereference on reg_notifier()
The reg_notifier() was recently updated as being capable of
having the request passed as NULL, fix ath to follow this API
change. Without this we end up oopsing:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
IP: [<ffffffffa02fb8cb>] ath_reg_notifier_apply+0x5b/0xa0 [ath]
PGD b4c4c067 PUD b4c4d067 PMD 0
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
last sysfs file: /sys/devices/pci0000:00/0000:00:1b.0/uevent
CPU 1
Modules linked in: <etc>
Pid: 436, comm: modprobe Not tainted 2.6.37-rc5-wl+ #36 6460DWU/6460DWU
RIP: 0010:[<ffffffffa02fb8cb>] [<ffffffffa02fb8cb>] ath_reg_notifier_apply+0x5b/0xa0 [ath]
RSP: 0018:ffff8800b6f6baa8 EFLAGS: 00010246
RAX: ffff8800b527b254 RBX: ffff8800b532c180 RCX: 0000000000000018
RDX: ffff8800b530c108 RSI: 0000000000000000 RDI: ffff8800b532c180
RBP: ffff8800b6f6baa8 R08: ffff8800b532f268 R09: 0000000000000235
R10: 00000000000016ad R11: 0000000000000018 R12: 0000000000000000
R13: 0000000000000016 R14: ffff8800b532f268 R15: 0000000000000011
FS: 00007f0c53104700(0000) GS:ffff8800bed00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000004 CR3: 00000000b6531000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process modprobe (pid: 436, threadinfo ffff8800b6f6a000, task ffff8800b404dc40)
Stack:
ffff8800b6f6bac8 ffffffffa03ea651 ffff8800b532c180 ffff8800b527b254
ffff8800b6f6bb38 ffffffffa01835ca ffffffffa019ed00 00000000a019ed80
0000000000000002 ffff880000000002 ffffffffa0366140 0000000010aee572
Call Trace:
[<ffffffffa03ea651>] ath9k_reg_notifier+0x41/0x50 [ath9k]
[<ffffffffa01835ca>] wiphy_update_regulatory+0x4ba/0x5a0 [cfg80211]
[<ffffffffa0366140>] ? ieee80211_register_hw+0xa0/0x5b0 [mac80211]
[<ffffffffa0366140>] ? ieee80211_register_hw+0xa0/0x5b0 [mac80211]
[<ffffffffa017f994>] wiphy_register+0x1d4/0x360 [cfg80211]
[<ffffffff8114b918>] ? __kmalloc+0x108/0x1c0
[<ffffffffa0366223>] ieee80211_register_hw+0x183/0x5b0 [mac80211]
[<ffffffffa03eb49b>] ath9k_init_device+0x66b/0x850 [ath9k]
[<ffffffffa03f9dd6>] ath_pci_probe+0x2f6/0x3c0 [ath9k]
[<ffffffff81037529>] ? default_spin_lock_flags+0x9/0x10
[<ffffffff812e19cf>] local_pci_probe+0x5f/0xd0
[<ffffffff812e2bf1>] pci_device_probe+0x101/0x120
[<ffffffff81390aca>] ? driver_sysfs_add+0x7a/0xb0
[<ffffffff81390c26>] driver_probe_device+0x96/0x1c0
[<ffffffff81390deb>] __driver_attach+0x9b/0xa0
[<ffffffff81390d50>] ? __driver_attach+0x0/0xa0
[<ffffffff81390008>] bus_for_each_dev+0x68/0x90
[<ffffffff81390a4e>] driver_attach+0x1e/0x20
[<ffffffff81390309>] bus_add_driver+0xe9/0x290
[<ffffffffa0407000>] ? ath9k_init+0x0/0x4d [ath9k]
[<ffffffff81391130>] driver_register+0x80/0x150
[<ffffffffa0407000>] ? ath9k_init+0x0/0x4d [ath9k]
[<ffffffffa0407000>] ? ath9k_init+0x0/0x4d [ath9k]
[<ffffffff812e2e76>] __pci_register_driver+0x56/0xd0
[<ffffffffa03f9ec3>] ath_pci_init+0x23/0x30 [ath9k]
[<ffffffffa040702b>] ath9k_init+0x2b/0x4d [ath9k]
[<ffffffff81002053>] do_one_initcall+0x43/0x190
[<ffffffff8109fb5b>] sys_init_module+0xbb/0x200
[<ffffffff8100c042>] system_call_fastpath+0x16/0x1b
Code: <who even reads this anyway? haha, ok you do>
RIP [<ffffffffa02fb8cb>] ath_reg_notifier_apply+0x5b/0xa0 [ath]
RSP <ffff8800b6f6baa8>
CR2: 0000000000000004
---[ end trace 6d03d3c7eda9f06b ]---
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2784fe915cd25adf23ea28534019308d8a144721
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Dec 15 19:24:11 2010 -0800
cfg80211: fix null pointer dereference with a custom regulatory request
Once we moved the core regulatory request to the queue and let
the scheduler process it last_request will have been left NULL
until the schedular decides to process the first request. When
this happens and we are loading a driver with a custom regulatory
request like all Atheros drivers we end up with a NULL pointer
dereference. We fix this by checking if the request was a
custom one.
BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
IP: [<ffffffffa016de87>] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211]
PGD 71f91067 PUD 712b2067 PMD 0
Oops: 0000 [#1] PREEMPT SMP
last sysfs file: /sys/devices/pci0000:00/0000:00:1d.7/usb2/2-1/firmware/2-1/loading
CPU 0
Modules linked in: ath9k_htc(+) ath9k_common ath9k_hw ath <etc>
Pid: 3094, comm: insmod Tainted: G W 2.6.37-rc5-wl #16 INVALID/28427ZQ
RIP: 0010:[<ffffffffa016de87>] [<ffffffffa016de87>] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211]
RSP: 0018:ffff88007045db78 EFLAGS: 00010282
RAX: 0000000000000000 RBX: ffffffffa047d9a0 RCX: ffff88007045dbd0
RDX: 0000000000004e20 RSI: 000000000024cde0 RDI: ffff8800700483e0
RBP: ffff88007045db98 R08: ffffffffa02f5b40 R09: 0000000000000001
R10: 000000000000000e R11: 0000000000000001 R12: 0000000000000000
R13: ffff88007004e3b0 R14: 0000000000000000 R15: ffff880070048340
FS: 00007f635a707700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000004 CR3: 00000000708a9000 CR4: 00000000000006f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process insmod (pid: 3094, threadinfo ffff88007045c000, task ffff8800713e3ec0)
Stack:
ffffffffa047d9a0 0000000000000000 ffff88007004e3b0 0000000000000000
ffff88007045dc08 ffffffffa016e147 000000007045dc08 0000000000000002
ffff8800700483e0 ffffffffa02f5b40 ffff88007045dbd8 0000000000000000
Call Trace:
[<ffffffffa016e147>] wiphy_apply_custom_regulatory+0x137/0x1d0 [cfg80211]
[<ffffffffa047a690>] ? ath9k_reg_notifier+0x0/0x50 [ath9k_htc]
[<ffffffffa02f47f7>] ath_regd_init+0x347/0x430 [ath]
[<ffffffffa047b1f5>] ath9k_htc_probe_device+0x6c5/0x960 [ath9k_htc]
[<ffffffffa0472a2c>] ath9k_htc_hw_init+0xc/0x30 [ath9k_htc]
[<ffffffffa04747e6>] ath9k_hif_usb_probe+0x216/0x3b0 [ath9k_htc]
[<ffffffffa03bb6bc>] usb_probe_interface+0x10c/0x210 [usbcore]
[<ffffffff812aec26>] driver_probe_device+0x96/0x1c0
[<ffffffff812aedf3>] __driver_attach+0xa3/0xb0
[<ffffffff812aed50>] ? __driver_attach+0x0/0xb0
[<ffffffff812adaae>] bus_for_each_dev+0x5e/0x90
[<ffffffff812ae8c9>] driver_attach+0x19/0x20
[<ffffffff812ae438>] bus_add_driver+0x168/0x320
[<ffffffff812af071>] driver_register+0x71/0x140
[<ffffffff811fc4a8>] ? __raw_spin_lock_init+0x38/0x70
[<ffffffffa03ba39c>] usb_register_driver+0xdc/0x190 [usbcore]
[<ffffffffa03a2000>] ? ath9k_htc_init+0x0/0x4f [ath9k_htc]
[<ffffffffa047499e>] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc]
[<ffffffffa03a202b>] ath9k_htc_init+0x2b/0x4f [ath9k_htc]
[<ffffffff8100212f>] do_one_initcall+0x3f/0x180
[<ffffffff8109ef5b>] sys_init_module+0xbb/0x200
[<ffffffff8100bf52>] system_call_fastpath+0x16/0x1b
Code: <etc, who cares>
RIP [<ffffffffa016de87>] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211]
RSP <ffff88007045db78>
CR2: 0000000000000004
---[ end trace 79e4193601c8b713 ]---
Reported-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 45ef6a0bcc9cd8f13004789ec6decb52e1d3045c
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:53 2010 -0800
ath9k_hw: Configure appropriate Tx power when PAPRD fails
Target Tx power available in eeprom is for PAPRD. If PAPRD
fails, paprd scale factor needs to be detected from this
target tx power.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7072bf62fb7abe5a91389d6271da520f29c79326
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:52 2010 -0800
ath9k_hw: Disable PAPRD for rates with low Tx power
When the drop in Tx power for a particular mcs rate exceeds
the paprd scale factor, paprd may not work properly. Disable
paprd for any such rates.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8698bca6b53d1f6641850b270de9c953078ed1ce
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:51 2010 -0800
ath9k_hw: Add a helper to get paprd scale factor
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0b2084bc578128be866d6fc9926ed887c3432bb1
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:50 2010 -0800
ath9k_hw: Tx IQ cal changes for AR9003
Add multiple Tx IQ cal support to improve EVM accross
different power levels.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 895ad7eb21ed228444169dbbff44f3dccfc7e006
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:49 2010 -0800
ath9k_hw: Move get_streams() to hw.h
This helper can be used in multiple places. Also make
it inline returning u8.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d8a8440e3f1f0cdd23074c6d2d8cbbde204a4374
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:48 2010 -0800
ath9k_hw: Remove unnecessary Rx IQ cal register configuration in ar9003_hw_tx_iq_cal()
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7e68b746681289c00e8fd818fdd0144c6896d425
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Dec 15 07:30:47 2010 -0800
ath9k_hw: Remove delay during regwrite of analog shift registers
This is not needed for AR9003.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cf4e594ea7e55555e81647b74a3a8e8b2826a529
Author: Jouni Malinen <j@xxxxx>
Date: Thu Dec 16 00:52:40 2010 +0200
nl80211: Add notification for dropped Deauth/Disassoc
Add a new notification to indicate that a received, unprotected
Deauthentication or Disassociation frame was dropped due to
management frame protection being in use. This notification is
needed to allow user space (e.g., wpa_supplicant) to implement
SA Query procedure to recover from association state mismatch
between an AP and STA.
This is needed to avoid getting stuck in non-working state when MFP
(IEEE 802.11w) is used and a protected Deauthentication or
Disassociation frame is dropped for any reason. After that, the
station would silently discard any unprotected Deauthentication or
Disassociation frame that could be indicating that the AP does not
have association for the STA (when the Reason Code would be 6 or 7).
IEEE Std 802.11w-2009, 11.13 describes this recovery mechanism.
Signed-off-by: Jouni Malinen <j@xxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5928b91acae97622a6f2e679eb7a9f19bed68e3e
Merge: 7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6 248daa084cee4b212ff4408e9c9b05b3bdc0da0d
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 16 15:21:33 2010 -0500
Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
commit fcbdbed01633bac6271708d86d569e06ed3e4c34
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:57:04 2010 -0800
staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
Remove now unused #define.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d7ec915abc98795a4cb88e369e2918696dd0ea01
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:57:03 2010 -0800
staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d659a3ec838866482779f594c4520f553468c492
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:57:02 2010 -0800
staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b8d6307894a73a10be6395b8ed3ffb3cb9255f9d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:57:01 2010 -0800
staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
Add an #include of <linux/if_ether.h> to include/proto/ethernet.h
Convert ETHER_ADDR_LEN, remove the #define for ETHER_ADDR_LEN.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ed9568687e82c56017ca1aacf6eda9902939bf4a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:57:00 2010 -0800
staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
Use the normal kernel calls and remove the #defines
for ETHER_IS_BCAST and ETHER_IS_NULLADDR.
Add #include for etherdevice.h where necessary.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 47c6de7d37619d105de0367aece9ab10288225bc
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:56:59 2010 -0800
staging: brcm80211: Remove unused ether_<foo> #defines and struct
These are unused, just remove them.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3ca5ada504a41d9a8afd1e25f85f11d1761efa5f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:56:58 2010 -0800
staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
Use the standard kernel function.
Change callers to add .octet to addressing to avoid warnings.
Add #include <linux/etherdevice.h> where necessary.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ee417a79567030ce726e9627aa52779e47c49ff0
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 16:56:57 2010 -0800
staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c9c62f4e2c9b526c5cbade3f3a61f126e6587c16
Author: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Date: Wed Dec 15 19:44:20 2010 +0200
Staging: comedi: Fix checkpatch.pl issues in file s526.c
This patch fixes the following issues in s526.c:
WARNING: printk() should include KERN_ facility level
WARNING: line over 80 characters
ERROR: do not use C99 // comments
WARNING: space prohibited between function name and open parenthesis '('
WARNING: braces {} are not necessary for any arm of this statement
WARNING: suspect code indent for conditional statements (16, 16)
Signed-off-by: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3555a4c35e59c0217983f5df0cfe39a9fa65c2df
Author: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Date: Wed Dec 15 00:14:30 2010 +0200
Staging: comedi: Fix coding style issues in ii_pci20kc.c
This patch fixes the following issues in file ii_pci20kc.c:
WARNING: please, no space before tabs
WARNING: unnecessary whitespace before a quoted newline
WARNING: line over 80 characters
Signed-off-by: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 91cda632ebc6ea84fd7a45efb6d4452c34985731
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Tue Dec 14 14:02:55 2010 +0100
staging: ft1000: Fix kernel panic when use ioctl.
During ioctl testing was observed kernel panic beuase
file->private_data pointer was not correctly set when
debugfs file was created. Add correct pointer setup.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0ce72ea3b2f29e5755b095a5b217b9bab8386a03
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Tue Dec 14 14:02:54 2010 +0100
staging: ft1000: Fix camelcase variable names.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c346541f3d8c6e90b6aadc0511c27a6de15fdee5
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Tue Dec 14 09:42:28 2010 +0100
staging: ft1000: Rename ft1000_chdev.c to ft1000_debug.c.
Name of old file was misleading because it is currently
updated to debugfs so change also file name.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dab56ffe9acc59a6cbe8f857a95adf75f42970b9
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Tue Dec 14 09:42:27 2010 +0100
staging: ft1000: Fix camelcase function names.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8c3d90921604951e306a898669c46a88578c5848
Author: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Date: Tue Dec 14 02:01:55 2010 +0100
Staging: rt2860: Sanitize DBGPRINT_ERR macro
Cleaner implementation. Avoids the need of the double parenthesis to call the
macro.
Signed-off-by: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3be305fd7c0d07cdbb175467b4fe706ea10eb732
Author: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Date: Tue Dec 14 02:01:54 2010 +0100
Staging: rt2860: include KERN_* in printk
Fix checkpatch complains.
Signed-off-by: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c9bace7ca1e2aeb95754ebc92c8f88a9f215691d
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 11 14:52:45 2010 -0700
MIPS: Add a CONFIG_FORCE_MAX_ZONEORDER Kconfig option.
For huge page support with base page size of 16K or 32K, we have to
increase the MAX_ORDER so that huge pages can be allocated.
[Ralf: I don't think a user should have to configure obscure constants like
this but for the time being this will have to suffice.]
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1685/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 82b89152f00f7ad17844d5614d5011e8d7944ac9
Author: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
Date: Sun Oct 10 10:42:12 2010 +0100
MIPS: LD/SD o32 macro GAS fix update
I am about to commit:
http://sourceware.org/ml/binutils/2010-10/msg00033.html
that fixes a problem with the LD/SD macro currently implemented by GAS for
the o32 ABI in an inconsistent way. This is best illustrated with a
simple program, which I'm copying here from the message above for easier
reference:
$ cat ld.s
ld $5,32767($4)
ld $5,32768($4)
This gets assebled into the following output:
$ mips-linux-as -32 -mips3 -o ld.o ld.s
$ mips-linux-objdump -d ld.o
ld.o: file format elf32-tradbigmips
Disassembly of section .text:
00000000 <.text>:
0: dc857fff ld a1,32767(a0)
4: 3c010001 lui at,0x1
8: 00810821 addu at,a0,at
c: 8c258000 lw a1,-32768(at)
10: 8c268004 lw a2,-32764(at)
...
Oops!
The GAS fix makes the macro behave in a consistent way and pairs of LW/SW
instructions to be output as appropriate regardless of the size of the
offset associated with the address used. The machine instruction is still
available, but to reach it macros have to be disabled first. This has a
side effect of requiring the use of a machine-addressable memory operand.
As some platforms require 64-bit operations for accesses to some I/O
registers LD/SD instructions are used in a couple of places in Linux
regardless of the ABI selected. Here's a fix for some pieces of code
affected I've been able to track down. The fix should be backwards
compatible with all supported binutils releases in existence and can be
used as a reference for any other places or off-tree code. The use of the
"R" constraint guarantees a machine-addressable operand.
Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1680/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit cf745a39dcb10ef80c4a2ff38448f57b69d4c4eb
Author: Manuel Lauss <manuel.lauss@xxxxxxxxxxxxxx>
Date: Mon Oct 25 18:44:11 2010 +0200
MIPS: Alchemy: fix build with SERIAL_8250=n
In commit 7d172bfe ("Alchemy: Add UART PM methods") I introduced
platform PM methods which call a function of the 8250 driver;
this patch works around link failures when the kernel is built
without 8250 support.
Signed-off-by: Manuel Lauss <manuel.lauss@xxxxxxxxxxxxxx>
To: Linux-MIPS <linux-mips@xxxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1737/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit a3aad4aaf871045ab1dd9c99be6c1ace881d8eb0
Author: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Date: Thu Dec 9 19:14:09 2010 +0000
MIPS: Rename mips_dma_cache_sync back to dma_cache_sync
This fixes IP22 and IP28 build errors.
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit d002aaadf84c081623a0a8502c122d1492fbd47c
Author: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Date: Wed Dec 1 17:33:17 2010 +0000
MIPS: MT: Fix typo in comment.
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 3f84622d7c7818077f5e6cf4b8a0d1b10dc65147
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Nov 27 19:26:32 2010 +0100
SSB: Fix nvram_get on BCM47xx platform
The nvram_get function was never in the mainline kernel, it only existed in
an external OpenWrt patch. Use nvram_getenv function, which is in mainline
and use an include instead of an extra function declaration. et0macaddr
contains the mac address in text from like 00:11:22:33:44:55. We have to
parse it before adding it into macaddr.
nvram_parse_macaddr will be merged into asm/mach-bcm47xx/nvram.h through
the MIPS git tree and will be available soon. It will not build now without
nvram_parse_macaddr, but it hasn't before either.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: mb@xxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Acked-by: Michael Buesch <mb@xxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1849/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 1690a7f9ab83f5c823f3044275a4a771a059d5bb
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Nov 27 17:46:01 2010 +0100
MIPS: BCM47xx: Swap serial console if ttyS1 was specified.
Some devices like the Netgear WGT634U are using ttyS1 for default console
output. We should switch to that console if it was given in the kernel_args
parameters.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1848/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 59833fcf48ee7b7c8a01e590aa7b7212305c3077
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Nov 27 17:46:00 2010 +0100
MIPS: BCM47xx: Use sscanf for parsing mac address
Instead of writing own function for parsing the mac address we now
use sscanf.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1847/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 2aa088d6fd8a6c6e6020ea46b70141f0b7ccf5d2
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Nov 27 17:45:59 2010 +0100
MIPS: BCM47xx: Fill values for b43 into SSB sprom
Fill the sprom with all available values from the nvram. Most of these
new values are needed for the b43 or b43legacy driver.
Parts of this patch have been in OpenWRT for a long time and were written
by Michael Buesch.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1846/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 825710843640dd173bc4b2ea99f1296923e4aa06
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Nov 27 17:45:58 2010 +0100
MIPS: BCM47xx: Do not read config from CFE
The config options read out here are not stored in CFE but only in NVRAM on
the devices. Remove reading from CFE and only access the NVRAM. Reading out
CFE does not harm but is useless here.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1845/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit e31fee7c3a197d88d1d0ced0e8600386da27fec4
Author: Thomas Chou <thomas@xxxxxxxxxxxxx>
Date: Wed Nov 24 15:35:48 2010 +0800
MIPS: FDT size is a be32
The totalsize field was be32. And the reserve bootmem would cause failure.
Signed-off-by: Thomas Chou <thomas@xxxxxxxxxxxxx>
To: devicetree-discuss@xxxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: linux-mips@xxxxxxxxxxxxxx
Cc: grant.likely@xxxxxxxxxxxx
Cc: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Cc: Dezhong Diao <dediao@xxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1838/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 5878fc936aebf592cca418ca50773cd578f7daf4
Author: Kevin Cernekee <cernekee@xxxxxxxxx>
Date: Tue Nov 23 10:26:44 2010 -0800
MIPS: Fix CP0 COUNTER clockevent race
Consider the following test case:
write_c0_compare(read_c0_count());
Even if the counter doesn't increment during execution, this might not
generate an interrupt until the counter wraps around. The CPU may
perform the comparison each time CP0 COUNT increments, not when CP0
COMPARE is written.
If mips_next_event() is called with a very small delta, and CP0 COUNT
increments during the calculation of "cnt += delta", it is possible
that CP0 COMPARE will be written with the current value of CP0 COUNT.
If this is detected, the function should return -ETIME, to indicate
that the interrupt might not have actually gotten scheduled.
Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1836/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 190fca3e40a65303eac35ac4fbae4f1f1342431c
Author: Kevin Cernekee <cernekee@xxxxxxxxx>
Date: Tue Nov 23 10:26:45 2010 -0800
MIPS: Fix regression on BCM4710 processor detection
BCM4710 uses the BMIPS32 core (like BCM6345), not the MIPS 4Kc core as
was previously believed.
Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
Tested-by: Alexandros C. Couloumbis <alex@xxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1837/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 4afdea81821880d0fc35e6c7ff54eeed9ec0614d
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Thu Nov 11 19:08:52 2010 +0100
MIPS: JZ4740: Fix pcm device name
As part the ASoC multi-component patch (commit f0fba2ad) the jz4740 pcm
driver was renamed to 'jz4740-pcm-audio'. Adjust the device name
accordingly.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1770/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit e5674ad6ca9f1020c2bcc009a55becba3c30d8a3
Author: Tony Wu <tung7970@xxxxxxxxx>
Date: Wed Nov 10 21:48:15 2010 +0800
MIPS: Separate two consecutive loads in memset.S
partial_fixup is used in noreorder block.
Separating two consecutive loads can save one cycle on processors with
GPR intrelock and can fix load-use on processors that need a load delay slot.
Also do so for fwd_fixup.
[Ralf: Only R2000/R3000 class processors are lacking the the load-user
interlock and even some of those got it retrofitted. With R2000/R3000
being fairly uncommon these days the impact of this bug should be minor.]
Signed-off-by: Tony Wu <tung7970@xxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1768/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 515b029d005b5694cf612a0a5ca6f861a7e45362
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Thu Oct 21 16:32:26 2010 -0700
MIPS: Send proper signal and siginfo on FP emulator faults.
We were unconditionally sending SIGBUS with an empty siginfo on FP
emulator faults. This differs from what happens when real floating
point hardware would get a fault.
For most faults we need to send SIGSEGV with the faulting address
filled in in the struct siginfo.
Reported-by: Camm Maguire <camm@xxxxxxxxxxxxxxxxx>
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Camm Maguire <camm@xxxxxxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1727/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 0bc6791707694c77b3543de39f77972a65de917a
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date: Sun Oct 31 23:49:58 2010 +0100
MIPS: AR7: Fix loops per jiffies on TNETD7200 devices
TNETD7200 run their CPU clock faster than the default CPU clock we assume.
In order to have the correct loops per jiffies settings, initialize clocks right
before setting mips_hpt_frequency. As a side effect, we can no longer use
msleep in clocks.c which requires other parts of the kernel to be initialized,
so replace these with mdelay.
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1749/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit ff42d62047e45075c54a5543bd4f110dfd032d11
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date: Sun Oct 31 23:49:57 2010 +0100
MIPS: AR7: Fix double ar7_gpio_init declaration
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1748/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 3bd27e329ca80f4946efdd12bf1f5a9bf0886e76
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Fri Nov 5 15:12:48 2010 -0700
MIPS: Rework GENERIC_HARDIRQS Kconfig.
Recent changes to CONFIG_GENERIC_HARDIRQS have caused us to start getting:
warning: (SMP && SYS_SUPPORTS_SMP) selects IRQ_PER_CPU which has unmet direct dependencies (HAVE_GENERIC_HARDIRQS)
Rearranging our Kconfig quiets the message.
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1757/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 690ca2ce0c824e8d3da7b2e273c2c873ab96d1e6
Author: Yoichi Yuasa <yuasa@xxxxxxxxxxxxxx>
Date: Mon Nov 8 17:23:52 2010 +0900
MIPS: Alchemy: Add return value check for strict_strtoul()
arch/mips/alchemy/devboards/prom.c: In function 'prom_init':
arch/mips/alchemy/devboards/prom.c:60: error: ignoring return value of
'strict_strtoul', declared with attribute warn_unused_result
Signed-off-by: Yoichi Yuasa <yuasa@xxxxxxxxxxxxxx>
Cc: linux-mips <linux-mips@xxxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1761/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit ec79812580e360081b58c3e2e8b5b69b8080b5a0
Author: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Date: Mon Nov 8 21:25:24 2010 +0800
MIPS: Loongson: Add return value check for strict_strtoul()
cc1: warnings being treated as errors
arch/mips/loongson/common/env.c: In function 'prom_init_env':
arch/mips/loongson/common/env.c:49: error: ignoring return value of 'strict_strtol', declared with attribute warn_unused_result
arch/mips/loongson/common/env.c:50: error: ignoring return value of 'strict_strtol', declared with attribute warn_unused_result
arch/mips/loongson/common/env.c:51: error: ignoring return value of 'strict_strtol', declared with attribute warn_unused_result
arch/mips/loongson/common/env.c:52: error: ignoring return value of 'strict_strtol', declared with attribute warn_unused_result
Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Cc: linux-mips <linux-mips@xxxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1762/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 863abad4f644b6c12bc8176206b35fa7e7cfe1a9
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sat Oct 30 18:37:16 2010 +0200
MIPS: VPE loader: Check vmalloc return value in vpe_open
The return value of the vmalloc() call in arch/mips/kernel/vpe.c::vpe_open()
is not checked, so we potentially store a null pointer in v->pbuffer. Add
a check for a null return and then return -ENOMEM in that case.
[Ralf: The check added by Jesper's original patch is where it logically
should be. Adding it eleminated the need for the checks in a few other
places, so I removed them. There still is a zillion of other things that
need to be fixed in this file / API.]
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1747/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit d62c9ced7ca783e64ff4d9d3d1340cfe2284d47b
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 1 17:43:08 2010 -0700
MIPS: compat: Don't clobber personality bits in 32-bit sys_personality().
If PER_LINUX32 has been set on a 32-bit kernel, only twiddle with the
low-order personality bits, let the upper bits pass through.
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
To: linux-mips@xxxxxxxxxxxxxx
Cc: Camm Maguire <camm@xxxxxxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1751/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 1c0d52b9b5e6ca277c13d6fece9c34ed3159423d
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 1 17:43:07 2010 -0700
MIPS: Don't clobber personality high bits.
The high bits of current->personality carry settings that we don't want to
clobber on each exec. Only clobber them if the lower bits that indicate
either PER_LINUX or PER_LINUX32 are invalid.
The clobbering prevents us from using useful bits like ADDR_NO_RANDOMIZE.
Reported-by: Camm Maguire <camm@xxxxxxxxxxxxxxxxx>
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Cc: Camm Maguire <camm@xxxxxxxxxxxxxxxxx>
Patchwork: https://patchwork.linux-mips.org/patch/1750/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 1d210386f6ef9000b1cd723cf453c5eb0377e722
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Thu Nov 4 23:25:57 2010 +0100
MIPS: jz4740: Fix section mismatch in prom.c
This patch fixes the following section mismatch:
WARNING: arch/mips/built-in.o(.text+0xc): Section mismatch in reference from the
function jz4740_init_cmdline() to the variable .init.data:arcs_cmdline
While were at it, make jz4740_init_cmdline static as well.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/1755/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit fe749aab1d21cbb4d87527a7df8799583c233496
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date: Thu Nov 4 23:25:56 2010 +0100
MIPS: jz4740: qi_lb60: Fix gpio for the 6th row of the keyboard matrix
This patch fixes the gpio number for the 6th row of the keyboard matrix.
(And fixes a typo in my name...)
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Cc: stable@xxxxxxxxxx
Signed-off-by: https://patchwork.linux-mips.org/patch/1754/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit a989ff898f9740651d00388c33bdf4f2a7914920
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Thu Nov 4 11:13:59 2010 +0000
MIPS: Don't stomp on caller's ->regs[2] in copy_thread()
We never needed that (->regs[2] is overwritten on return from syscall paths
with return value of syscall, so storing it there early made no sense) and
with new restart logics since d27240bf7e61d2656de18e158ec910a902030847 it
has become really bad - we lose the original syscall number before the
place where we decide that we might need a syscall restart.
Note that for child we do need the assignment to regs[2] - it won't go
through the normal return from syscall path.
[Ralf: Issue found and reported by LluÃs; initial investigations by me;
bug finally found and patch by Al; testing by me and LluÃs.]
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Tested-by: LluÃs Batlle i Rossell <viriketo@xxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 2b3e50234eafc40a04f5f4a2b7bb24b506fd7e87
Author: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Date: Tue Nov 2 19:38:53 2010 +0000
MIPS: Swarm: Fix typo in symbol name: RTC_M4LT81 -> RTC_M41T81
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 36facadd9ea98f8415d0dbb63e0763b7ee9d3911
Merge: 2faa83e2a519abea1055d156ce1b42b8fa57e87b 0b83ae960cd7d4a5ee02786ecf41ab45688999bf
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 16 10:05:06 2010 -0800
Merge branch 'usb-next' into musb-merge
* usb-next: (132 commits)
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
USB: uas: Ensure we only bind to a UAS interface
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
USB: uas: Use kzalloc instead of kmalloc
USB: uas: Fix up the Sense IU
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
usb: gadget: g_ncm added
usb: gadget: f_ncm.c added
usb: gadget: u_ether: prepare for NCM
usb: pch_udc: Fix setup transfers with data out
usb: pch_udc: Fix compile error, warnings and checkpatch warnings
usb: add ab8500 usb transceiver driver
USB: gadget: Implement runtime PM for MSM bus glue driver
USB: gadget: Implement runtime PM for ci13xxx gadget
USB: gadget: Add USB controller driver for MSM SoC
USB: gadget: Introduce ci13xxx_udc_driver struct
USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask
USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc
USB: gadget: Separate out PCI bus code from ci13xxx_udc
...
commit 2faa83e2a519abea1055d156ce1b42b8fa57e87b
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 16 10:04:17 2010 -0800
Revert "USB: musb: pm: don't rely fully on clock support"
This reverts commit 32d5dc9520f0c6f60f691dd478741c774e292406.
Needed to properly merge the musb changes that are in the
usb-next branch into Linus's tree.
Acked-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 224acb1839f5fbb4ba85a440f6dd30dfb0e561b6
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 16 10:03:27 2010 -0800
Revert "USB: musb: blackfin: pm: make it work"
This reverts commit 1e393c6eece048052d4131ec4dad3b98e35a98e2.
Needed to properly merge the musb changes that are in the
usb-next branch into Linus's tree.
Acked-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Thu Dec 16 11:46:51 2010 -0500
SELinux: define permissions for DCB netlink messages
Commit 2f90b865 added two new netlink message types to the netlink route
socket. SELinux has hooks to define if netlink messages are allowed to
be sent or received, but it did not know about these two new message
types. By default we allow such actions so noone likely noticed. This
patch adds the proper definitions and thus proper permissions
enforcement.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb
Merge: 56a8bd6dcf81693e61a712097216904f3a4ab536 69479f8da68f1930b2078b2ebf6533fb00339918
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Dec 16 09:17:48 2010 -0800
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Conflicts:
drivers/input/Makefile
commit b2837fcf4994e699a4def002e26f274d95b387c1
Author: Anton Salikhmetov <alexo@xxxxxxxxxx>
Date: Thu Dec 16 18:08:41 2010 +0200
hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
Clean-up based on checkpatch.pl report against unnecessary braces
(`{' and `}'), non-standard format option %Lu (%llu recommended)
as well as one trailing statement in a macro definition which
should have been on the next line.
Signed-off-by: Anton Salikhmetov <alexo@xxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 20b7643d8ee44254fc972d42655bace81e7ab50a
Author: Anton Salikhmetov <alexo@xxxxxxxxxx>
Date: Thu Dec 16 18:08:40 2010 +0200
hfsplus: spaces/indentation clean-up
Fix incorrect spaces and indentation reported by checkpatch.pl.
Signed-off-by: Anton Salikhmetov <alexo@xxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 21f2296a598c4089e0a9bdf54634269ac913a693
Author: Anton Salikhmetov <alexo@xxxxxxxxxx>
Date: Thu Dec 16 18:08:39 2010 +0200
hfsplus: C99 comments clean-up
Match coding style restriction against C99 comments where
checkpatch.pl reported errors about their usage.
Signed-off-by: Anton Salikhmetov <alexo@xxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd
Author: Anton Salikhmetov <alexo@xxxxxxxxxx>
Date: Thu Dec 16 18:08:38 2010 +0200
hfsplus: over 80 character lines clean-up
Match coding style line length limitation where checkpatch.pl
reported over-80-character-line warnings.
Signed-off-by: Anton Salikhmetov <alexo@xxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 596276c3571e2108f4b336be545ece2eacf3da59
Author: Anton Salikhmetov <alexo@xxxxxxxxxx>
Date: Thu Dec 16 14:44:51 2010 +0200
hfsplus: fix an artifact in ioctl flag checking
Fix a flag checking artifact in hfsplus_ioctl_getflags() routine
found while doing clean-up against assignments inside `if's.
Signed-off-by: Anton Salikhmetov <alexo@xxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit b3444d164be8f977f4133ef0c6f4a18f2741373f
Merge: 4ef5c68f0a40a95d63c210ba7e3751540e1cb1f1 da32dac101263fb5b155407507c548e3ac2a6a2a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 08:51:57 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: populate initial_page_table
lguest: restore boot speed
lguest: fix crash lguest_time_init
commit 4ef5c68f0a40a95d63c210ba7e3751540e1cb1f1
Merge: 9fe4145530e6072cc838beb95ca68cada8c56909 947b10ae0aeda89fc066a7470fdba55f72b0b8fc
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 08:34:22 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix regression of garbage collection ioctl
commit 9fe4145530e6072cc838beb95ca68cada8c56909
Merge: b0c3844d8af6b9f3f18f31e1b0502fbefa2166be ab4e0192196b8d4e43a3945742d4996da934a86f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 16 08:33:44 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
Input: wacom - add another Bamboo Pen ID (0xd4)
commit f08f5a0add20834d3f3d876dfe08005a5df656db
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Dec 16 17:11:58 2010 +0100
PM / Runtime: Fix pm_runtime_suspended()
There are some situations (e.g. in __pm_generic_call()), where
pm_runtime_suspended() is used to decide whether or not to execute
a device's (system) ->suspend() callback. The callback is not
executed if pm_runtime_suspended() returns true, but it does so
for devices that don't even support runtime PM, because the
power.disable_depth device field is ignored by it. This leads to
problems (i.e. devices are not suspened when they should), so rework
pm_runtime_suspended() so that it returns false if the device's
power.disable_depth field is different from zero.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: stable@xxxxxxxxxx
commit be8cd644c49dca4212e975455c8e7119b848ebe8
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sat Dec 11 21:46:44 2010 +0100
PM / Hibernate: Restore old swap signature to avoid user space breakage
Commit 3624eb0 (PM / Hibernate: Modify signature used to mark swap)
attempted to modify hibernate signature used to mark swap partitions
containing hibernation images, so that old kernels don't try to
handle compressed images. However, this change broke resume from
hibernation on Fedora 14 that apparently doesn't pass the resume=
argument to the kernel and tries to trigger resume from early user
space. This doesn't work, because the signature is now different,
so the old signature has to be restored to avoid the problem.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22732 .
Reported-by: Dr. David Alan Gilbert <linux@xxxxxxxxxxx>
Reported-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Reported-by: Pascal Chapperon <pascal.chapperon@xxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 1497dd1d29c6a53fcd3c80f7ac8d0e0239e7389e
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri Dec 10 00:16:39 2010 +0100
PM / Hibernate: Fix PM_POST_* notification with user-space suspend
The user-space hibernation sends a wrong notification after the image
restoration because of thinko for the file flag check. RDONLY
corresponds to hibernation and WRONLY to restoration, confusingly.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: stable@xxxxxxxxxx
commit 846f40455276617275284a4b76b89311b4aed0b9
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Thu Dec 16 15:18:48 2010 +0000
GFS2: Don't flush delete workqueue when releasing the transaction lock
There is no requirement to flush the delete workqueue before a
gfs2 filesystem is suspended. The workqueue's work will just
be suspended along with the rest of the tasks on the filesystem.
The resolves a deadlock situation where the transaction lock's
demotion code was trying to flush the delete workqueue while at
the same time, the workqueue was waiting for the transaction
lock.
The delete workqueue is flushed by gfs2_make_fs_ro() already, so
that umount/remount are correctly protected anyway.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date: Thu Dec 16 12:46:23 2010 +0100
iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate
While compiling linux-next (next-20101216) I fell over this breakage:
...
drivers/net/wireless/iwlwifi/iwl-agn-rs.c: In function â??iwl_rs_rate_initâ??:
drivers/net/wireless/iwlwifi/iwl-agn-rs.c:2876:8: error: â??struct iwl_lq_staâ?? has no member named â??dbg_fixed_rateâ??
dbg_fixed_rate is only used when CONFIG_MAC80211_DEBUGFS is set:
[ drivers/net/wireless/iwlwifi/iwl-agn-rs.h ]
...
#ifdef CONFIG_MAC80211_DEBUGFS
struct dentry *rs_sta_dbgfs_scale_table_file;
struct dentry *rs_sta_dbgfs_stats_table_file;
struct dentry *rs_sta_dbgfs_rate_scale_data_file;
struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
u32 dbg_fixed_rate;
#endif
The issue was introduced by commit a1da077bc36368eb7d6312e7e49260f0a3d92c77:
"iwlwifi: clear dbg_fixed_rate during init"
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e13416ae7f378f9963ceca596ac464d4120093f3
Merge: b0c3844d8af6b9f3f18f31e1b0502fbefa2166be b99ddbf83c064382b145d2156cc819d1eb4fc54d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 16 23:38:41 2010 +0900
Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus
* 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: OMAPFB: disable old omapfb for OMAP4 builds
OMAP: DSS: VRAM: Align start & size of vram to 2M
commit e137478b56fd79c397b5c5c74fc08c049a42835a
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 16 09:20:16 2010 -0500
rtlwifi: convert to __packed notation
Use "__packed" instead of "__attribute__ ((packed))"...
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bbde588bfacb990542eed043d89c8591d4ae9211
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Thu Dec 16 09:43:47 2010 -0200
perf buildid-list: Fix error return for success
It was always returning -1 (255), confusing test scripts.
Reported-by: Han Pingtian <phan@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Han Pingtian <phan@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 68a7a771ad0e2959983729bf88cbc74a7014438f
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Fri Dec 10 22:06:26 2010 +0100
perf buildid-cache: Fix symbolic link handling
This was broken since link(2) doesn't dereference symbolic
links. Instead 'filename' becomes a symbolic link to the same file
that 'name' refers to.
This had the bad effect to create dangling symlinks in the case that
even can't be removed with perf-buildid-cache(1).
LKML-Reference: <m38vzxxrql.fsf@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit c3a34e06db25a8c74e196517732d65cdb56028ec
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Fri Dec 10 14:07:14 2010 +0100
perf symbols: Stop using vmlinux files with no symbols
Fail if the kernel image contains no symbol, allowing using other images
in the vmlinux search path that may have a usable symtab.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Francis Moreau <francis.moro@xxxxxxxxx>
Cc: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LPU-Reference: <m3d3p9ydx9.fsf_-_@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit fd930ff91e7fda18f7790984a98489a85edb7c71
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Fri Dec 10 14:06:03 2010 +0100
perf probe: Fix use of kernel image path given by 'k' option
Users were not being able to have the explicitely specified vmlinux
pathname used, instead a search on the vmlinux path was always being
made.
Reported-by: Francis Moreau <francis.moro@xxxxxxxxx>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Francis Moreau <francis.moro@xxxxxxxxx>
Cc: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LPU-Reference: <m3hbelydz8.fsf_-_@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 3e26f23091da06d02fa62da14c95f3688d27857c
Author: Avi Kivity <avi@xxxxxxxxxx>
Date: Thu Dec 16 12:16:34 2010 +0200
KVM: Fix preemption counter leak in kvm_timer_init()
Based on a patch from Thomas Meyer.
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
commit 7639dae0ca11038286bbbcda05f2bef601c1eb8d
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Tue Dec 14 21:26:40 2010 +0100
perf, x86: Provide a PEBS capable cycle event
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit abe43400579d5de0078c2d3a760e6598e183f871
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Nov 17 23:17:37 2010 +0100
perf: Sysfs enumeration
Simple sysfs emumeration of the PMUs.
Use a "event_source" bus, and add PMU devices using their name.
Each PMU device has a type attribute which contrains the value needed
for perf_event_attr::type to identify this PMU.
This is the minimal stub needed to start using this interface,
we'll consider extending the sysfs usage later.
Cc: Kay Sievers <kay.sievers@xxxxxxxx>
Cc: Greg KH <gregkh@xxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101117222056.316982569@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2e80a82a49c4c7eca4e35734380f28298ba5db19
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Nov 17 23:17:36 2010 +0100
perf: Dynamic pmu types
Extend the perf_pmu_register() interface to allow for named and
dynamic pmu types.
Because we need to support the existing static types we cannot use
dynamic types for everything, hence provide a type argument.
If we want to enumerate the PMUs they need a name, provide one.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101117222056.259707703@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9f58a205c62d0dad1df38d076324a89b1a0f1d65
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Nov 17 23:17:35 2010 +0100
init: Initialized IDR earlier
perf_event_init() wants to start using IDR trees, its needs in turn
are satisfied by mm_init().
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101117222056.206992649@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 24a24bb6ff3dc3a09bb131241be920ecc3f0e519
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Nov 17 23:17:33 2010 +0100
perf: Move perf_event_init() into main.c
Currently we call perf_event_init() from sched_init(). In order to
make it more obvious move it to the cannnonical location.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101117222056.093629821@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 4407204c5c9037763aadce39b025529dfbfcac9e
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Dec 8 15:56:23 2010 +0100
perf, x86: Detect broken BIOSes that corrupt the PMU
Some BIOSes use PMU resources, which can cause various bugs:
- Non-working or erratic PMU based statistics - the PMU can end up
counting the wrong thing, resulting in misleading statistics
- Profiling can stop working or it can profile the wrong thing
- A non-working or erratic NMI watchdog that cannot be relied on
- The kernel may disturb whatever thing the BIOS tries to use the
PMU for - possibly causing hardware malfunction in extreme cases.
- ... and other forms of potential misbehavior
Various forms of such misbehavior has been observed in practice - there are
BIOSes that just corrupt the PMU state, consequences be damned.
The PMU is a CPU resource that is handled by the kernel and the BIOS
stealing+corrupting it is not acceptable nor robust, so we detect it,
warn about it and further refuse to touch the PMU ourselves.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Jason Wessel <jason.wessel@xxxxxxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 69479f8da68f1930b2078b2ebf6533fb00339918
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Dec 9 01:08:26 2010 -0800
Input: include MT library as source for kerneldoc
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 7f9c2454010159e871e9416dcf64b1e6bfce78be
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Tue Dec 7 09:18:28 2010 +0100
MAINTAINERS: Update input-mt entry
The input multitouch core is now located in its own file,
and maintained via a git tree. Update the maintainers entry
accordingly.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 28906ad6d7c8a8090f720cf7c39461df0b1460f6
Author: Richard Nauber <richard.nauber@xxxxxxxxxxxxxx>
Date: Tue Dec 14 22:36:18 2010 +0100
hid: egalax: Add support for Samsung NB30 netbook
The Samsung NB30 touch has a DWAV dual-touch device. This patch adds
the NB30 to the list of supported devices, and grabs it accordingly in
hid-core.
[rydberg@xxxxxxxxxxx: rename and log message changes]
Signed-off-by: Richard Nauber <Richard.Nauber@xxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit e12b355b57b4d330be3479b1e9a518cfed59866c
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Nov 29 14:40:11 2010 +0100
hid: egalax: Document the new devices in Kconfig
Add the new supported devices to the kernel menu config help text.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 006b20fe4c69189b0d854e5eabf269e50ca86cdd
Merge: 5f29805a4f4627e766f862ff9f10c14f5f314359 d949750fed168b6553ca11ed19e4affd19d7a4d7
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 16 11:22:25 2010 +0100
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to apply a dependent patch.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d949750fed168b6553ca11ed19e4affd19d7a4d7
Merge: ce677831a4abd0f9f957c90ac6f6a0d0472bafb4 e63233f75a1a6bfa97ffb52a20cc6801a4c63fb2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 16 11:21:24 2010 +0100
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit 8e92c20183ed0579d94501311b81c42b65cb2129
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Thu Dec 9 14:15:34 2010 +0100
sched: Fix the irqtime code for 32bit
Since the irqtime accounting is using non-atomic u64 and can be read
from remote cpus (writes are strictly cpu local, reads are not) we
have to deal with observing partial updates.
When we do observe partial updates the clock movement (in particular,
->clock_task movement) will go funny (in either direction), a
subsequent clock update (observing the full update) will make it go
funny in the oposite direction.
Since we rely on these clocks to be strictly monotonic we cannot
suffer backwards motion. One possible solution would be to simply
ignore all backwards deltas, but that will lead to accounting
artefacts, most notable: clock_task + irq_time != clock, this
inaccuracy would end up in user visible stats.
Therefore serialize the reads using a seqcount.
Reviewed-by: Venkatesh Pallipadi <venki@xxxxxxxxxx>
Reported-by: Mikael Pettersson <mikpe@xxxxxxxx>
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1292242434.6803.200.camel@twins>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit fe44d62122829959e960bc699318d58966922a69
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Thu Dec 9 14:15:34 2010 +0100
sched: Fix the irqtime code to deal with u64 wraps
Some ARM systems have a short sched_clock() [ which needs to be fixed
too ], but this exposed a bug in the irq_time code as well, it doesn't
deal with wraps at all.
Fix the irq_time code to deal with u64 wraps by re-writing the code to
only use delta increments, which avoids the whole issue.
Reviewed-by: Venkatesh Pallipadi <venki@xxxxxxxxxx>
Reported-by: Mikael Pettersson <mikpe@xxxxxxxx>
Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1292242433.6803.199.camel@twins>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ce677831a4abd0f9f957c90ac6f6a0d0472bafb4
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sun Oct 24 21:50:42 2010 +0200
perf: Fix off by one in perf_swevent_init()
The perf_swevent_enabled[] array has PERF_COUNT_SW_MAX elements.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101024195041.GT5985@bicker>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 4e93db23bf95cd763c9182b5d6187412fe6ce747
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Nov 29 07:27:49 2010 +0100
hid: egalax: Add support for Wetab
The Wetab tablet dual-touch controller works the same way as the one
in the Joojoo tablet. This patch adds the Wetab to the list of
supported devices, and grabs it accordingly in hid-core.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit f7bc8046b33b9fb2e61318f885cc5d94e0a6b805
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Dec 6 14:04:21 2010 +0100
hid: egalax: Convert to MT slots
The firmware in the joojoo reports touches sequentially, one per
report, which confuses the current driver. A further complication is
the absense of any indication of a touch frame. This patch converts
the driver to the MT slots protocol, and outputs one full touch frame
per report. This way, proper handling for both firmwares is ensured.
Tested-by: Philipp Merkel <mail@xxxxxxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 17c760687f1270af9bd798d938198caa7d5aa3eb
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Oct 11 21:20:51 2010 +0200
hid: egalax: Add event filtering
Use estimated signal-to-noise ratios to reduce noise and limit the
amount of events emitted.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 80a469e4f4d01ad96447f85cc71a379ec82ffe2d
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Oct 11 21:16:43 2010 +0200
hid: egalax: Report zero as minimum pressure
The firmware reports a logical minimum of one, but in order for
userspace applications to correctly map all reported values to
non-zero pressure, the driver needs to report a logical minimum of
zero. Fixed with this patch.
Tested-by: Philipp Merkel <mail@xxxxxxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit b88cbd3a007608a224fad5413de6170c75afd5a7
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Wed Oct 13 22:18:32 2010 +0200
hid: egalax: Correct for device resolution report error
The firmware of both supported devices report a X/Y maximum of 4095,
whereas in reality, it is eight times larger. Fixed with this patch.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 4a864183fb28ddf553e5b0b47858bc3c518dae94
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Sat Nov 27 17:56:17 2010 +0100
hid: egalax: Setup input device manually
The hid core does not yet handle input filtering. Take over the setup
of the input device, so that proper signal-to-noise ratios can be
used.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Stephane Chatty <chatty@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit e42a98b520bb22535687ead3120e80edc268279a
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Mon Dec 6 10:05:43 2010 +0100
input: mt: Add hovering distance axis
Touch devices capable of hovering, i.e., fingers detected a
distance from the surface, are not supported by the current
input MT protocol. This patch adds ABS_MT_DISTANCE, which may
be used to indicate the distance between the contact and the
surface.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit c5f4dec1ceb6ab773bbbefbe64a7c990c7d6b17f
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Wed Dec 15 13:50:34 2010 +0100
input: mt: Move tracking and pointer emulation to input-mt
The drivers using the type B protocol all report tracking information
the same way. The contact id is semantically equivalent to
ABS_MT_SLOT, and the handling of ABS_MT_TRACKING_ID only complicates
the driver. The situation can be improved upon by providing a common
pointer emulation code, thereby removing the need for the tracking id
in the driver. This patch moves all tracking event handling over to
the input core, simplifying both the existing drivers and the ones
currently in preparation.
Acked-by: Ping Cheng <pingc@xxxxxxxxx>
Acked-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 8cde81001626c4c60b26ef2eb5fc522885ed9fd0
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Sat Nov 27 10:50:54 2010 +0100
input: mt: Collect slots initialization code
The MT slots devices all follow the same initialization pattern
of creating slots and hinting about buffer size. Let drivers call
an initialization function instead, and make sure it can be called
repeatedly without side effects.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 47c78e891323513e9909729b44033e2c6649e2b7
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Sat Nov 27 09:16:48 2010 +0100
input: mt: Break out slots handling
In preparation for common code to handle a larger set of MT slots
devices, move the slots handling over to a separate file.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
commit 8ac33dc86d37ca76d282aa112d4f2794a731064e
Author: Tao Ma <boyu.mt@xxxxxxxxxx>
Date: Wed Dec 15 16:30:00 2010 +0800
ocfs2: Hold ip_lock when set/clear flags for indexed dir.
When we set/clear the dyn_features for an inode we hold the ip_lock.
So do it when we set/clear OCFS2_INDEXED_DIR_FL also.
Signed-off-by: Tao Ma <boyu.mt@xxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 41b41a26d4d6e4e3ad877d02377844ab9552dc16
Author: Sunil Mushran <sunil.mushran@xxxxxxxxxx>
Date: Thu Dec 9 18:20:38 2010 -0800
ocfs2: Adjust masklog flag values
Two masklogs had the same flag value.
Signed-off-by: Sunil Mushran <sunil.mushran@xxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 56a8bd6dcf81693e61a712097216904f3a4ab536
Author: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Date: Wed Dec 15 23:39:25 2010 -0800
Input: add ST1232 touchscreen controller driver
This patch introduces support for Sitronix ST1232 integrated capacitive
touchscreen with LCD module. The touchscreen is multitouch capable and
can report coordinates of up to two contact points.
Signed-off-by: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Reviewed-by: Trilok Soni <tsoni@xxxxxxxxxxxxxx>
Acked-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit da32dac101263fb5b155407507c548e3ac2a6a2a
Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 17:03:15 2010 -0600
lguest: populate initial_page_table
Two x86 patches broke lguest:
1) v2.6.35-492-g72d7c3b, which changed x86 to use the memblock allocator.
In lguest, the host places linear page tables at the top of mem, which
used to be enough to get us up to the swapper_pg_dir page tables. With
the first patch, the direct mapping tables used that memory:
Before: kernel direct mapping tables up to 4000000 @ 7000-1a000
After: kernel direct mapping tables up to 4000000 @ 3fed000-4000000
I initially fixed this by lying about the amount of memory we had, so
the kernel wouldn't blatt the lguest boot pagetables (yuk!), but then...
2) v2.6.36-rc8-54-gb40827f, which made x86 boot use initial_page_table.
This was initialized in a part of head_32.S which isn't executed by
lguest; it is then copied into swapper_pg_dir. So we have to initialize
it; and anyway we switch to it before we blatt the old tables, so that
fixes the previous damage as well.
For the moment, I cut & pasted the code into lguest's boot code, but
next merge window I will merge them.
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
To: x86@xxxxxxxxxx
commit bb4093deb259ea9c92415796a6a139e35272f8a8
Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 17:03:15 2010 -0600
lguest: restore boot speed
lguest is dumb and drops *all* the pagetables for set_pte (which is
only used for kernel mapping manipulation, so it's OK without highmem).
But it's used a lot in boot, too. As a guest optimization, we
suppressed this flushing until the first page switch. Now we have
initial_page_table, that happens much earlier, so extend the heuristic
to wait until we switch to something other than the swapper_pg_dir or
initial_page_table.
As measured on my laptop under kvm, this dropped the time-to-mount-root
from 48 seconds to 4.3 seconds.
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
commit bb6f1d9a99f1947d91693de62ed54ac3bf1e2dfe
Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Date: Thu Dec 16 17:03:13 2010 -0600
lguest: fix crash lguest_time_init
fe25c7fc2e "x86: lguest: Convert to new irq chip functions" converted
enable_lguest_irq() to take a struct irq_data *, but didn't fix the one
internal caller.
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
To: x86@xxxxxxxxxx
commit f113fe4e844be15394edcbc32b0ec196cdd0a0ff
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Tue Nov 23 17:00:03 2010 +0800
ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 2a125dd56b3a853701063fe8a678ad7603e385fd
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Mon Nov 22 22:48:49 2010 +0800
ARM: pxa: remove get_memclk_frequency_10khz()
Introduce 'struct clk' for memory and remove
get_memclk_frequency_10khz().
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 4029813c89926ae5d78cc2dff49d845d934424f6
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Mon Nov 22 10:49:55 2010 +0800
ARM: pxa: separate the clock support into clock-{pxa2xx,pxa3xx}.c
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 2e8581e756ddbd0dea8b0d4059e9a82d2929de01
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Mon Nov 22 09:41:39 2010 +0800
ARM: pxa: replace duplicated macro DEFINE_PXA3_CK() with DEFINE_CK()
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit bb71bdd31b48efa2b9834f1a47eb5f657e3c217c
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 17 19:03:36 2010 +0800
ARM: pxa: redefine irqs.h
Define all IRQs in irqs.h. If some IRQs are sharing one IRQ number, define
them together. If some IRQs are sharing same name with different IRQ number,
define different IRQ.
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Cc: Eric Miao <eric.y.miao@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit d04e67cd1d088762c17e8edf08fbc14e4af1981a
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Wed Nov 17 19:03:35 2010 +0800
ARM: pxa: redefine the cpu_is_pxa3xx
After introducing pxa930/pxa935 and new silicons, original cpuid rules
of XScale generation 3 can't fit new silicons. Now redefine the rule
of PXA3xx.
Only PXA300/PXA310/PXA320/PXA930/PXA935 are family members of PXA3xx.
PXA930/PXA935 are family members of PXA93x. PXA93x can be considered
as PXA3xx + CP.
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Cc: Eric Miao <eric.y.miao@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit d38bdf48f30f5dc0fac4c1ab656aff74f6804f07
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Thu Nov 25 14:21:32 2010 +0800
ARM: mmp: fix the typo - MMP2 is compatible with ARMv7
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 13dee960f37b3769baa0eae9d1de4a7ca9a2e999
Author: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Date: Thu Nov 25 11:33:13 2010 +0800
ARM: mmp: append brownstone support
Signed-off-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 7bdba92dcaefdc69c339db9e23861e5e21d3a2c4
Author: cxie4 <cxie4@xxxxxxxxxxx>
Date: Tue Nov 23 10:43:22 2010 +0800
ARM: mmp: add usb clock for pxa168/pxa910
Signed-off-by: Chao Xie <chao.xie@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit aa11781671279c67d56b95c4d73cde5cd1a6d594
Author: Daniel Mack <daniel@xxxxxxxx>
Date: Thu Nov 4 14:44:01 2010 -0400
ARM: pxa/raumfeld: enable PXA3XX_GCU driver
Signed-off-by: Daniel Mack <daniel@xxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 364dbdf3b6c31a4a5fb7a6d479e7aafb4a7a10b6
Author: Daniel Mack <daniel@xxxxxxxx>
Date: Thu Nov 4 14:44:00 2010 -0400
video: add driver for PXA3xx 2D graphics accelerator
This adds a driver for the the 2D graphics accelerator found on PXA3xx
processors. Only resource mapping, interrupt handling and a simple ioctl
handler is done by the kernel part, the rest of the logic is implemented
in DirectFB userspace.
Graphic applications greatly benefit for line drawing, blend, and
rectangle and triangle filling operations.
Benchmarks done on a PXA303 using the df_dok benchmarking tool follow,
where the value in square brackets show the CPU usage during that test.
Without accelerator (benchmarking 256x252 on 480x262 RGB16 (16bit)):
Anti-aliased Text 3.016 secs ( 65.649 KChars/sec) [ 99.6%]
Fill Rectangle 3.021 secs ( 175.107 MPixel/sec) [ 98.0%]
Fill Rectangle (blend) 3.582 secs ( 3.602 MPixel/sec) [ 99.7%]
Fill Rectangles [10] 3.177 secs ( 182.753 MPixel/sec) [ 98.1%]
Fill Rectangles [10] (blend) 18.020 secs ( 3.580 MPixel/sec) [ 98.7%]
Fill Spans 3.019 secs ( 145.306 MPixel/sec) [ 98.0%]
Fill Spans (blend) 3.616 secs ( 3.568 MPixel/sec) [ 99.4%]
Blit 3.074 secs ( 39.874 MPixel/sec) [ 98.0%]
Blit 180 3.020 secs ( 32.042 MPixel/sec) [ 98.0%]
Blit with format conversion 3.005 secs ( 19.321 MPixel/sec) [ 99.6%]
Blit from 32bit (blend) 4.792 secs ( 2.692 MPixel/sec) [ 98.7%]
With accelerator:
Anti-aliased Text 3.056 secs (* 36.518 KChars/sec) [ 21.3%]
Fill Rectangle 3.015 secs (* 115.543 MPixel/sec) [ 8.9%]
Fill Rectangle (blend) 3.180 secs (* 20.286 MPixel/sec) [ 1.8%]
Fill Rectangles [10] 3.251 secs (* 119.062 MPixel/sec) [ 1.2%]
Fill Rectangles [10] (blend) 6.293 secs (* 20.502 MPixel/sec) [ 0.3%]
Fill Spans 3.051 secs (* 97.264 MPixel/sec) [ 35.7%]
Fill Spans (blend) 3.377 secs (* 15.282 MPixel/sec) [ 17.8%]
Blit 3.046 secs (* 27.533 MPixel/sec) [ 2.6%]
Blit 180 3.098 secs (* 27.070 MPixel/sec) [ 2.2%]
Blit with format conversion 3.131 secs (* 39.148 MPixel/sec) [ 2.8%]
Blit from 32bit (blend) 3.346 secs (* 11.568 MPixel/sec) [ 0.8%]
Signed-off-by: Daniel Mack <daniel@xxxxxxxx>
Tested-by: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Cc: Eric Miao <eric.y.miao@xxxxxxxxx>
Cc: Denis Oliver Kropp <dok@xxxxxxxxxxxx>
Cc: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Cc: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit fe805986b20a86257e6de8cb12a7e5b991925aab
Author: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
Date: Wed Nov 3 01:15:32 2010 -0400
ARM: mmp: add sd card to jasper
Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 5382f419c128c85af3933958d73b18ed063d0264
Author: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
Date: Wed Sep 29 16:18:51 2010 -0400
ARM: mmp: add mmc resource
Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit ad68bb9f7a3cd47396635a5e3895215af57579da
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Wed Nov 3 16:29:35 2010 +0100
ARM: pxa: Access SMEMC via virtual addresses
This is important because on PXA3xx, the physical mapping of SMEMC registers
differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx
and PXA320, the PCMCIA driver was adjusted accordingly as well.
Also, various places in the kernel had to be patched to use
__raw_read/__raw_write.
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 851982c1b6ca18cedf6d01e4529a0c1ddb30771e
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Mon Oct 11 02:20:19 2010 +0200
ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io()
This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
between PXA25x/PXA27x and PXA3xx memory mapping.
Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
and pxa3xx_map_io() is included.
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 64ed267bdac799485a938dd2cba8243ba383cd5f
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Wed Oct 13 14:51:25 2010 +0800
ARM: pxa: introduce addr-map.h for large bus addresses and ranges
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit ead67b6e6679b14befb0cef59db60e2853e19cd8
Author: Eric Miao <eric.y.miao@xxxxxxxxx>
Date: Wed Oct 13 10:38:56 2010 +0800
ARM: pxa: remove un-used mapping of camera registers
The camera registers start and range are encoded into the platform
device, and are actually handled by ioremap()'ed, thus the mapping
in pxa_map_io() is not necessary.
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit a74b74a5555c741ed3df896096e33b853995631e
Author: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Date: Wed Dec 15 07:20:16 2010 +0800
ARM: pxa: PXA_ESERIES depends on FB_W100.
As arch/arm/mach-pxa/eseries.c references w100fb_gpio_{read,write}()
directly.
Signed-off-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 947b10ae0aeda89fc066a7470fdba55f72b0b8fc
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date: Thu Dec 16 09:57:57 2010 +0900
nilfs2: fix regression of garbage collection ioctl
On 2.6.37-rc1, garbage collection ioctl of nilfs was broken due to the
commit 263d90cefc7d82a0 ("nilfs2: remove own inode hash used for GC"),
and leading to filesystem corruption.
The patch doesn't queue gc-inodes for log writer if they are reused
through the vfs inode cache. Here, gc-inode is the inode which
buffers blocks to be relocated on GC. That patch queues gc-inodes in
nilfs_init_gcinode() function, but this function is not called when
they don't have I_NEW flag. Thus, some of live blocks are wrongly
overrode without being moved to new logs.
This resolves the problem by moving the gc-inode queueing to an outer
function to ensure it's done right.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
commit ab226e21ad34f6ef52e00d2ab399d2364b4cdfee
Author: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 15 20:41:54 2010 -0800
ceph: fix direct-io on non-page-aligned buffers
The user buffer may be 512-byte aligned, not page-aligned. We were
assuming the buffer was page-aligned and only accounting for
non-page-aligned io offsets.
Signed-off-by: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit b0c3844d8af6b9f3f18f31e1b0502fbefa2166be
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 15 17:24:48 2010 -0800
Linux 2.6.37-rc6
commit c01c8106f43ec7e460eeb56c7a8ae666acdfe5a0
Merge: a4851d8f7d6351a395d36ae8fdcf41745a832d76 52f6c5ad430e41736133acac179607b224eaaa11
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 15 17:24:05 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
commit 6f2f48a9a061a94d059f89c69472f467839cc616
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Wed Dec 15 11:01:56 2010 -0500
drm/radeon/kms/evergreen: flush hdp cache when flushing gart tlb
Make sure vram changes hit memory. This mirrors the
6xx/7xx behavior.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit a1a8213392b29c2b427567b86e2ccfe88ded58cc
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Mon Dec 13 14:03:09 2010 -0500
drm/radeon/kms: disable the r600 cb offset checker for linear surfaces
There are too many strange corner cases triggered in old userspace
drivers out there to that it's nearly impossible to not break some
obscure app.
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit e5fd205f28f83b3514dc5049b2d1388b10065a6d
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Sun Dec 12 23:27:23 2010 -0500
drm/radeon/kms: disable ss fixed ref divide
Seems to cause problems on certain laptops
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=24462
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Tested-by: Luca Tettamanti <kronos.it@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 044102798ddb0a0e5f43ef7fe0ad0e84b0b5e3a0
Merge: a4851d8f7d6351a395d36ae8fdcf41745a832d76 448f53a1ede54eb854d036abf54573281412d650
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Thu Dec 16 10:03:47 2010 +1000
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks
agp/intel: Fix missed cached memory flags setting in i965_write_entry()
drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
drm/i915/ringbuffer: Handle wrapping of the autoreported HEAD
drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI converter
commit 0b83ae960cd7d4a5ee02786ecf41ab45688999bf
Author: Matthew Wilcox <matthew@xxxxxx>
Date: Wed Dec 15 15:44:06 2010 -0500
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
If swap is on a UAS device, we could recurse into the driver by using
GFP_KERNEL. Using GFP_NOIO ensures we won't.
Reported-by: James Bottomley <James.Bottomley@xxxxxxx>
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 89dc29051b626756e69db12f3ffb22e49a817bfe
Author: Matthew Wilcox <matthew@xxxxxx>
Date: Wed Dec 15 15:44:05 2010 -0500
USB: uas: Ensure we only bind to a UAS interface
While all existing UAS devices use alternate interface 1, this is not
guaranteed, and it has caused confusion with people trying to bind the
uas driver to non-uas devices.
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 92a3f767f5cd079351ae04a337c40266e9c6048f
Author: Matthew Wilcox <matthew@xxxxxx>
Date: Wed Dec 15 15:44:04 2010 -0500
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
The spec calls this the status pipe. While it is used to receive sense IUs,
it is also used to receive other IUs, so this can be confusing.
Reported-by: Luben Tuikov <ltuikov@xxxxxxxxx>
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ac563cfd528033ee6e3bb4801b5c73468d0145c8
Author: Matthew Wilcox <matthew@xxxxxx>
Date: Wed Dec 15 15:44:03 2010 -0500
USB: uas: Use kzalloc instead of kmalloc
The IUs are not being fully initialised by the driver (due to the reserved
space). Since we should be zeroing reserved fields, use kzalloc to do
it for us.
Reported-by: Luben Tuikov <ltuikov@xxxxxxxxx>
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4400ef311e10666a2e5acf97d040df89cb880cb2
Author: Matthew Wilcox <matthew@xxxxxx>
Date: Wed Dec 15 15:44:02 2010 -0500
USB: uas: Fix up the Sense IU
Add a comment to the Sense IU data structure that it's also used for Read
Ready and Write Ready. Remove the 'service response' element since it's
gone from the current draft (04).
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ab60bd0b92ec57c98df08616b7d0664be5551eae
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:29:25 2010 -0500
kconfig: add more S_INT and S_HEX consistency checks
This patch add more number consistency checkg, trying to catch the following
situation:
config FOO0
hex
default 42
config FOO1
string
config BAR0
int
default FOO1
config BAR1
hex
default FOO1
config FOO2
hex
default 42h
config FOO3
int
default "1bar"
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 50bc0ef42c76879f5d68a88c7063603dc0c9789b
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Mon Dec 13 14:35:11 2010 -0800
msm: initial framebuffer support
Initial framebuffer components. Add board-trout-panel.c
as well as platform parts to enable the framebuffer. This
code comes directly from Google's tree.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 3a790bbe790e79a9744adf105ed135624a590f5b
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Mon Dec 13 14:35:10 2010 -0800
msm: add handling for clocks tagged as CLK_MINMAX
CLK_MINMAX is used to denote clocks that have a wide variation
in possible frequencies. This handling just sets the min and
max values to the same value.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 304a09c3251c7c74660fc2ff9c590edf3d4bdd7e
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Mon Dec 13 14:35:09 2010 -0800
msm: trout: change name of pmdh_clk to mddi_clk
This clock is used in the framebuffer driver as mddi_clk.
This just changes the name to match that. This also
mirrors a change in Google tree.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 078dde9311dd067a76275ea2c903623cec504e31
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Mon Dec 13 14:35:08 2010 -0800
msm: add CLK_MINMAX to pmdh_clk
This adds in the CLK_MINMAX flag to the pmdh_clk since it's actual
a min/max clock instead of a single frequency clock.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 940f2efc28564c478033b075bcfc8e7b694831e1
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Mon Dec 13 14:35:07 2010 -0800
msm: trout: add gpio_to_irq
trout has gpiolib support and interrupt support, but was
missing the gpio_to_irq function. This adds that functions
which should allow proper translation.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 294b2dea83ba0a6d6034a7521bc62c317efab17b
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Dec 10 14:12:03 2010 -0800
msm: iommu: Use the correct memory allocation flag
Change msm_iommu_map to use GFP_ATOMIC instead of
GFP_KERNEL due to the fact that the call occurs within
a spinlock-protected region.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 38cd6b4f52a75926fd81fc85f53f5067dcd809f7
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Wed Dec 15 14:27:28 2010 +0800
wireless:mac80211: kill unuse macro MESH_CFG_CMP_LEN in mesh.h
Commit 00d3f14c has removed the references of this macro,
but left it only. So remove this definition.
commit 00d3f14cf9f12c21428121026a5e1d5f65926447
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Tue Feb 10 21:26:00 2009 +0100
mac80211: use cfg80211s BSS infrastructure
Remove all the code from mac80211 to keep track of BSSes
and use the cfg80211-provided code completely.
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2b7e6bce41b6b944bd4302cf0914e2a6f4bc704b
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Wed Dec 15 13:02:46 2010 +0530
ath9k: Add comments for making pm-qos as modparam
PM-QOS value can be user specified via module parameter.
This patch adds few comments regarding this in the driver
code.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 64c6e50c0732b793e4bd5fd2954b7bef088f83f8
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Wed Dec 15 07:47:23 2010 +0530
ath9k_htc: Remove PCI specific configuration
This is not required for USB devices.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bd2ce6e43f65127bc723e7fcc044758cf8113260
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Wed Dec 15 07:47:10 2010 +0530
mac80211: Add timeout to BA session start API
Allow drivers or rate control algorithms to specify BlockAck session
timeout when initiating an ADDBA transaction. This is useful in cases
where maintaining persistent BA sessions does not incur any overhead.
The current timeout value of 5000 TUs is retained for all non ath9k/ath9k_htc
drivers.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a293911d4fd5e8593dbf478399a77f990d466269
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Dec 14 17:54:28 2010 +0100
nl80211: advertise maximum remain-on-channel duration
With the upcoming hardware offload implementation,
some devices will have a different maximum duration
for the remain-on-channel command. Advertise the
maximum duration in mac80211, and make mac80211 set
it.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 14a085e77063090fb12ad391d0f4d46e593be225
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Dec 14 07:38:58 2010 -0800
iwlagn: fix witespace damage
patch "iwlagn: check ready in iwlagn_bss_info_changed()" introduce
whitespace, fix it
please merge with the previous patch
Reported by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4dc3530df7c0428b41c00399a7ee8c929406d181
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Dec 14 13:18:28 2010 +0530
ath9k: Make PM-QOS value as user configurable
This patch allows the pm-qos value to be user configurable by making it as
a module parameter.This will help our customers to configure the pm-qos
value according to the effect in throughput due to the DMA latency problem
which was observed in Intel Pinetrail platforms.
The tested value of '55' will be filled as the default
pm-qos-value incase the user does not specifies pm-qos value as a
module parameter.
example usage: sudo modprobe ath9k pmqos=65
Cc: Senthilkumar Balasubramanian <Senthilkumar.Balasubramanian@xxxxxxxxxxx>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 17b3c17ecde36db5db7760a2802990b3129a4d65
Merge: 1fcfe76a760e78d7774a254608557c84071b0cfb 65af8dea26aa89ae4a810bdaa05545a8e670b636
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Dec 15 16:37:55 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
drivers/net/wireless/iwlwifi/iwl-core.h
commit 1fcfe76a760e78d7774a254608557c84071b0cfb
Merge: 0c8173385e549f95cd80c3fff5aab87b4f881d8d 56e6417b49132d4f56e9f2241d31942b90b46315
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Dec 15 16:33:28 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
commit 0c8173385e549f95cd80c3fff5aab87b4f881d8d
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Wed Dec 8 11:12:31 2010 -0600
rtl8192ce: Add new driver
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a4851d8f7d6351a395d36ae8fdcf41745a832d76
Merge: 667c78afaec0ac500908e191e8f236e9578d7b1f 6d5c3aa84b3e431f2d0fc39c73c867d1a4dd8cff
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 15 12:41:17 2010 -0800
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix typo which broke '..' detection in ext4_find_entry()
ext4: Turn off multiple page-io submission by default
commit 667c78afaec0ac500908e191e8f236e9578d7b1f
Author: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Wed Dec 8 12:39:12 2010 -0800
xen: Provide a variant of __RING_SIZE() that is an integer constant expression
Without this, gcc 4.5 won't compile xen-netfront and xen-blkfront, where
this is being used to specify array sizes.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: David Miller <davem@xxxxxxxxxxxxx>
Cc: Stable Kernel <stable@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 6c965ff5e7ca844494f1dcf0ec0440146db01294
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Thu Dec 9 15:45:27 2010 -0800
MAINTAINERS: update MSM git tree
The MSM main git tree has changed over to this new address.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 462e635e5b73ba9a4c03913b77138cd57ce4b050
Author: Tavis Ormandy <taviso@xxxxxxxxxxxxx>
Date: Thu Dec 9 15:29:42 2010 +0100
install_special_mapping skips security_file_mmap check.
The install_special_mapping routine (used, for example, to setup the
vdso) skips the security check before insert_vm_struct, allowing a local
attacker to bypass the mmap_min_addr security restriction by limiting
the available pages for special mappings.
bprm_mm_init() also skips the check, and although I don't think this can
be used to bypass any restrictions, I don't see any reason not to have
the security check.
$ uname -m
x86_64
$ cat /proc/sys/vm/mmap_min_addr
65536
$ cat install_special_mapping.s
section .bss
resb BSS_SIZE
section .text
global _start
_start:
mov eax, __NR_pause
int 0x80
$ nasm -D__NR_pause=29 -DBSS_SIZE=0xfffed000 -f elf -o install_special_mapping.o install_special_mapping.s
$ ld -m elf_i386 -Ttext=0x10000 -Tbss=0x11000 -o install_special_mapping install_special_mapping.o
$ ./install_special_mapping &
[1] 14303
$ cat /proc/14303/maps
0000f000-00010000 r-xp 00000000 00:00 0 [vdso]
00010000-00011000 r-xp 00001000 00:19 2453665 /home/taviso/install_special_mapping
00011000-ffffe000 rwxp 00000000 00:00 0 [stack]
It's worth noting that Red Hat are shipping with mmap_min_addr set to
4096.
Signed-off-by: Tavis Ormandy <taviso@xxxxxxxxxx>
Acked-by: Kees Cook <kees@xxxxxxxxxx>
Acked-by: Robert Swiecki <swiecki@xxxxxxxxxx>
[ Changed to not drop the error code - akpm ]
Reviewed-by: James Morris <jmorris@xxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 7d13162332f2b67a941d18cee20f1c0413e020de
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Dec 7 15:27:57 2010 -0500
fanotify: fill in the metadata_len field on struct fanotify_event_metadata
The fanotify_event_metadata now has a field which is supposed to
indicate the length of the metadata portion of the event. Fill in that
field as well.
Based-in-part-on-patch-by: Alexey Zaytsev <alexey.zaytsev@xxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 62731fa0c893515dc6cbc3e0a2879a92793c735f
Author: Alexey Zaytsev <alexey.zaytsev@xxxxxxxxx>
Date: Mon Nov 22 00:33:03 2010 +0000
fanotify: split version into version and metadata_len
To implement per event type optional headers we are interested in
knowing how long the metadata structure is. This patch slits the __u32
version field into a __u8 version and a __u16 metadata_len field (with
__u8 left over). This should allow for backwards compat ABI.
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@xxxxxxxxx>
[rewrote descrtion and changed object sizes and ordering - eparis]
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 82cc4f5cb8be6dede34c32a814ab1470409e1840
Merge: 2a27a03d3a891e87ca33d27a858b4db734a4cbab 56e6417b49132d4f56e9f2241d31942b90b46315
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 15 09:43:13 2010 -0800
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 1cd25df4e53b9507f7abbb8aff8ce2ba644a1468
Author: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Date: Mon Oct 11 09:53:49 2010 +0000
OMAP: iommu: make iva2 iommu selectable
It seems dsp-link will do this, and tidspbridge too at some point, but
right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU.
Cc: Fernando Guzman Lugo <fernando.lugo@xxxxxx>
Cc: Yogesh Marathe <yogesh_marathe@xxxxxx>
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
commit 5cdc5bd8b2b1190cb54548c03194b154b4892e2a
Merge: 6c34d2888221ca3df81e29f598873b4fb6cf838d e4a2b3565fc7ac2d70361a36337be57a59d783da
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Wed Dec 15 09:29:38 2010 -0800
Merge branch 'musb-hw' of git://gitorious.org/usb/usb into musb
* 'musb-hw' of git://gitorious.org/usb/usb: (43 commits)
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
arm: OMAP4430: musb: Configure musb to OTG mode
usb: musb: Adding musb support for OMAP4430
usb: otg: TWL6030: Add twl6030_usb file for compilation
mfd: TWL6030: OMAP4: Registering the TWL6030-usb device
usb: musb: TWL6030: Selecting TWL6030_USB transceiver
usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver.
usb: otg: Adding twl6030-usb transceiver driver for OMAP4430
mfd: TWL6030: USBOTG VBUS event generation on
usb: musb: add support for ux500 platform
musb: am35x: fix compile error due to control apis
arm: omap4: enable usb on 4430sdp
usb: musb: drop board_set_vbus
usb: musb: drop musb_platform_suspend/resume
usb: musb: blackfin: usb dev_pm_ops structure
usb: musb: am35x: usb dev_pm_ops structure
usb: musb: omap2430: use dev_pm_ops structure
usb: musb: omap2430: drop the nops
usb: musb: mark musb_save/restore_context static
...
commit c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb
Author: Guzman Lugo, Fernando <x0095840@xxxxxx>
Date: Wed Dec 15 00:54:03 2010 +0000
OMAP: iommu: create new api to set valid da range
Some IOMMUs cannot use the whole 0x0 - 0xFFFFFFFF range.
With this new API the valid range can be set.
Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
commit 9205a109fbeee180254bb5a4020eb71d50735944
Author: Guzman Lugo, Fernando <x0095840@xxxxxx>
Date: Wed Dec 15 00:54:02 2010 +0000
OMAP: iovmm: replace __iounmap with iounmap
__iounmap function is wrong for OMAP architecture,
instead use iounmap which will call to the correct function.
Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
commit ad1081210f3c91874f9fe9b48c3934c7db9714b7
Author: Guzman Lugo, Fernando <x0095840@xxxxxx>
Date: Wed Dec 15 00:54:01 2010 +0000
OMAP: iovmm: add superpages support to fixed da address
This patch adds superpages support to fixed ad address
inside iommu_kmap function.
Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
commit ba6e1f4ff41314906d81e6d96e646cdeafe42827
Author: Guzman Lugo, Fernando <x0095840@xxxxxx>
Date: Wed Dec 15 00:54:00 2010 +0000
OMAP: iovmm: no gap checking for fixed address
If some fixed da address is wanted to be mapped and the page
is freed but it is used as gap, the mapping will fail.
This patch is fixing that and olny keeps the gap for
not fixed address.
Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
commit 5af244fdf2a2405b2181da2a32636f3ca5ef162e
Author: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Date: Mon Nov 15 11:48:33 2010 +0200
[ARM] Dove: add support for multi-purpose pins configuration
Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Acked-by: Saeed Bishara <saeed@xxxxxxxxxxx>
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
commit 8d4ce4cd7480ccd8412d4391d063733d6fc52f5c
Author: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Date: Mon Nov 15 11:48:32 2010 +0200
[ARM] Dove: add support for GPIOs 64-71
Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Acked-by: Saeed Bishara <saeed@xxxxxxxxxxx>
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
commit 248daa084cee4b212ff4408e9c9b05b3bdc0da0d
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date: Wed Dec 15 16:10:12 2010 +0200
wl12xx_sdio_test: rename files to match current style
Change some file names and Kconfig settings so that this new module matches
the new way of using wl12xx instead of wl1271.
Also fix SDIO power enabling and disabling to match the latest way of doing
it.
Cc: Roger Quadros <roger.quadros@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit f0a6332ce221614fbd0731af92f668892fa4b700
Author: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
Date: Wed Dec 15 08:37:00 2010 +0100
kbuild: add numeric --set-val option to scripts/config
Add new option to scripts/config for changing .config numeric values
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit ee1ae4d7b1c9a8b73e232fa33dc733be59368ff6
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Wed Dec 15 09:56:35 2010 +0100
ARM i.MX51: Full iomux support
This iomux file has been constructed from the Freescale pinmux tool.
It contains all pins from the tool, but the datasheet lists some
configurations not present in the tool, these are not yet added.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 4ce2c1e8e899831dd152bd0d534a60da6fb1582a
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:41:18 2010 -0500
kconfig: fix `zconfdebug' extern declaration
This symbol is only exist if YYDEBUG is defined.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit bf128f5265625b8015789ea8f12b3582dc29faa3
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:41:17 2010 -0500
kconfig/conf: merge duplicate switch's case
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 579fb8e741fecef7dfd64afcc7b0b0c68ea207cc
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:41:16 2010 -0500
kconfig: fix typos
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 1ebfa5198ee96f34f2ee4ae95c92318f07341fbd
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:41:15 2010 -0500
kbuild/gconf: add dummy inline for bind_textdomain_codeset()
This symbols is used by gconf.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit fe04ce0bf955eaf53f7e4cd6bb35976fa94e0925
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:41:14 2010 -0500
kbuild/nconf: fix spaces damage
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 6742f554db14da94172da9eb1875a1aa944a827f
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Mon Dec 13 09:52:37 2010 +0200
wl12xx: Change TX queue to be per AC
With the current single-queue implementation traffic priorization is not
working correctly - when using multiple BE streams and one, say VI stream,
the VI stream will share bandwidth almost equally with the BE streams.
To fix the issue, implement per AC queues, which are emptied in priority
order to the firmware. To keep it relatively simple, maintain a global
buffer count and global queue stop/wake instead of per-AC.
With these changes, priorization appears to work just fine.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 17c1755c24d83f9fd0509b64c76cc43fc60cc642
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Sun Dec 12 12:15:35 2010 +0200
wl12xx: allow runtime changing of debug_level
Currently, the debug level is set in compilation time (by the DEBUG_LEVEL
const). This method has the advantage of compiling only the relevant
messages, while optimizing out the unused ones.
In order to allow runtime control over the debug_level, while optimizing
out messages when debug messages are not needed, we combine some methods:
1. use dynamic_debug (pr_debug) rather then printk.
2. add debug_level module param in order to set debug level during insmod.
3. add debug_level sysfs file in order to allow dynamic control over the
debug level.
Since patches for pr_debug_hex_dump() implementation haven't been applied yet,
we are still temporarly using print_hex_dump().
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit ea559b460509b241cc1a3f36eebe0b2b634b3cf2
Author: Guy Eilam <guy@xxxxxxxxxx>
Date: Thu Dec 9 16:54:59 2010 +0200
wl1271: fixed problem with WPS IEs in probe requests
Inclusion of a WPS IE in probe requests caused a problem
in the driver due to the maximum size of the probe request
template and the max_scan_ie_len values at initialization.
Increased the size of probe request template
to the maximum size allowed by the firmware.
Struct wl12xx_probe_req_template, which was only used
for calculating the max size of the probe request template,
is no longer used and needed.
max_scan_ie_len is used for validating the size of
additional IEs in scan requests.
Initialized the max_scan_ie_len field to the maximum size
of the probe request template minus the ieee80211 header size.
Signed-off-by: Guy Eilam <guy@xxxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 0dce631092f410bb22b21b3d47ef20d69389dfd9
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:33:16 2010 -0500
kconfig: nuke second argument of conf_write_symbol()
Replacing S_TRISTATE by S_BOOLEAN is a no-op for conf_write_symbol().
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
[mmarek: Fix unused variable warning in conf_write()]
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit c5312772156bb5f9b2e95e4c91526d578426a069
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Thu Dec 9 11:31:27 2010 +0200
wl12xx: add auto-arp support
The auto-arp feature of wl12xx allows the firmware to automatically
response to arp requests asking for its ip.
in order to use it, we configure the arp response template and
enable the corresponding bit in wl1271_acx_arp_filter (along with
passing its ip)
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit b69eb80bf7a6922fef8056d42b06124a7de31501
Author: Roger Quadros <roger.quadros@xxxxxxxxx>
Date: Wed Dec 1 11:58:54 2010 +0200
wl1271_sdio_test: Add module for sdio RX/TX testing
This module enables individually generating RX and TX traffic
over the SDIO bus on which the WL1271 chipset is connected.
This is required to perform RF interference testing.
The module takes 2 module parameters 'rx' and 'tx'.
To generate RX traffic:
modprobe wl1271_sdio_test rx=1
To generate TX traffic:
modprobe wl1271_sdio_test tx=1
To generate both RX & TX traffic, set both rx and tx to 1.
You can change the testing configuration at runtime by changing
the rx & tx values at /sys/modules/wl1271_sdio_test/
To stop testing simply unload the module.
Signed-off-by: Roger Quadros <roger.quadros@xxxxxxxxx>
Reviewed-by: Carlos Chinea <carlos.chinea@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit fb6a6819fad0d71b47577a51709440a9f8441f0a
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date: Fri Dec 3 17:05:40 2010 +0200
wl12xx: disable 11a channels when wl->enable_11a is known
Disabling the 11a channels when not supported in the reg_notify function was
not working as it should, because when the driver is initiailizing (and
registering itself with mac80211), it would get the reg notification too
early. At that point the driver wouldn't have received the NVS yet, so it
wouldn't know whether 11a was supported.
To fix this, we disable 11a channels when we read the NVS instead. Also, it
is easier (and still safe) to set n_channels to zero instead of setting the
disabled flag on every 11a channel.
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 6e71fabe9e60b1c6db587fbeac349848647920ab
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sun Dec 5 01:31:57 2010 -0500
kconfig: do not define AUTOCONF_INCLUDED
AUTOCONF_INCLUDED is not checked is not used within the tree and its parent
header, `autoconf.h', is safe to be re-included.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 8fbf397c3389c1dedfa9ee412715046ab28fd82d
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Wed Dec 1 17:37:45 2010 +0000
ARM: hw_breakpoint: do not fail initcall if monitor mode is disabled
The debug registers can only be manipulated from software if monitor
debug mode is enabled. On some cores, this can never be enabled (i.e.
the corresponding bit in the DSCR is RAZ/WI).
This patch ensures we can handle this hardware configuration and fail
gracefully, rather than blow up the kernel during boot.
Reported-by: Cyril Chemparathy <cyril@xxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 52f6c5ad430e41736133acac179607b224eaaa11
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Wed Dec 15 17:58:57 2010 +0800
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
Add missing header file:
arch/x86/crypto/ghash-clmulni-intel_glue.c:256: error: implicit declaration of function 'IS_ERR'
arch/x86/crypto/ghash-clmulni-intel_glue.c:257: error: implicit declaration of function 'PTR_ERR'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 96f3e2568456402769f3998e111746941f549dc6
Author: Lothar WaÃ?mann <LW@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 22 09:39:51 2010 +0100
MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)
This patch actually replaces the 'struct pad_desc' with a u64 cookie
to facilitate adding platform specific pad_ctrl settings to an
existing pad definition.
So, instead of:
iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21;
power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2;
mxc_iomux_v3_setup_pad(&power_key);
one can write:
mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2);
Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6
Signed-Off-By: Lothar WaÃ?mann <LW@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit ed41390fa57a21d06e6e3a3c4bc238bab8957fbb
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Tue Dec 14 16:23:10 2010 +0100
workqueue: deprecate cancel_rearming_delayed_work[queue]()
There's no in-kernel user left for these two obsolete functions. Mark
them deprecated and schedule for removal during 2.6.39 cycle.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit afe2c511fb2d75f1515081ff1be15bd79cfe722d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Tue Dec 14 16:21:17 2010 +0100
workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()
cancel_rearming_delayed_work[queue]() has been superceded by
cancel_delayed_work_sync() quite some time ago. Convert all the
in-kernel users. The conversions are completely equivalent and
trivial.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: "David S. Miller" <davem@xxxxxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Acked-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Cc: Jeff Garzik <jgarzik@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
Cc: Anton Vorontsov <cbou@xxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Cc: Alex Elder <aelder@xxxxxxx>
Cc: xfs-masters@xxxxxxxxxxx
Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: netfilter-devel@xxxxxxxxxxxxxxx
Cc: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: linux-nfs@xxxxxxxxxxxxxxx
commit b99ddbf83c064382b145d2156cc819d1eb4fc54d
Author: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
Date: Tue Dec 14 14:39:06 2010 +0200
OMAP: OMAPFB: disable old omapfb for OMAP4 builds
Build fails when OMAP4 and FB_OMAP are defined:
drivers/built-in.o: In function `omapfb_do_probe':
drivers/video/omap/omapfb_main.c:1773: undefined reference to `omap2_int_ctrl'
Old omapfb does not work on OMAP4, and never will. Change the omapfb
build dependency so that old omapfb depends on OMAP1/2/3, fixing the
build for plain OMAP4 builds.
Reported-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
commit 4422c04bbb09f1864e2ce27296457f86d4167fe2
Author: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
Date: Tue Dec 14 14:16:59 2010 +0200
OMAP: DSS: VRAM: Align start & size of vram to 2M
Align the start address and size of VRAM area to 2M as per comments from
Russell King:
> > So, why SZ_2M?
>
> Firstly, that's the granularity which we allocate page tables - one
> Linux page table covers 2MB of memory. We want to avoid creating page
> tables for the main memory mapping as that increases TLB pressure through
> the use of additional TLB entries, and more page table walks.
>
> Plus, we never used to allow the kernel's direct memory mapping to be
> mapped at anything less than section size - this restriction has since
> been lifted due to OMAP SRAM problems, but I'd rather we stuck with it
> to ensure that we have proper behaviour from all parts of the system.
>
> Secondly, we don't want to end up with lots of fragmentation at the end
> of the memory mapping as that'll reduce performance, not only by making
> the pfn_valid() search more expensive.
>
> Emsuring a minimum allocation size and alignment makes sure that the
> regions can be coalesced together into one block, and minimises run-time
> expenses.
>
> So please, 2MB, or if you object, at the _very_ _least_ 1MB. But
> definitely not PAGE_SIZE.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit ac612407932be18697b5ae9da0a80f138b8bea8e
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Wed Dec 15 09:18:18 2010 +0100
ALSA: HDA: Enable subwoofer on Asus G73Jw
Set default association/sequence right on pin 0x17 in order for
the automatic parser to recognize the subwoofer correctly.
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit ab4e0192196b8d4e43a3945742d4996da934a86f
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Tue Dec 14 23:53:21 2010 -0800
Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while
extending them to support large scancodes was a mistake. While we tried
to keep ABI intact (and we succeeded in doing that, programs compiled
on older kernels will work on newer ones) there is still a problem with
recompiling existing software with newer kernel headers.
New kernel headers will supply updated ioctl numbers and kernel will
expect that userspace will use struct input_keymap_entry to set and
retrieve keymap data. But since the names of ioctls are still the same
userspace will happily compile even if not adjusted to make use of the
new structure and will start miraculously fail in the field.
To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions
and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly
select the style of ioctls it wants to employ.
Reviewed-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit fe67b24010c66a14d84117ac67d23ed1bcb18a71
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Wed Dec 15 08:01:46 2010 +0100
ALSA: HDA: Fix auto-mute on Lenovo Edge 14
BugLink: http://launchpad.net/bugs/690530
The SKU value of this machine dictates that auto-mute should be
disabled. Since the SKU value is similar to the PCI SSID, the most
likely conclusion is that the SKU value should be ignored.
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 3b1826cebe1d534ec05417a29b9a9f82651a5cb5
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 13 16:53:13 2010 -0500
encrypted-keys: style and other cleanup
Cleanup based on David Howells suggestions:
- use static const char arrays instead of #define
- rename init_sdesc to alloc_sdesc
- convert 'unsigned int' definitions to 'size_t'
- revert remaining 'const unsigned int' definitions to 'unsigned int'
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 1f35065a9e2573427ce3fd6c4a40b355c2ddfb92
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 13 16:53:12 2010 -0500
encrypted-keys: verify datablob size before converting to binary
Verify the hex ascii datablob length is correct before converting the IV,
encrypted data, and HMAC to binary.
Reported-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 1bdbb4024c309e470711b434a24fb356fc92edea
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 13 16:53:11 2010 -0500
trusted-keys: kzalloc and other cleanup
Cleanup based on David Howells suggestions:
- replace kzalloc, where possible, with kmalloc
- revert 'const unsigned int' definitions to 'unsigned int'
Signed-off-by: David Safford <safford@xxxxxxxxxxxxxx>
Acked-by: Mimi Zohar <zohar@xxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit bc5e0af0b36b6cc9de301074426c279fc9b72675
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 13 16:53:10 2010 -0500
trusted-keys: additional TSS return code and other error handling
Previously not all TSS return codes were tested, as they were all eventually
caught by the TPM. Now all returns are tested and handled immediately.
This patch also fixes memory leaks in error and non-error paths.
Signed-off-by: David Safford <safford@xxxxxxxxxxxxxx>
Acked-by: Mimi Zohar <zohar@xxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Acked-by: Serge E. Hallyn <serge@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit df127ee375af4cb40b979605e0c336fc79bd38e7
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 14 19:17:31 2010 -0800
omap: Fix setting omap_irq_base for 2430
We need to test for 24xx not 242x. Otherwise interrupts won't work.
Reported-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 0fcdcfbbc98f70f559e4b36773a69972489a6d8f
Merge: 6d5e93c2aa1248b25f9de0eaca1dca038e31d79d 2d64672ed38721b7a3815009d79bfb90a1f34a17
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 18:50:10 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: It is likely that WORKER_NOT_RUNNING is true
MAINTAINERS: Add workqueue entry
workqueue: check the allocation of system_unbound_wq
commit 6d5e93c2aa1248b25f9de0eaca1dca038e31d79d
Merge: 3d0b6087f3f2c88caef25e1455ff8db0816d4e11 589a594be1fb8815b3f18e517be696c48664f728
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 18:49:40 2010 -0800
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: protect against NULL reference when waiting to start a raid10.
md: fix bug with re-adding of partially recovered device.
md: fix possible deadlock in handling flush requests.
md: move code in to submit_flushes.
md: remove handling of flush_pending in md_submit_flush_data
commit 3d0b6087f3f2c88caef25e1455ff8db0816d4e11
Author: Major Lee <major_lee@xxxxxxxxxxx>
Date: Fri Dec 10 10:13:49 2010 +0000
dw_spi: Fix missing final read in some polling situations
There is a possibility that the last word of a transaction will be lost
if data is not ready. Re-read in poll_transfer() to solve this issue
when poll_mode is enabled.
Verified on SPI touch screen device.
Signed-off-by: Major Lee <major_lee@xxxxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 54efdfeb49f03adfd0196935335890469ed314b9
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Tue Dec 14 15:29:08 2010 +0000
i2c_intel_mid: Fix slash in sysfs name
This gets caught by the new sanity check code. Instead of the slash use a
different symbol. This was originally found by Major Lee who proposed a
rather more complex patch which changed the name according to the chip
type.
On the basis that we are in a late -rc and making Linus grumpy isn't always
a good idea (however fun) this is a simple alternative.
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 6d5c3aa84b3e431f2d0fc39c73c867d1a4dd8cff
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Tue Dec 14 21:45:31 2010 -0500
ext4: fix typo which broke '..' detection in ext4_find_entry()
There should be a check for the NUL character instead of '0'.
Fortunately the only thing that cares about this is NFS serving, which
is why we didn't notice this in the merge window testing.
Reported-by: Phil Carmody <ext-phil.2.carmody@xxxxxxxxx>
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
commit dbd9fd63bdc7d73f3822a5e9dfaa6654e530518c
Merge: ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de 21b6e4c7106b2d68a6710506d8706608272fd78b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:37:08 2010 -0800
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: wire up accept4 syscall (non-multiplexed path)
sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.
commit ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de
Merge: fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9 c2015dc88a57090bcf67ab7cfcdbc34671598d36
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:36:35 2010 -0800
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
OMAP2+: PM/serial: fix console semaphore acquire during suspend
OMAP1: SRAM: fix size for OMAP1611 SoCs
arm: omap2: io: fix clk_get() error check
arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
omap: nand: remove hardware ECC as default
omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
omap: PM debug: fix wake-on-timer debugfs dependency
commit fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9
Merge: 478b2a34e7d496b0cc3ae7696362740f954c91ba 85b093bcc5322baa811a03ec73de0909c157f181
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:36:10 2010 -0800
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6535/1: V6 MPCore v6_dma_inv_range and v6_dma_flush_range RWFO fix
ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL
ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6
Change bcmring Maintainer list.
ARM: Update mach-types
ARM: 6528/1: Use CTR for the I-cache line size on ARMv7
ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7
ARM: pxa/palm: fix ifdef around gen_nand driver registration
ARM: pxa: fix pxa2xx-flash section mismatch
ARM: mmp2: remove not used clk_rtc
commit 478b2a34e7d496b0cc3ae7696362740f954c91ba
Merge: b4fe2a03422e6bd20bd8df5e428109a85c9ea961 595a251c0740785fd3c0d2156d78578c7479811e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:34:00 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Write to prom console using indirect buffer.
sparc: Delete prom_*getchar().
sparc: Pass buffer pointer all the way down to prom_{get,put}char().
sparc: Do not export prom_nb{get,put}char().
sparc64: Delete prom_setcallback().
sparc64: Unexport prom_service_exists().
sparc: Kill prom devops_{32,64}.c
sparc: Remove prom_pathtoinode()
sparc64: Delete prom_puts() unused.
SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ
commit b4fe2a03422e6bd20bd8df5e428109a85c9ea961
Merge: 85cb7f1264c4d9e60ccdce52740238222e77ccd0 2a27a03d3a891e87ca33d27a858b4db734a4cbab
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:33:40 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (75 commits)
pppoe.c: Fix kernel panic caused by __pppoe_xmit
WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.
bnx2x: Advance a version number to 1.60.01-0
bnx2x: Fixed a compilation warning
bnx2x: LSO code was broken on BE platforms
qlge: Fix deadlock when cancelling worker.
net: fix skb_defer_rx_timestamp()
cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes
phy: add the IC+ IP1001 driver
atm: correct sysfs 'device' link creation and parent relationships
MAINTAINERS: remove me from tulip
SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
enic: Bug Fix: Pass napi reference to the isr that services receive queue
ipv6: fix nl group when advertising a new link
connector: add module alias
net: Document the kernel_recvmsg() function
r8169: Fix runtime power management
hso: IP checksuming doesn't work on GE0301 option cards
xfrm: Fix xfrm_state_migrate leak
net: Convert netpoll blocking api in bonding driver to be a counter
...
commit 85cb7f1264c4d9e60ccdce52740238222e77ccd0
Merge: 3373c3ddb26848beee7b8a96fb98d89533dbf9d7 7c03b87048f2467087ae7e51392e5fb57ea8f58b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 17:32:56 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
[SCSI] qla2xxx: Update version number to 8.03.05-k0.
[SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function.
[SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
[SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
[SCSI] qla2xxx: Populate Command Type 6 LUN field properly.
[SCSI] zfcp: Issue FCP command without holding SCSI host_lock
[SCSI] zfcp: Prevent usage w/o holding a reference
[SCSI] zfcp: No ERP escalation on gpn_ft eval
[SCSI] zfcp: Correct false abort data assignment.
[SCSI] zfcp: Fix common FCP request reception
[SCSI] Eliminate error handler overload of the SCSI serial number
[SCSI] pmcraid: disable msix and expand device config entry
[SCSI] bsg: correct fault if queue object removed while dev_t open
[SCSI] osd: checking NULL instead of ERR_PTR()
commit 3373c3ddb26848beee7b8a96fb98d89533dbf9d7
Merge: 3907969596091f429b7864cfe4e473a227876a96 8863ada9c47503bb93eba5e3a9ba88e6311db31f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 14:35:04 2010 -0800
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdboc,input: Fix regression with keyboard release key and early debugging
commit 3907969596091f429b7864cfe4e473a227876a96
Merge: 66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef 23437b5c50f523a87ca5c02fd883b069ca8be7f3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 14:33:33 2010 -0800
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D
ACPI/HEST: adjust section selection
ACPI: eliminate unused variable warning for !ACPI_SLEEP
ACPI/PNP: avoid section mismatch warning
ACPI thermal: remove two unused functions
ACPI: fix a section mismatch
ACPI, APEI, use raw spinlock in ERST
ACPI: video: fix build for CONFIG_ACPI=n
ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
ACPI: fix allowing to add/remove multiple _OSI strings
acpi: fix _OSI string setup regression
ACPI: EC: Add another dmi match entry for MSI hardware
ACPI battery: update status upon sysfs query
ACPI ac: update AC status upon sysfs query
ACPI / PM: Do not refcount power resources that can't be turned on
ACPI / PM: Check device state before refcounting power resources
commit 66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef
Merge: 1c00802d3f62769a88e46212fae6f38082d30731 56b9aea3b740be7665be100872a913da9bdc653b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 14:33:13 2010 -0800
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
intel_idle: recognize ARAT on WSM-EX
commit 85b093bcc5322baa811a03ec73de0909c157f181
Author: Valentine Barshak <vbarshak@xxxxxxxxxx>
Date: Tue Dec 14 00:03:16 2010 +0100
ARM: 6535/1: V6 MPCore v6_dma_inv_range and v6_dma_flush_range RWFO fix
Cache ownership must be acquired by reading/writing data from the
cache line to make cache operation have the desired effect on the
SMP MPCore CPU. However, the ownership is never acquired in the
v6_dma_inv_range function when cleaning the first line and
flushing the last one, in case the address is not aligned
to D_CACHE_LINE_SIZE boundary.
Fix this by reading/writing data if needed, before performing
cache operations.
While at it, fix v6_dma_flush_range to prevent RWFO outside
the buffer.
Cc: stable@xxxxxxxxxx
Signed-off-by: Valentine Barshak <vbarshak@xxxxxxxxxx>
Signed-off-by: George G. Davis <gdavis@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 593c252a731389ffdd00d4cb2d20192c47aa18c1
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Dec 13 21:56:03 2010 +0100
ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL
Because the nwfpe support is unlikely to be used on new platforms
and requires CONFIG_OABI_COMPAT, which is not generally used with
ARMv7+, we shouldn't expect to build nwfpe support into a Thumb-2
kernel.
At present, nwfpe contains assembly code which isn't Thumb-2
compatible, and for now it doesn't appear useful to port this
code.
All ARMv7-A/R platforms necessarily have VFPv3 hardware floating-
point natively, making emulation unnecessary.
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Dec 13 21:53:53 2010 +0100
ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6
This makes sense, because Thumb-2 code can't execute on plain
ARMv6 processors.
This will avoid accidentally configuring a broken kernel where the
config otherwise would allow multiple architecture versions to
coexist in the same kernel.
Not adding !CPU_V5 etc., because the chance of anyone trying to
put v5 and v7 in the same kernel is low, and I'm not aware of
any mach which can do this. These could be added later if it
matters.
Note that the rules may need to be refined if support for the
ARM1156J(F)-S processor is later added to the kernel, since this
processor supports the rare ARMv6T2 extensions, which add support
for Thumb-2 and a few other ARMv7 features.
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 41263fc6716dea402125c95f38ed83ebf59d5172
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Tue Dec 14 11:39:44 2010 -0500
kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
If you try to build a kernel with KCONFIG_CONFIG set (to a value
not equal to .config) and that config sets CONFIG_IKCONFIG then the
build will fail with:
make[1]: *** No rule to make target `.config', needed by \
`kernel/config_data.gz'. Stop.
because the kernel/Makefile contains a direct reference to .config.
This issue has been present since the introduction of KCONFIG_CONFIG
in 14cdd3c402bf7c66f0bcd76e290f0770a54a4b21.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
CC: Roman Zippel <zippel@xxxxxxxxxxxxxx>
CC: Michal Marek <mmarek@xxxxxxx>
Reviewed-by: Michal Marek <mmarek@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 448f53a1ede54eb854d036abf54573281412d650
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 20:06:20 2010 +0000
drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks
Fixes the lack of output on the LVDS panel of the Lenovo U160.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31596
Reported-and-tested-by: Dirk Gouders <gouders@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit d6db46675dba21203378b6993068ec04bb53389c
Author: Jiandong Zheng <jdzheng@xxxxxxxxxxxx>
Date: Tue Dec 14 21:55:49 2010 +0000
Change bcmring Maintainer list.
I am Jiandong Zheng working on BCMRING in Broadcom Canada Ltd. I am
replacing Leo Chen (leochen@xxxxxxxxxxxx) as "ARM/BCMRING ARM
ARCHITECTURE" and "ARM/BCMRING MTD NAND DRIVER" maintainer from
Broadcom as he is no longer the maintainer of these components.
Signed-off-by: Jiandong Zheng <jdzheng@xxxxxxxxxxxx>
Acked-by: Scott Branden <sbranden@xxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 1c00802d3f62769a88e46212fae6f38082d30731
Merge: dc99bf78238a7554578a319d8fd06655151121a3 e504b84805c574cf18d705c610c9e4a8f6e61017
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:37:12 2010 -0800
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
fbdev: Fix fb_find_nearest_mode refresh comparison
commit dc99bf78238a7554578a319d8fd06655151121a3
Merge: 5d43a1de26f37080b75d7c0cf2a0b97523457568 0a6bf658c3b9d1d0e520d320b6392c8680c2e381
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:36:26 2010 -0800
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (ltc4215) make sysfs file match the alarm cause
commit 5d43a1de26f37080b75d7c0cf2a0b97523457568
Merge: 7103b71b0ff6a5d8d71438e63dfc539a6f0a61bd 59a609d9b59be9452f168fe228befea53d5962ff
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:35:47 2010 -0800
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: at_hdmac: fix buffer transfer size specification
fsldma: fix issue of slow dma
dmaengine i.MX SDMA: initialize on module_init
dma : EG20T PCH: Fix miss-setting DMA descriptor
intel_mid_dma: fix section mismatch warnings
dmaengine: imx-sdma: fix bug in buffer descriptor initialization
drivers/dma/ppc4xx: Use printf extension %pR for struct resource
drivers/dma/ioat: Use the ccflag-y instead of EXTRA_CFLAGS
drivers/dma/: Use the ccflag-y instead of EXTRA_CFLAGS
dma: intel_mid_dma: fix double free on mid_setup_dma error path
dma: imx-dma: fix imxdma_probe error path
commit 7103b71b0ff6a5d8d71438e63dfc539a6f0a61bd
Merge: a49cd5f6e9035151c1a0ba1e27fe155f0b82f1d6 7182afea8d1afd432a17c18162cc3fd441d0da93
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:34:25 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/uverbs: Handle large number of entries in poll CQ
commit a49cd5f6e9035151c1a0ba1e27fe155f0b82f1d6
Merge: 353495a5abcee1368a93f71b0e49390f96f24fb4 9993e0fe0f5f29c69e79efcb271ffc9843002985
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:33:52 2010 -0800
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
firewire: ohci: fix regression with VIA VT6315, disable MSI
commit 353495a5abcee1368a93f71b0e49390f96f24fb4
Merge: f9ae3e125ceb8226c94d7d0c640927fa8b7f256a 1b39ed0cf51193f3ba03044369ab4d144712a9b8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:33:21 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: tps6586x: correct register table
regulator: tps6586x: Handle both enable reg/bits being the same
regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
regulator: tps6586x: Add missing bit mask generation
commit f9ae3e125ceb8226c94d7d0c640927fa8b7f256a
Merge: 6371e82307237dede71f884ad8e8e11faa75e8be d70ab7f7ee0692efc880d772dc5c212174d67e3b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:32:40 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: HDA: Quirk for Dell Vostro 320 to make microphone work
ALSA: hda - Reset sample sizes and max bitrates when reading ELD
ALSA: hda - Always allow basic audio irrespective of ELD info
ALSA: hda - Do not wrongly restrict min_channels based on ELD
ASoC: Correct WM8962 interrupt mask register read
ASoC: WM8580: Debug BCLK and sample size
ASoC: Fix resource leak if soc_register_ac97_dai_link failed
ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
ASoC: Fix off by one error in WM8994 EQ register bank size
ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable capture on internal mic
ALSA: hda - Enable jack sense for Thinkpad Edge 13
ALSA: hda - Fix ThinkPad T410[s] docking station line-out
ALSA: hda: Use model=lg quirk for LG P1 Express to enable playback and capture
commit 6371e82307237dede71f884ad8e8e11faa75e8be
Merge: c3606c60a91969cc42c12bae71a022ca56de83d2 e726f3c368e7c1919a7166ec09c5705759f1a69d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:32:19 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Fix interleaving check
EDAC: Correct MiB_TO_PAGES() macro
EDAC: Fix workqueue-related crashes
commit c3606c60a91969cc42c12bae71a022ca56de83d2
Merge: d5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4 f3886f85cfde578f1d0ba6e40ac5f9d70043923b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:31:49 2010 -0800
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP
drm: use after free in drm_queue_vblank_event()
drm/kms: remove spaces from connector names (v2)
commit d5f04ff5fba75e3e9607a65f46cfbfbdf8d69ce4
Merge: 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd 8b0f1840a46449e1946fc88860ef3ec8d6b1c2c7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 13:31:23 2010 -0800
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (adm1026) Allow 1 as a valid divider value
hwmon: (adm1026) Fix setting fan_div
hwmon: (it87) Fix manual fan speed control on IT8721F
commit ba9effa2ecdc08325bd297d541b4207b2df38184
Author: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Date: Mon Dec 13 19:10:29 2010 +0200
kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
Export linux/a.out.h, linux/kvm.h and linux/kvm_para.h on
headers_install_all if at least one architecture has appropriate files
in arch-dependent headers.
Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit f6820308e025d645d9d766c97586badd4ddb8754
Author: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Date: Mon Dec 13 19:10:28 2010 +0200
kbuild: introduce HDR_ARCH_LIST for headers_install_all
Using HDR_ARCH_LIST you can specify subset of architectures you want to get
headers for.
Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 56e6417b49132d4f56e9f2241d31942b90b46315
Author: Eduardo Costa <ecosta.tmp@xxxxxxxxx>
Date: Tue Dec 14 14:37:59 2010 -0600
p54usb: New USB ID for Gemtek WUBI-100GW
This USB ID is for the WUBI-100GW 802.11g Wireless LAN USB Device that
uses p54usb.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: Eduardo Costa <ecosta.tmp@xxxxxxxxx>
Cc: Stable <stable@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8990c1bc4be46473ad19bf2fa612ca57286f3df4
Merge: 2979076fbf17a0947d6eba367b0cac19c907c160 c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4
Author: Michal Marek <mmarek@xxxxxxx>
Date: Tue Dec 14 22:01:55 2010 +0100
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
commit d33e455337ea2c71d09d7f4367d6ad6dd32b6965
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 14 13:01:14 2010 -0800
net: Abstract default MTU metric calculation behind an accessor.
Like RTAX_ADVMSS, make the default calculation go through a dst_ops
method rather than caching the computation in the routing cache
entries.
Now dst metrics are pretty much left as-is when new entries are
created, thus optimizing metric sharing becomes a real possibility.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 88606e80da0e8d862a42ee19e5bb60b01b940ea7
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 14 21:37:13 2010 +0100
MAINTAINERS: Update timer related entries
Bring the existing file list up to date and add a new entry for
timekeeping and ntp. Assign John Stultz to this new entry so he gets
all the blame :)
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: John Stultz <johnstul@xxxxxxxxxx>
commit 1449032be17abb69116dbc393f67ceb8bd034f92
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Tue Dec 14 15:27:50 2010 -0500
ext4: Turn off multiple page-io submission by default
Jon Nelson has found a test case which causes postgresql to fail with
the error:
psql:t.sql:4: ERROR: invalid page header in block 38269 of relation base/16384/16581
Under memory pressure, it looks like part of a file can end up getting
replaced by zero's. Until we can figure out the cause, we'll roll
back the change and use block_write_full_page() instead of
ext4_bio_write_page(). The new, more efficient writing function can
be used via the mount option mblk_io_submit, so we can test and fix
the new page I/O code.
To reproduce the problem, install postgres 8.4 or 9.0, and pin enough
memory such that the system just at the end of triggering writeback
before running the following sql script:
begin;
create temporary table foo as select x as a, ARRAY[x] as b FROM
generate_series(1, 10000000 ) AS x;
create index foo_a_idx on foo (a);
create index foo_b_idx on foo USING GIN (b);
rollback;
If the temporary table is created on a hard drive partition which is
encrypted using dm_crypt, then under memory pressure, approximately
30-40% of the time, pgsql will issue the above failure.
This patch should fix this problem, and the problem will come back if
the file system is mounted with the mblk_io_submit mount option.
Reported-by: Jon Nelson <jnelson@xxxxxxxxxxx>
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
commit 9fe146aef44afe5ec677d8150b6ae94e09b773f7
Merge: 6389aa73ab8c15084fce18307a8e198eaff818da 4e53f78e5b06c073a5c10814c72e98c1ca8a9f10
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 14 11:33:23 2010 -0800
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
commit ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 6 10:38:14 2010 +0000
ARM: GIC: move enablement of PPI interrupts to gic.c
Avoid adding nasty genirq-specific code to local timers to enable PPI
interrupts. Instead, provide a gic function to do this.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 7627dc802a98aebebc6a34e5b6558ea4717c968c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 5 08:51:38 2010 +0000
ARM: GIC: private a standard get_irqnr_preamble assembler macro
Provide a standard get_irqnr_preamble assembler macro for platforms
to use, which retrieves the base address of the GIC CPU interface
from gic_cpu_base_addr. Allow platforms to override this by defining
HAVE_GET_IRQNR_PREAMBLE.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Tested-by: Abhijeet Dharmapurikar <adharmap@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit bef8f9ee32511a28f1c9a7d3b8c51cdac030b564
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 4 16:50:58 2010 +0000
ARM: GIC: move gic_data[] initialization into gic_init()
This avoids writing unnecessarily to gic_data[] from other CPUs,
making this a mostly read-only variable.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Tested-by: Abhijeet Dharmapurikar <adharmap@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ff2e27ae0b17f53a6a289c87d325f706598f3788
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 4 16:13:29 2010 +0000
ARM: GIC: consolidate gic_cpu_base_addr to common GIC code
Every architecture using the GIC has a gic_cpu_base_addr pointer for
GIC 0 for their entry assembly code to use to decode the cause of the
current interrupt. Move this into the common GIC code.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Tested-by: Abhijeet Dharmapurikar <adharmap@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 384895330e0f3954d9478fd0853145f9c169df12
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 4 16:01:03 2010 +0000
ARM: GIC: Remove MMIO address from gic_cpu_init, rename to gic_secondary_init
We don't need to re-pass the base address for the CPU interfaces to the
GIC for secondary CPUs, as it will never be different from the boot CPU
- and even if it was, we'd overwrite the boot CPU's base address.
Get rid of this argument, and rename to gic_secondary_init().
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Tested-by: Abhijeet Dharmapurikar <adharmap@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b580b899dd05a007ad232ee49a07b32d91876462
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 4 15:55:14 2010 +0000
ARM: GIC: provide a single initialization function for boot CPU
Provide gic_init() which initializes the GIC distributor and current
CPU's GIC interface for the boot (or single) CPU.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Tested-by: Abhijeet Dharmapurikar <adharmap@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd
Merge: e13cf63f2bbd38721af557f0205da994ea068427 c1ac3ffcd0bc7e9617f62be8c7043d53ab84deac
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 11:09:05 2010 -0800
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.37' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix possible BUG_ON firing in set_change_info
sunrpc: prevent use-after-free on clearing XPT_BUSY
commit e13cf63f2bbd38721af557f0205da994ea068427
Merge: 073f21ae1319348f4f8630003b7901e3be254327 83a50de97fe96aca82389e061862ed760ece2283
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 11:08:13 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: prevent RAID level downgrades when space is low
Btrfs: account for missing devices in RAID allocation profiles
Btrfs: EIO when we fail to read tree roots
Btrfs: fix compiler warnings
Btrfs: Make async snapshot ioctl more generic
Btrfs: pwrite blocked when writing from the mmaped buffer of the same page
Btrfs: Fix a crash when mounting a subvolume
Btrfs: fix sync subvol/snapshot creation
Btrfs: Fix page leak in compressed writeback path
Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots
Btrfs: fixup return code for btrfs_del_orphan_item
Btrfs: do not do fast caching if we are allocating blocks for tree_root
Btrfs: deal with space cache errors better
Btrfs: fix use after free in O_DIRECT
commit 073f21ae1319348f4f8630003b7901e3be254327
Merge: 497b5b13c9e946651991e0296374a15d38590ce1 7572777eef78ebdee1ecb7c258c0ef94d35bad16
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 11:07:39 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: verify ioctl retries
fuse: fix ioctl when server is 32bit
commit 497b5b13c9e946651991e0296374a15d38590ce1
Merge: e97b71ded9ebe527681961c9e6f5ba99f6711974 05340d4ab2ec2b6b4962c1c41c6ea8fb550f947b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 11:06:17 2010 -0800
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: log timestamp changes to the source inode in rename
commit e97b71ded9ebe527681961c9e6f5ba99f6711974
Merge: 38971ce2fac484249d697fe48a9b0851a0b62572 1cd275f609ba46c8cae3ee77e499c54a0d13a983
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 11:02:15 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: fix ioctl magic
ceph: Behave better when handling file lock replies.
ceph: pass lock information by struct file_lock instead of as individual params.
ceph: Handle file locks in replies from the MDS.
ceph: avoid possible null deref in readdir after dir llseek
commit 6389aa73ab8c15084fce18307a8e198eaff818da
Merge: 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be 1d212aa96e1b63459486f729af9a3fa38768b801
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 14 10:52:54 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 38971ce2fac484249d697fe48a9b0851a0b62572
Merge: caa4a59574a39e6574664e82b92455d41eca27a8 5b362ac3799ff4225c40935500f520cad4d7ed66
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 08:51:12 2010 -0800
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: Fix panic after nfs_umount()
nfs: remove extraneous and problematic calls to nfs_clear_request
nfs: kernel should return EPROTONOSUPPORT when not support NFSv4
NFS: Fix fcntl F_GETLK not reporting some conflicts
nfs: Discard ACL cache on mode update
NFS: Readdir cleanups
NFS: nfs_readdir_search_for_cookie() don't mark as eof if cookie not found
NFS: Fix a memory leak in nfs_readdir
Call the filesystem back whenever a page is removed from the page cache
NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler
commit caa4a59574a39e6574664e82b92455d41eca27a8
Merge: 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 545c988b2018a593f24d291b66776a0d08525acd
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 08:49:15 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: remove bogus remapping of error in cifs_filldir()
cifs: allow calling cifs_build_path_to_root on incomplete cifs_sb
cifs: fix check of error return from is_path_accessable
cifs: remove Local_System_Name
cifs: fix use of CONFIG_CIFS_ACL
cifs: add attribute cache timeout (actimeo) tunable
commit d52784eb3607bf887628742f99041b4f18d7d1de
Author: akpm@xxxxxxxxxxxxxxxxxxxx <akpm@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 13:52:14 2010 -0800
headers_check: Fix warning text
Fix the warning text too, per Randy.
Cc: Alexander Shishkin <virtuoso@xxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxxxx>
Cc: WANG Cong <amwang@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit de323f22a83b024b7432e813609c6efb74b1bbfc
Author: akpm@xxxxxxxxxxxxxxxxxxxx <akpm@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 13:51:13 2010 -0800
headers_check: better search for functions in headers
Some headers don't bother with "extern" in function prototypes, which
results in said prototypes being unnoticed and exported to userland.
This patch slightly improves detection of such cases by checking for C
type names as well in the beginning of a line.
Signed-off-by: Alexander Shishkin <virtuoso@xxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Cc: WANG Cong <amwang@xxxxxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 2979076fbf17a0947d6eba367b0cac19c907c160
Author: Mike Frysinger <vapier@xxxxxxxxxx>
Date: Tue Nov 23 19:54:02 2010 -0500
headers_install: check exit status of unifdef
If unifdef fails for any reason (like segfaulting), we should be aborting
the install steps. So check its exit status in this unlikely scenario.
Reported-by: Diego Elio Pettenò <flameeyes@xxxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 2d64672ed38721b7a3815009d79bfb90a1f34a17
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Fri Dec 3 23:12:33 2010 -0500
workqueue: It is likely that WORKER_NOT_RUNNING is true
Running the annotate branch profiler on three boxes, including my
main box that runs firefox, evolution, xchat, and is part of the distcc farm,
showed this with the likelys in the workqueue code:
correct incorrect % Function File Line
------- --------- - -------- ---- ----
96 996253 99 wq_worker_sleeping workqueue.c 703
96 996247 99 wq_worker_waking_up workqueue.c 677
The likely()s in this case were assuming that WORKER_NOT_RUNNING will
most likely be false. But this is not the case. The reason is
(and shown by adding trace_printks and testing it) that most of the time
WORKER_PREP is set.
In worker_thread() we have:
worker_clr_flags(worker, WORKER_PREP);
[ do work stuff ]
worker_set_flags(worker, WORKER_PREP, false);
(that 'false' means not to wake up an idle worker)
The wq_worker_sleeping() is called from schedule when a worker thread
is putting itself to sleep. Which happens most of the time outside
of that [ do work stuff ].
The wq_worker_waking_up is called by the wakeup worker code, which
is also callod outside that [ do work stuff ].
Thus, the likely and unlikely used by those two functions are actually
backwards.
Remove the annotation and let gcc figure it out.
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 3e6cd7a4b6a04cf354a18c9d2e7ecec8fa1772fb
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Fri Dec 10 17:20:23 2010 +0100
MAINTAINERS: Add workqueue entry
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 1874542d952bbea01997191aee868b472555fd9a
Author: Florian Fainelli <ffainelli@xxxxxxxxxx>
Date: Tue Dec 14 11:56:56 2010 +0100
HID: replace offsets values with their corresponding BTN_* defines
Instead of using magic values, use their corresponding BTN_* defines
from linux/input.h.
Signed-off-by: Florian Fainelli <ffainelli@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 71f4566084eb592fe545f05f7dff41fa9aa42e0b
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 14 11:29:23 2010 +0000
agp/intel: Fix missed cached memory flags setting in i965_write_entry()
This fixes regression from a6963596a13e62f8e65b1cf3403a330ff2db407c,
that missed to set cached memory type in GTT entry.
Signed-off-by: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit c25bcd340033bf5b8dc30c16a99e64259f099446
Author: Benjamin Tissoires <benjamin.tissoires@xxxxxxx>
Date: Mon Dec 13 15:59:13 2010 +0100
HID: hid-mosart: support suspend/resume
The device has 2 modes. The first one is an emulation of a touchscreen
by sending left and right button, and the second mode is the one used in
dual-touch (sending trackingID, touch and else).
In case of a suspend/resume, the device switch back to the first mode
described above (with left and right buttons).
This adds a hook in .reset_resume for the device to be switched to
the correct mode (I just copied the code in mosart_probe).
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit ad6d42670279da8f33f633f8a96a67cd7ef3b1da
Author: Benjamin Tissoires <benjamin.tissoires@xxxxxxx>
Date: Tue Dec 14 11:38:18 2010 +0100
HID: hid-mosart: ignore buttons report
This commit allows the device to be recognized as a touchscreen, and not a
touchpad by xf86-input-evdev.
The device has 2 modes. The first one is an emulation of a touchscreen by
sending left and right button, and the second mode is the one used in
dual-touch (sending trackingID, touch and else).
That's why there is a hid report containing left and right buttons
(9000001 and 9000002). The point is that xorg relies on these fields to
determine if it's a touchpad or a touchscreen.
Clearing the report (return -1) makes xorg detecting it out of the box
as a quite pleasant (dual)touchscreen.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxx>
Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 72f4d57923d2aa651db060a71a6f6211654c119e
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 14 16:57:11 2010 +0900
ARM: mach-shmobile: sh73a0 SMP support
Add SMP support for ag5evm and the sh73a0 processor.
Onlining and offlining works well, but at this point
offlined processor cores are not put into sleep mode.
There is no spinlock for syncing the secondary core
with the first one in this implementation. The code
instead relies on the cpu_online() check in __cpu_up().
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4d7ec69576ca4427478405190bd32e560f06fe99
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 14 16:57:03 2010 +0900
ARM: mach-shmobile: Enable SMP support
Allow SMP to be enabled on R-Mobile / SH-Mobile.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1c51ed4fb9f11fa1e0873aa2d5b28f42a85ac299
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 14 16:56:55 2010 +0900
ARM: mach-shmobile: SMP base support
Add SMP base support for R-Mobile / SH-Mobile processors.
This patch contains all base code to support CONFIG_SMP
regardless of ARCH_SHMOBILE processor type. Both local timer
and CPU hotplug are supported, but no processor specific
code is included.
At this point only the default behavior is in place, so
a single core will always be used even though CONFIG_SMP
is enabled on multicore systems.
The SMP Kconfig entry for arch/arm/Kconfig is excluded from
this patch to simplify merging.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6dff7da2adbba9c5cd1b3a3f67191fe3471c663c
Author: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Date: Tue Dec 14 14:18:03 2010 +0900
ARM: mach-shmobile: mackerel: Add sdhi support
Signed-off-by: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 09dd7ded60019d6a4fd2ae20a08c4ad2bc3ed3e9
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Tue Dec 14 16:15:35 2010 +0900
ARM: mach-shmobile: Fix up pinmux entries in Makefile
Compiling in multiple CPUs into the same kernel binary
requires a Makefile update. With this patch in place
it is possible to enable the pinmux code for both the
SH7372 and the SH7377.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3b80ffdef001ac7ff53bdcb80ad2baadb5953f91
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 13:42:21 2010 -0800
video: mx3fb: Use vsprintf extension %pR for struct resource
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e504b84805c574cf18d705c610c9e4a8f6e61017
Author: Andrew Kephart <andrew.kephart@xxxxxxxxxxx>
Date: Mon Dec 13 09:46:34 2010 -0600
fbdev: Fix fb_find_nearest_mode refresh comparison
Refresh rate nearness is not calculated or reset when nearest resolution
changes.
This patch resets the refresh rate differential measurement whenever a
new nearest resolution is discovered. This fixes two error cases;
first, wherein the first mode's refresh rate differential is never
calculated and second, when the closest refresh rate from a previous
nearest resolution is erroneously preserved.
Signed-off-by: Andrew Kephart <andrew.kephart@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 21b6e4c7106b2d68a6710506d8706608272fd78b
Author: Carmelo AMOROSO <carmelo.amoroso@xxxxxx>
Date: Mon Dec 13 10:20:26 2010 +0000
sh: wire up accept4 syscall (non-multiplexed path)
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 28a4f908acb342350b9ecbfcdf0a999cb83e05aa
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Mon Dec 13 10:47:05 2010 -0200
ARM: mx5: check for error in ioremap
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit bb477de2efc560e55c4a830329273661f3664bc8
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Dec 1 09:37:17 2010 +0100
Fix imx cpufreq driver as module
When building as module:
ERROR: "cpufreq_gov_performance" [arch/arm/plat-mxc/cpufreq.ko] undefined!
WARNING: modpost: Found 1 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
It's due to the driver using CPUFREQ_DEFAULT_GOVERNOR, even it should not
(see commit 8122c6cea033e8034e99d3b10a4e3f377ce23994 in Linus tree), so
remove it.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit cdc3f10630ecddb7870e087ff9679eef3d7b4e21
Author: Peter Horton <phorton@xxxxxxxxxxxx>
Date: Mon Dec 6 11:37:38 2010 +0000
mx51: support FIQ on TZIC, revised
Add support for FIQ on mx51 TZIC
TZIC changes tested with FIQ audio on an mx51 board
AVIC changes build with mx3_defconfig, not tested
Signed-off-by: Peter Horton <phorton@xxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 8be9252f7ccde4148e4b203bf64d38ae66b111e4
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Tue Dec 7 17:14:45 2010 -0200
ARM: imx/mx27_3ds: Add watchdog support
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit bfdde3a90b6d1c508e4f305dd385efd234fcdd66
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Tue Dec 7 17:14:44 2010 -0200
ARM: mx3/mx31_3ds: Add watchdog support
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit f25972233fbe4b60dc4b514def4caf40aa1bb85a
Author: Peter Horton <phorton@xxxxxxxxxxxx>
Date: Fri Dec 3 17:07:28 2010 +0000
mx51: add SSI3
Add SSI3 to MX51
Signed-off-by: Peter Horton <phorton@xxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 2c1f4672f0711e7f23ae49cbb7541088126fe576
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Tue Dec 7 14:16:04 2010 -0200
watchdog: imx: use clk_get to acquire the watchdog clock
Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 59a609d9b59be9452f168fe228befea53d5962ff
Author: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Date: Mon Dec 13 13:48:41 2010 +0100
dmaengine: at_hdmac: fix buffer transfer size specification
Buffer transfer size is the number of transfers to be performed in
relation with the width of the _source_ interface.
So in the DMA_FROM_DEVICE case, it should be the register width that
should be taken into account.
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 8863ada9c47503bb93eba5e3a9ba88e6311db31f
Author: Jason Wessel <jason.wessel@xxxxxxxxxxxxx>
Date: Wed Dec 1 13:01:01 2010 -0600
kgdboc,input: Fix regression with keyboard release key and early debugging
The commit 111c182340cd22e238ab1cc6564df336c6ebd7cb (kgdboc: reset
input devices (keyboards) when exiting debugger) introduced a
regression in early debugging such that you get a kernel oops on
continue (with the go command) if you boot a kernel with:
earlyprintk=vga ekgdboc=kbd kgdbwait
The restore kgdboc_restore_input() routine schedules work for the
purpose of sending key release events for any keys that were in the
depressed state prior to entering the kernel debugger. A simple fix
to the crash is to not invoke the schedule_work() if the kernel
system_state is anything other than SYSTEM_RUNNING.
Signed-off-by: Jason Wessel <jason.wessel@xxxxxxxxxxxxx>
Acked-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Reviewed-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxx>
commit d96c9043d1588f04c7f467167f653c07d83232d5
Author: Sage Weil <sage@xxxxxxxxxxxx>
Date: Mon Dec 13 20:30:28 2010 -0800
ceph: fix msgr_init error path
create_workqueue() returns NULL on failure.
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit 23437b5c50f523a87ca5c02fd883b069ca8be7f3
Merge: 6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 291a73c9be15f12046a7291ec0bf7176a58d4f14
Author: Len Brown <len.brown@xxxxxxxxx>
Date: Mon Dec 13 22:40:54 2010 -0500
Merge branch 'bugzilla-23002' into release
commit 291a73c9be15f12046a7291ec0bf7176a58d4f14
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sun Dec 12 21:10:42 2010 +0100
ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D
The saving of the NVS memory area during suspend and restoring it
during resume causes problems to appear on Sony Vaio VGN-NW130D, so
blacklist that machine to avoid those problems.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=23002
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Reported-and-tested-by: Adriano <adriano.vilela@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 83a50de97fe96aca82389e061862ed760ece2283
Author: Chris Mason <chris.mason@xxxxxxxxxx>
Date: Mon Dec 13 15:06:46 2010 -0500
Btrfs: prevent RAID level downgrades when space is low
The extent allocator has code that allows us to fill
allocations from any available block group, even if it doesn't
match the raid level we've requested.
This was put in because adding a new drive to a filesystem
made with the default mkfs options actually upgrades the metadata from
single spindle dup to full RAID1.
But, the code also allows us to allocate from a raid0 chunk when we
really want a raid1 or raid10 chunk. This can cause big trouble because
mkfs creates a small (4MB) raid0 chunk for data and metadata which then
goes unused for raid1/raid10 installs.
The allocator will happily wander in and allocate from that chunk when
things get tight, which is not correct.
The fix here is to make sure that we provide duplication when the
caller has asked for it. It does all the dups to be any raid level,
which preserves the dup->raid1 upgrade abilities.
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit cd02dca56442e1504fd6bc5b96f7f1870162b266
Author: Chris Mason <chris.mason@xxxxxxxxxx>
Date: Mon Dec 13 14:56:23 2010 -0500
Btrfs: account for missing devices in RAID allocation profiles
When we mount in RAID degraded mode without adding a new device to
replace the failed one, we can end up using the wrong RAID flags for
allocations.
This results in strange combinations of block groups (raid1 in a raid10
filesystem) and corruptions when we try to allocate blocks from single
spindle chunks on drives that are actually missing.
The first device has two small 4MB chunks in it that mkfs creates and
these are usually unused in a raid1 or raid10 setup. But, in -o degraded,
the allocator will fall back to these because the mask of desired raid groups
isn't correct.
The fix here is to count the missing devices as we build up the list
of devices in the system. This count is used when picking the
raid level to make sure we continue using the same levels that were
in place before we lost a drive.
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit 7f99d946e71e71d484b7543b49e990508e70d0c0
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Tue Nov 30 22:22:29 2010 -0800
x86, vt-d: Handle previous faults after enabling fault handling
Fault handling is getting enabled after enabling the interrupt-remapping (as
the success of interrupt-remapping can affect the apic mode and hence the
fault handling mode).
Hence there can potentially be some faults between the window of enabling
interrupt-remapping in the vt-d and the fault-handling of the vt-d units.
Handle any previous faults after enabling the vt-d fault handling.
For v2.6.38 cleanup, need to check if we can remove the dmar_fault() in the
enable_intr_remapping() and see if we can enable fault handling along with
enabling intr-remapping.
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
LKML-Reference: <20101201062244.630417138@xxxxxxxxx>
Cc: stable@xxxxxxxxxx [v2.6.32+]
Acked-by: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 7f7fbf45c6b748074546f7f16b9488ca71de99c1
Author: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Date: Tue Nov 30 22:22:28 2010 -0800
x86: Enable the intr-remap fault handling after local APIC setup
Interrupt-remapping gets enabled very early in the boot, as it determines the
apic mode that the processor can use. And the current code enables the vt-d
fault handling before the setup_local_APIC(). And hence the APIC LDR registers
and data structure in the memory may not be initialized. So the vt-d fault
handling in logical xapic/x2apic modes were broken.
Fix this by enabling the vt-d fault handling in the end_local_APIC_setup()
A cleaner fix of enabling fault handling while enabling intr-remapping
will be addressed for v2.6.38. [ Enabling intr-remapping determines the
usage of x2apic mode and the apic mode determines the fault-handling
configuration. ]
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
LKML-Reference: <20101201062244.541996375@xxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: stable@xxxxxxxxxx [v2.6.32+]
Acked-by: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 086e8ced65d9bcc4a8e8f1cd39b09640f2883f90
Author: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Date: Wed Dec 1 09:40:32 2010 -0800
x86, vt-d: Fix the vt-d fault handling irq migration in the x2apic mode
In x2apic mode, we need to set the upper address register of the fault
handling interrupt register of the vt-d hardware. Without this
irq migration of the vt-d fault handling interrupt is broken.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
LKML-Reference: <1291225233.2648.39.camel@sbsiddha-MOBL3>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: stable@xxxxxxxxxx [v2.6.32+]
Acked-by: Chris Wright <chrisw@xxxxxxxxxxxx>
Tested-by: Takao Indoh <indou.takao@xxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 254e42006c893f45bca48f313536fcba12206418
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Mon Dec 6 12:26:30 2010 -0800
x86, vt-d: Quirk for masking vtd spec errors to platform error handling logic
On platforms with Intel 7500 chipset, there were some reports of system
hang/NMI's during kexec/kdump in the presence of interrupt-remapping enabled.
During kdump, there is a window where the devices might be still using old
kernel's interrupt information, while the kdump kernel is coming up. This can
cause vt-d faults as the interrupt configuration from the old kernel map to
null IRTE entries in the new kernel etc. (with out interrupt-remapping enabled,
we still have the same issue but in this case we will see benign spurious
interrupt hit the new kernel).
Based on platform config settings, these platforms seem to generate NMI/SMI
when a vt-d fault happens and there were reports that the resulting SMI causes
the system to hang.
Fix it by masking vt-d spec defined errors to platform error reporting logic.
VT-d spec related errors are already handled by the VT-d OS code, so need to
report the same error through other channels.
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
LKML-Reference: <1291667190.2675.8.camel@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx [v2.6.32+]
Reported-by: Max Asbock <masbock@xxxxxxxxxxxxxxxxxx>
Reported-and-tested-by: Takao Indoh <indou.takao@xxxxxxxxxxxxxx>
Acked-by: Chris Wright <chrisw@xxxxxxxxxxxx>
Acked-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 3fb82d56ad003e804923185316236f26b30dfdd5
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Tue Nov 23 16:11:40 2010 -0800
x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume
During suspend, we disable all the non boot cpus. And during resume we bring
them all back again. So no need to do alternatives_smp_switch() in between.
On my core 2 based laptop, this speeds up the suspend path by 15msec and the
resume path by 5 msec (suspend/resume speed up differences can be attributed
to the different P-states that the cpu is in during suspend/resume).
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
LKML-Reference: <1290557500.4946.8.camel@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 10340ae130fb70352eae1ae8a00b7906d91bf166
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Tue Nov 16 13:23:51 2010 -0800
x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem()
Alignment of alloc_bootmem() depends on the value of
L1_CACHE_SHIFT. What we need here, however, is 64 byte alignment. Use
alloc_bootmem_align() and explicitly specify the alignment instead.
This fixes a kernel boot crash reported by Jody when the cpu in .config
is set to MPENTIUMII but the kernel is booted on a xsave-capable CPU.
Reported-by: Jody Bruchon <jody@xxxxxxxxxxxxx>
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
LKML-Reference: <20101116212442.059967454@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
commit 53dde5f385bc56e312f78b7cb25ffaf8efd4735d
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Tue Nov 16 13:23:50 2010 -0800
bootmem: Add alloc_bootmem_align()
Add an alloc_bootmem_align() interface to allocate bootmem with
specified alignment. This is necessary to be able to allocate the
xsave area in a subsequent patch.
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
LKML-Reference: <20101116212441.977574826@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
commit de2a8cf98ecdde25231d6c5e7901e2cffaf32af9
Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Date: Mon Dec 13 16:01:38 2010 -0800
x86, gcc-4.6: Use gcc -m options when building vdso
The vdso Makefile passes linker-style -m options not to the linker but
to gcc. This happens to work with earlier gcc, but fails with gcc
4.6. Pass gcc-style -m options, instead.
Note: all currently supported versions of gcc supports -m32, so there
is no reason to conditionalize it any more.
Reported-by: H. J. Lu <hjl.tools@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
LKML-Reference: <tip-*@git.kernel.org>
Cc: <stable@xxxxxxxxxx>
commit 65af8dea26aa89ae4a810bdaa05545a8e670b636
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Dec 8 07:51:50 2010 -0800
iwlagn: code clean up to remove duplicate code
Multiple devices use almost the same .cfg with minor differences.
Use macro and remove the duplication. By doing this, reduce
the chance for mistake while modify .cfg parameters
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit f21dd005df95e0fc6a578342c61b5333ce2abc2b
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Dec 8 15:34:52 2010 -0800
iwlwifi: keep track of bt coex enable/disable stage
For debugging purpose, keep track of the bt coex enable/disable state.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 50619ac9ba48f5ab0c6bcfa10f5d50e4115cdca8
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Dec 7 08:06:31 2010 -0800
iwlwifi: do not reload fw if WiMAX own the RF
For WiFi/WiMAX combo devices, if WiMAX own the RF, WiFi driver
try to access RF and fail. This is the W/A to To avoid WiFi keep
reloading firmware and try to access RF again.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 33c68770a8605d84aea35c2cd90009edfc4b161a
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Fri Dec 3 10:33:36 2010 -0800
iwlagn: More detail tx power logging
For enhanced tx power table in EEPROM, add more detail logging
to help debugging
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit d058ff8b9255b2a15bcb040cc9901baca66dc9c4
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Fri Dec 3 10:33:35 2010 -0800
iwlwifi: use IWL_DEBUG_EEPROM for EEPROM related info
For logging EEPROM related info, instead of using IWL_DEBUG_INFO,
use the dedicated logging (IWL_DEBUG_EEPROM) for easier debugging
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit fb4c32bba1e0941db5972e2b612cbfdf10522a43
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Fri Dec 3 10:33:34 2010 -0800
iwlwifi: add new EEPROM debug log type
Adding new debug type to log EEPROM related data
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit c6fc108776e77e38e099d5b13c4f57a2172c6698
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Dec 9 12:56:42 2010 -0800
iwlagn: remove old EEPROM TX power reading
This removes the old TX power reading code, it isn't
necessary since the new code is able to read all the
various EEPROM layouts due to relying on information
contained in the EEPROM.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 8d6748ca73a0caffed4304a47a9cb4cd0aba361e
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Dec 9 09:30:14 2010 -0800
iwlagn: implement layout-agnostic EEPROM reading
The current EEPROM reading code has some layout
assumptions that now turned out to be false with
some newer versions of the EEPROM. Luckily, we
can avoid all such assumptions by using data in
the EEPROM itself, so implement using that.
However, for risk mitigation purposes, keep the
old reading code for current hardware for now.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit e7362a0069f8448bb346d65f07d98b319f243e30
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 30 11:03:44 2010 -0800
iwlagn: rename enhanced txpower fields
Some fields we didn't previously use from the
enhanced TX power structure will be needed in
the next patch, so rename them to their correct
names to be able to use them and change code
reading them accordingly.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 17423ea8776362100b0a9a162cdd4b16b886a4a2
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Dec 6 11:51:39 2010 -0800
iwlagn: rx antenna diversity
For the new 1x1 devices, hw and uCode will support rx
antenna diversity, but we need to indicate 1x1 device to
AccessPoint to make sure it won't use MIMO.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 9decde95be8a77a16f5668544bee45d41a7ae665
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 30 13:24:36 2010 -0800
iwlagn: fix debug variable access
The compiler correctly warns:
iwl-agn-tx.c: In function â??iwlagn_tx_status_reply_compressed_baâ??:
iwl-agn-tx.c:1240: warning: â??bitmapâ?? may be used uninitialized in this function
Move the debug print to the branch that reads the
bitmap, and move the variables too so it's more
obvious where they are needed.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit ae0b693c12cc78913085733d28e0e0e6020db6f4
Author: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Date: Thu Dec 2 11:02:28 2010 -0800
iwlagn: check ready in iwlagn_bss_info_changed()
In function iwlagn_bss_info_changed(), we need to check if the driver
is ready before doing real work. Also, the previously put WARN() is
removed because the vif is not guaranteed to be valid. uCode restart
routine will clear the vif.
Signed-off-by: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit a1da077bc36368eb7d6312e7e49260f0a3d92c77
Author: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Date: Thu Dec 2 11:02:54 2010 -0800
iwlwifi: clear dbg_fixed_rate during init
This prevent bad fixed_rate keeps crashing uCode in an endless loop.
Signed-off-by: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 4fb33244d17b973f17cbc7cf8b7efd0875950474
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Nov 29 10:45:16 2010 -0800
iwlagn: change led compensation for 6005 and 6030 devices
For both 6005 and 6030 devices, change the led compensation to 57
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit f3c677b997757326e1f29d33060719a6a5091950
Author: Forrest Shi <b29237@xxxxxxxxxxxxx>
Date: Thu Dec 9 16:14:04 2010 +0800
fsldma: fix issue of slow dma
Fixed fsl dma slow issue by initializing dma mode register with
bandwidth control. It boosts dma performance and should works
with 85xx board.
Signed-off-by: Forrest Shi <b29237@xxxxxxxxxxxxx>
Signed-off-by: Li Yang <leoli@xxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Dec 13 12:52:14 2010 -0800
net: Abstract default ADVMSS behind an accessor.
Make all RTAX_ADVMSS metric accesses go through a new helper function,
dst_metric_advmss().
Leave the actual default metric as "zero" in the real metric slot,
and compute the actual default value dynamically via a new dst_ops
AF specific callback.
For stacked IPSEC routes, we use the advmss of the path which
preserves existing behavior.
Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates
advmss on pmtu updates. This inconsistency in advmss handling
results in more raw metric accesses than I wish we ended up with.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cc6f02dd490dac4ad821d5077b934c9b37037cd0
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 13 12:50:49 2010 -0800
net: change ip_default_ttl documentation
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cfb7e5f187e787bb1430decea339fdea6a669f92
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:26 2010 +0000
pch_can: Replace netif_rx to netif_receive_skb
Since this driver is implemented as NAPI,
netif_receive_skb must be used not netif_rx.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0c78ab76a05cd788af0383354ffe819e0617f6a0
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:25 2010 +0000
pch_can: Add setting TEC/REC statistics processing
Add setting TEC/REC statistics processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fea9294c5f2902c45613681ad995ca27899d2016
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:24 2010 +0000
pch_can: Optimize "if" condition in rx/tx processing
For reduce "if" condition, easy to read/understand the code,
optimize "if" condition in rx/tx processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3332bc5446e034566e8a56bf7a7cd479ca35bd6d
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:23 2010 +0000
pch_can: Fix incorrect return processing
Fix incorrect return processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a6f6d6b51b110e661ae5f862d60c27da4970bec6
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:22 2010 +0000
pch_can: Move MSI processing to probe/remove processing
Currently, in case this driver is integrated as module, and when this
module is re-installed, no interrupts is to be occurred.
For the above issue, move MSI processing to open/release processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c755145649fa73bd197ac1a73d141047c61b543a
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:21 2010 +0000
pch_can: Comment optimization
Comment optimization
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d06848be64e13d5d1d73e581fb185e815893d8b7
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:20 2010 +0000
pch_can: Fix miss-setting status issue
Modify miss-setting status issue at suspend.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e0805c4063d0611e282bb7fdebe2e223bfe7220
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:19 2010 +0000
pch_can: Fix bit timing calculation issue
Modify like use calculated value directly passed by CAN core module.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8714fcaca63203fe10331fe530ff48d3dd31de4e
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:18 2010 +0000
pch_can: Delete unnecessary/redundant code
Delete unnecessary/redundant code
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9388b166a323f8f7e35eb7a0d17b297ca695fa91
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:17 2010 +0000
pch_can: Fix coding rule violation
Fix coding rule violation.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 435b4efe93d4cec3aa0b36e8707df8d292d3641b
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:16 2010 +0000
pch_can: Replace netdev_dbg instead of dev_dbg partly
For easy to readable, use netdev_dbg instead of dev_dbg partly
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e91530ea959295a31911488c62088d5c372032ea
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:15 2010 +0000
pch_can: Change Copyright and module description
Currently, Copyright and module description are not formal.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 44c9aa890a2587f48920485b7487bc6d516dbbdf
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:14 2010 +0000
pch_can: Reduce register access
For improve tx/rx speed, reduce register access.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ca2b004e89484e89b1815157fae2d7f933c5af9e
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:13 2010 +0000
pch_can: Change functions type
Currently, these two functions spec(returned value) is unnatural.
Thus, change the return value's spec
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bd58cbc322e97550af5e12584324b7117180435d
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:12 2010 +0000
pch_can: Rename function/macro name
For easy to read/understand, Rename function/macro name.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7f2bc50efeaeb1dff62ef7e128ae36499fbcf35d
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:11 2010 +0000
pch_can: Fix warnings
Currently, in case CONFIG_PM is disabled, compiler outputs warnings.
Move six functions which are used only CONFIG_PM is enabled,
into "#ifdef CONFIG_PM" area.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d5b4b2778e8e40f42ae5d9556777583f3556d81
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:10 2010 +0000
pch_can: Improve rx processing
Replace complex "goto" to "do~while".
For easy to read/understand, it divides a rx function into some functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8ac9702b9d5d81b819fc7d6b4f6abad22af01f3c
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:09 2010 +0000
pch_can: Fix endianness issue
there is endianness issue both Tx and Rx.
Currently, data is set like below.
Register:
MSB--LSB
x x D0 D1
x x D2 D3
x x D4 D5
x x D6 D7
But Data to be sent must be set like below.
Register:
MSB--LSB
x x D1 D0
x x D3 D2
x x D5 D4
x x D7 D6 (x means reserved area.)
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e489ccebf14657774fd877dc841b458703730586
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:08 2010 +0000
pch_can: Divide poll function
To easy to read/understand, divide poll function into two sub-functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 76d94b232940ca91e9b26c590cb7312ab88ff722
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Sun Dec 12 20:24:07 2010 +0000
pch_can: Add flow control processing
Currently, there is no flow control processing.
Thus, Add flow control processing as
when there is no empty of tx buffer,
netif_stop_queue is called.
When there is empty buffer, netif_wake_queue is called.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 412b31334b831a8c2909afaca017c5a236ac2dd0
Author: Wolfgang Kufner <wolfgang.kufner@xxxxxxxxx>
Date: Mon Dec 13 12:39:39 2010 +0100
rt2x00: Fix firmware loading regression on x86_64.
Commit 6175ddf06b6172046a329e3abfd9c901a43efd2e changes the way
memcpy_toio() works for x86_64, causing firmware loading to fail for
some Ralink WLAN devices with the rt2800pci driver since linux 2.6.34.
This causes the log message: "phy0 -> rt2800pci_load_firmware: Error -
PBF system register not ready.".
Fix this by using __iowrite32_copy instead of memcpy_toio().
Signed-off-by: Wolfgang Kufner <wolfgang.kufner@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 739fd9405416e22732e46a9226a8cac379bd57fc
Author: Wolfgang Kufner <wolfgang.kufner@xxxxxxxxx>
Date: Mon Dec 13 12:39:12 2010 +0100
rt2x00: Pad beacon to multiple of 32 bits.
Pad beacon to a multiple of 32 bits in preparation for the change
from memcpy_toio() to __iowrite32_copy() in register_multiwrite().
Signed-off-by: Wolfgang Kufner <wolfgang.kufner@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e85b4c04646f7fa62ebf0afe11cd8dffde689da7
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Mon Dec 13 12:38:49 2010 +0100
rt2x00: remove stray semicolon
The stray semicolon after DEBUG_PRINTK_MSG causes things
like "if (...) WARNING(...); else {}" to fail with syntax error.
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f615e9a38a8e6239d35891a05f2ac1159088780a
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:36:38 2010 +0100
rt2x00: Fix WMM Queue naming
The Queue names were incorrectly copied from the legacy drivers,
as a result the queue names were inversed to what was expected.
This renames the queues using this mapping:
QID_AC_BK -> QID_AC_VO (priority 0)
QID_AC_BE -> QID_AC_VI (priority 1)
QID_AC_VI -> QID_AC_BE (priority 2)
QID_AC_VO -> QID_AC_BK (priority 3)
Note that this was a naming problem only, which didn't affect
the assignment of frames to their respective queues.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dba5dc1ae9764902f46d5225c9ff40e4f7b614c7
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:36:18 2010 +0100
rt2x00: Introduce extra queue entry sanity flag
Add a queue entry flag ENTRY_DATA_STATUS_PENDING,
which can be used to indicate a queue entry has
returned from the hardware and is waiting for
status processing. Using this flag we can add
some extra sanity checks to prevent queue corruption.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 64e7d72384c2ecef5a892b2243623af265dd83cc
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:36:00 2010 +0100
rt2x00: Cleanup RX index counting
Add the rt2x00_dmastart function to rt2x00lib which
marks the queue_entry as "owned by device", and increased
the Q_INDEX number.
This cleanups up the index handling by rt2x00lib which
at until so far used hackish approaches to keep the
RX queue index numbering sane.
The rt2x00pci.c changes are from Helmut Schaa
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5be65609fec2e331c7d804471be3d59089a30d98
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:35:40 2010 +0100
rt2x00: Add "flush" queue command
Add a new command to the queue handlers: "flush",
this moves the flush() callback from mac80211
into rt2x00queue and adds support for flushing
the RX queue as well.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0b7fde54f94979edc67bbf86b5adba702ebfefe8
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:35:17 2010 +0100
rt2x00: Protect queue control with mutex
Add wrapper functions in rt2x00queue.c to
start & stop queues. This control must be protected
using a mutex.
Queues can also be paused which will halt the flow
of packets between the driver and mac80211. This doesn't
require a mutex protection.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dbba306f2ae574450a7a5133d6637fe6f5fafc72
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:34:54 2010 +0100
rt2x00: Reorganize queue callback functions
As part of the queue refactoring, change the queue callback
function names to have 3 different actions: start, kick & stop.
We can now also remove the STATE_RADIO_RX_ON/STATE_RADIO_RX_OFF
device_state flags, and replace the usage with using the
start_queue/stop_queue callback functions.
This streamlines the RX queue handling to the
similar approach as all other queues.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5450b7e2f0b47e52175b31399d8186a74ef3c46d
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Mon Dec 13 12:34:22 2010 +0100
rt2x00: Introduce 3 queue commands in drivers (start, kick, stop).
As part of the queue refactoring, we now introduce
3 queue commands: start, kick, stop.
- Start: will enable a queue, for TX this will
not mean anything, while for beacons and RX
this will update the registers to enable the queue.
- Kick: This will kick all pending frames to
the hardware. This is needed for the TX queue
to push all frames to the HW after the queue
has been started
- Stop: This will stop the queue in the hardware,
and cancel any pending work (So this doesn't
mean the queue is empty after a stop!).
Move all code from the drivers into the appropriate
functions, and link those calls to the old rt2x00lib
callback functions (we will fix this later when we
refactor the queue control inside rt2x00lib).
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 094a1d92fdb18c4455758b1c33e99d647c837ee9
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Mon Dec 13 12:34:00 2010 +0100
rt2x00: trivial: add missing \n on warnings
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 89b25f60e08180d7e00e6239398b467142aaec01
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 13 12:33:36 2010 +0100
rt2x00: Don't frequently reset beacon interval in AdHoc mode
Commit 0204464329c17ba6d293e1899f71223599a0e582 "Check for specific changed
flags when updating the erp config" changed the way in which a new beacon
interval gets handled. However, due to a bug in rt2800usb and rt2800pci the
beacon interval was reset during each scan, thus causing problems in AdHoc
mode.
Fix this by not cleaning up the beacon interval when killing the beacon queue
but just prevent the device from sending out beacons.
Reported-by: Wolfgang Kufner <wolfgang.kufner@xxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a061a93b6eb8db8227b251666436da1e344771a0
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Mon Dec 13 12:33:12 2010 +0100
rt2x00: Ensure TX-ed frames are returned in the original state.
Recent changes to the TX-done code of rt2x00 resulted in TX-ed frames not
being returned to mac80211 in the original state, and therefore with
insufficient headroom for re-transmissions.
Fix this by reverting the changes done and by ensuring we remove the inserted
L2pad by moving the header backwards instead of the data forwards.
At the same time also make sure that the rt2x00queue_remove_l2pad will not
move any memory when a frame has no data at all.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Cc: Jay Hung <Jay_Hung@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d7bb5f845f437662296adbfeaab8fbfce1c32289
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Mon Dec 13 12:32:49 2010 +0100
rt2x00: fix hang when unplugging USB device in use
When an rt2x00 USB device is unplugged while in use, it reliably
hangs the whole system. After some time the watchdog prints:
BUG: soft lockup - CPU#0 stuck for 64s! [kworker/u:0:5]
...
[<c01a88d8>] (usb_submit_urb+0x0/0x2ac) from [<bf0e752c>] (rt2x00usb_kick_rx_entry+0xb4/0xe8 [rt2x00usb])
[<bf0e7478>] (rt2x00usb_kick_rx_entry+0x0/0xe8 [rt2x00usb]) from [<bf0e7588>] (rt2x00usb_clear_entry+x28/0x2c [rt2x00usb])
[<bf0e7560>] (rt2x00usb_clear_entry+0x0/0x2c [rt2x00usb]) from [<bf0d5bc4>] (rt2x00lib_rxdone+0x2e0/0x2f8 [rt2x00lib])
[<bf0d58e4>] (rt2x00lib_rxdone+0x0/0x2f8 [rt2x00lib]) from [<bf0e7e00>] (rt2x00usb_work_rxdone+0x54/0x74 [rt2x00usb])
[<bf0e7dac>] (rt2x00usb_work_rxdone+0x0/0x74 [rt2x00usb]) from [<c00542b4>] (process_one_work+0x20c/0x35c)
Clear the DEVICE_STATE_PRESENT flag when usb_submit_urb()
returns -ENODEV to fix this.
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8d4ff3f3045e57f57634559c063bf70993a1d00a
Author: RA-Jay Hung <jay_hung@xxxxxxxxxxxxxx>
Date: Mon Dec 13 12:32:22 2010 +0100
rt2x00: Add RF chip definition
Add RF chip definition
Signed-off-by: RA-Jay Hung <jay_hung@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 977206d79fdc9fc1b153e0b52c56e0be59586f37
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Mon Dec 13 12:31:58 2010 +0100
rt2x00: Implement get_survey callback for rt2800
Implement the get_survey callback to allow user space to read statistics
about the current channel condition.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 38c8a566fcfe080c910bb6b348d40121df2b8e88
Author: RA-Jay Hung <Jay_Hung@xxxxxxxxxxxxxx>
Date: Mon Dec 13 12:31:27 2010 +0100
rt2x00: Add rt2800 EEPROM definition
Add and modify NIC Configuration and LED definition of EEPROM
Signed-off-by: RA-Jay Hung <jay_hung@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7a7793ef078e56fa395f96567630032c44ab5951
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:56 2010 +0100
ath9k_hw: update AR9003 initvals to improve carrier leak calibration/correction
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e172e0f8c25a513d253c07b1dc1d7e3c66a811ff
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:55 2010 +0100
ath9k_hw: update AR9003 initvals for improved radar detection
Reduces the likelihood of false pulse detects in the hardware
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1bf38661822049931a0ab8d2b43153b26cc919f6
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:54 2010 +0100
ath9k_hw: fix PA predistortion training power selection
The EEPROM contains scale factors for the tx power, which define
the range of allowable difference between target power and training
power. If the difference is too big, PA predistortion cannot be used.
For 2.4 GHz there is only one scale factor, for 5 GHz there are
three, depending on the specific frequency range.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1782352d4908c79d195b43e0c1b6b109e0d93d05
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:53 2010 +0100
ath9k_hw: fix the PA predistortion rate mask
The EEPROM PAPRD rate mask fields only contain mask values for actual
rates in the low 25 bits. The upper bits are reserved for tx power
scale values. Add the proper mask definitions and use them before
writing the values to the register.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7607cbe2ad6931400c5d15ced342ab329ab8f92c
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:52 2010 +0100
ath9k: fix PA predistortion thermal measurement handling
To be able to measure the thermal values correctly for PAPRD, we need
to send training frames before setting up the gain table for the measurement,
and then again afterwards for the actual training.
For further improvement, send training frames at MCS0 instead of 54 MBit/s
legacy. That way we can use the No-ACK flag for the transmission, which
speeds up PAPRD training in general, as the hardware won't have to
retransmit and wait for ACK timeout (was previously set to 4 * 6
transmission attempts).
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit caabf2bf228cd6b1c6197dbb25bddb4682d30c9d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:51 2010 +0100
ath9k_hw: fix the slot time setting for long distance links
Testing shows that adjusting the slot time based on the coverage class
produces very high latencies and very low throughput on long distance links.
Adjusting only the ACK timeout and leaving the slot time at the regular
values - while technically not optimal for CSMA - works a lot better on
long links (tested with 10 km distance)
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4357c6bfc83d4e8b1f18588f640be27bf4b0d0f7
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Dec 13 08:40:50 2010 +0100
ath9k_hw: initialize ah->slottime
(u32) -1 is not particularly useful as a slottime default, so even though
the ath9k_hw default should never get used, it's better to pick something
sane here.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 452d7dd816744efb5d0c22c2b038f2ffa5c7ec14
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Mon Dec 13 07:39:32 2010 +0530
ath9k_htc: Add Ubiquiti wifistation ext to supported devices
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 62a957e99f6edced4a87f79cc49bfca42fe9a1a0
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:14 2010 +0100
ath9k_hw: remove ah->txpower_indexoffset
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5f65c309be7b9eae06136a5e7df43ea08b25d3f9
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:13 2010 +0100
ath9k_hw: remove ah->beacon_interval
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6da5a720bab3866ba23a37841f6a61d96e498a3f
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:12 2010 +0100
ath9k_hw: clean up SREV version checks
There's no need to have separate callbacks for pre-AR9003 vs AR9003
SREV version checks, so just merge those into one function.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit df3c8b2b10b47429d2f3fe79d00daa38a3381aad
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:11 2010 +0100
ath9k_hw: remove antenna configuration eeprom ops and variables
AR9280 based hardware with 3 antennas and slow antenna diversity has
not been seen in the wild and ath9k does not support that form of
antenna diversity, so remove the EEPROM ops for it.
These EEPROM ops are currently only used for setting the
AR_PHY_SWITCH_COM register, which is being done in the EEPROM specific
file already.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 940cd2c12ebff688cfdc14f21c4b0e5b845ad47f
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:10 2010 +0100
ath9k_hw: merge the ar9287 version of ath9k_hw_get_gain_boundaries_pdadcs
Also add a comment about a potential array overrun that needs to
be reviewed.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 115277a3bc0683d04da797268ddafdc3bf67ca33
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:09 2010 +0100
ath9k_hw: merge ath9k_hw_get_gain_boundaries_pdadcs between eeprom_def.c and eeprom_4k.c
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4ddfcd7daf57247ff718b849a152d97a80b7ae4d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:08 2010 +0100
ath9k_hw: clean up duplicate and unnused eeprom related defines
AR*_MAX_RATE_POWER => MAX_RATE_POWER
AR*_EEPROM_MODAL_SPURS => AR_EEPROM_MODAL_SPURS
AR*_OPFLAGS_* => AR5416_OPFLAGS_*
...
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 040b74f741b20dbf07359716d5c540356a036ade
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 12 00:51:07 2010 +0100
ath9k_hw: only use the PCIe disable register write sequence for AR5416
Newer chips do not need this, and maybe these register writes could have
negative side effects on newer hardware.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 248a38d0ed754bf9f002e66f3d607e12ae6a673c
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Dec 10 21:16:46 2010 +0100
ath9k: fix sequence number assigment for non-AMPDU QoS data frames
wireless-testing commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435
('ath9k: more tx setup cleanups') merged tx path code for HT vs
non-HT frames, however it did not pass the tid pointer to
ath_tx_send_normal, causing an inconsistency between AMPDU vs
non-AMPDU sequence number handling.
Fix this by always passing in the tid pointer for all QoS data frames.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 207aba6018a7b1757b5248ced2b280d20790c498
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri Dec 10 17:10:44 2010 +0100
mac80211: support IBSS RSN with SW crypto
When software crypto is used, mac80211 will
support IBSS RSN, it doesn't depend on the
driver in that case.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9abbfb27dd96361187bb3872b2c349a76f5e09e9
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Fri Dec 10 11:27:06 2010 +0530
ath9k: Use power save wrappers for TSF get/set
The HW has to be awake when accessing registers.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 44316cb1e97a1e7f76eb3f07e5b0ba91d72e9693
Author: Bing Zhao <bzhao@xxxxxxxxxxx>
Date: Thu Dec 9 18:24:41 2010 -0800
ieee80211: add Parameter Set Count bitmask
WMM IE QoS Info field lower 4 bits: Parameter Set Count
Signed-off-by: Bing Zhao <bzhao@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 91f44b02992f632ac6c070f985cd58d5acee4199
Author: Tim Harvey <harvey.tim@xxxxxxxxx>
Date: Thu Dec 9 13:15:45 2010 -0800
mac80211 default tx_last_beacon false (congestion)
The 802.11 spec states that the STA that generated the last Beacon frame shall
be the STA that response to a probe request. This is important for congestion
reduction when a probe request is received - only 1 node in an adhoc BSS
will transmit a response. While mac80211 drivers should provide the
tx_last_beacon function to report if they transmitted the last beacon many
do not. As an attempt to reduce probe response congestion default this
to 0 such that a node not implementing this capability does not contribute
to unnecessary congestion.
In a modern medium sized office environment I see upwards of 100 probe
requests per second received at a given node from various hardware/OS/drivers
doing zeroconf 'active probing' as opposed to passively listening for beacons.
With a modest 10-node adhoc network consisting of drivers that do not implement
this tx_last_beacon feature, I have seen this result in the simultaneous xmit
of probe responses accumulating to 500 probe responses per second because of
collisions which brings the adhoc network to its knees as well as causes
needless congestion.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 42ab135fe78025910bed8ff56e00a375f2b04db1
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Dec 9 20:56:01 2010 +0100
b43: rename TMS defines, drop useless condition from core reset
As discussed we do not know band width at core reset time and it is not a good
idea to reset whole just to change band. So just set unconditionally 20 MHz
band width as default during core reset.
As for defines PHY clock changed to band width in specs and it makes much more
sens to call defines by band width which is self-explainable. Updated specs do
not mention 0 value, but comparing to old ones you can notice lineral relation
between PHY clock speed and band width. So it makes sense for 0x0 value to be
10 MHz band width.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d242b90adf4e1918ac86433dfbb32a1136515bdd
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Dec 9 20:56:00 2010 +0100
b43: N-PHY: use designed function and macro for writing tables
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ea85ffd627b5da346b348d784fafec0ce4632d4d
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Dec 9 20:55:59 2010 +0100
b43: N-PHY: one more fix for order of tables initialization
I missed that part in previous reordering.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f61afc291a64d0362258f5a1ab45c828fe15ab04
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Dec 9 20:55:58 2010 +0100
b43: N-PHY: use correct bit for controlling MAC and PHY
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f7e0104c1a4e77cc4f23d5969b0677bdc4f62c63
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Dec 9 19:49:02 2010 +0100
mac80211: support separate default keys
Add support for split default keys (unicast
and multicast) in mac80211.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dbd2fd656f2060abfd3a16257f8b51ec60f6d2ed
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Dec 9 19:58:59 2010 +0100
cfg80211/nl80211: separate unicast/multicast default TX keys
Allow userspace to specify that a given key
is default only for unicast and/or multicast
transmissions. Only WEP keys are for both,
WPA/RSN keys set here are GTKs for multicast
only. For more future flexibility, allow to
specify all combiations.
Wireless extensions can only set both so use
nl80211; WEP keys (connect keys) must be set
as default for both (but 802.1X WEP is still
possible).
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 897bed8b4320774e56f282cdc1cceb4d77442797
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Dec 9 19:49:00 2010 +0100
mac80211: clean up RX key checks
Using the default key for "any key set" isn't
quite what we should do. It works, but with the
upcoming changes it makes life unnecessarily
complex, so do something better here and really
check for "any key".
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f33fdcf1b3a02fb92971a577d194ec6c579374af
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Thu Dec 9 21:48:54 2010 +0530
ath9k: clean up hardware code for beacon handling
The registers TBTT_TIMER ,DMA_BEACON_ALERT ,NEXT_SWBA are need to be
configured only for AP and IBSS mode.
SWBA register is used for generating software interrupts so that beacon
frames will be created by the software.DMA beacon alert register is
to indicate the hardware to DMA the contents of beacon buffer to PCU buffer
and TBTT to start transmitting the packet buffer to the base band.
Clearly these things are not needed for station/monitor mode so
remove configuring them.
Cc: doug dahlby <ddahlby@xxxxxxxxxxx>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 01123e233193a544c85b622e1690f44532052c5b
Author: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Date: Thu Dec 9 15:05:24 2010 +0100
cfg80211: update information elements in cached BSS struct
When a cached BSS struct is updated because a new beacon was received,
the code replaces the cached information elements by the IEs from the
new beacon. However it did not update the pub.information_elements
and pub.len_information_elements fields leaving them either pointing
to the old beacon IEs or in an inconsistent state where the data is
replaced by the new beacon IEs but len_information_elements still has
its value from the first beacon.
Fix this by updating the information elements fields if they are
pointing to beacon IEs.
Signed-off-by: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 998d516d9546eba04dd99ae49a78acb0cf770478
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Wed Dec 8 20:01:05 2010 +0530
ath: Missed to clear key4 of micentry
key4 of micentry is used, if ATH_CRYPT_CAP_MIC_COMBINED is set.
But is not cleared on key cache reset.
Cc: stable@xxxxxxxxxx
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6b3b991dbdb66a65a2167abbd9503e519fa999f3
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Wed Dec 8 19:38:55 2010 +0530
ath9k: Add change_interface callback
Add support to change interface type
without bringing down the interface.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a7ffac9591a2a0ee74c431396ae475a8d0caa51e
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Wed Dec 8 13:59:24 2010 +0900
cfg80211: Add antenna availability information
Add a field to wiphy for the hardware to report the availble antennas for
configuration. Only if this is set to something bigger than zero, will the
anntenna configuration ops be executed.
Allthough this could be a simple number of antennas, I defined it as a bitmap
of antennas which are available for configuration, since it's more consistent
with the rest of the antenna API and there could be cases where the
hardware allows only configuration of certain antennas. As it does not make
much of a difference in size or normal usage, I think it's better to be able to
support this, in case the need arises.
The antenna configuration is now also checked against the availabe antennas and
rejected if it does not match.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
--
v3: always apply available antenna mask (for "all" antennas case).
v2: reject antenna configurations which don't match the available antennas
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a08e7ade9ddf4fe79576f953cc5c1725e944d26c
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Dec 7 15:13:20 2010 -0800
ath9k: fix assumptions for idle calls on suspend/resume
mac80211 will notify drivers when to go idle and ath9k
assumed that it would get further notifications for idle
states after a device stop() config call but as per agreed
semantics the idle state of the radio is left up to driver
after mac80211 issues the stop() callback. The driver is
resposnbile for ensuring the device remains idle after
that even between suspend / resume calls.
This fixes suspend/resume when you issue suspend and resume
twice on ath9k when ath9k_stop() was already called. We need
to put the radio to full sleep in order for resume to work
correctly.
What might seem fishy is we are turning the radio off
after resume. The reason why we do this is because we know
we should not have anything enabled after a mac80211 tells
us to stop(), if we resume and never get a start() we won't
get another stop() by mac80211 so to be safe always bring
the 802.11 device with the radio disabled after resume,
this ensures that if we suspend we already have the radio
disabled and only a start() will ever trigger it on.
Cc: stable@xxxxxxxxxx
Cc: Paul Stewart <pstew@xxxxxxxxxx>
Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c2731b814e2aaaa40072ee761b7373c052d86e37
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Dec 7 15:13:19 2010 -0800
ath9k: Fix power save count imbalance on ath_radio_enable()
Upon a failure we never call ath9k_ps_restore() on ath_radio_enable(),
this will throw off the sc->ps_usecount. When the sc->ps_usecount
is > 0 we never put the chip to full sleep. This drains battery,
and will also make the chip fail upon resume with:
ath: Starting driver with initial channel: 5745 MHz
ath: timeout (100000 us) on reg 0x7000: 0xdeadbeef & 0x00000003 != 0x00000000
This would make the chip useless upon resume.
I cannot prove this can happen but in theory it is so best to
avoid this race completely and not have users complain about
a broken device after resume.
Cc: stable@xxxxxxxxxx
Cc: Paul Stewart <pstew@xxxxxxxxxx>
Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1d212aa96e1b63459486f729af9a3fa38768b801
Merge: 8c4877a4128e7931077b024a891a4b284d8756a3 b7613370db5ba66ad81e41cd3a5417fde4d5e03c
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 13 15:20:45 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 249fab773dd5f689318c969ed649c4db077cdfc3
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 13 12:16:14 2010 -0800
net: add limits to ip_default_ttl
ip_default_ttl should be between 1 and 255
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8808f64171deec62346888e156e3adb636e2a31a
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Dec 13 11:43:51 2010 -0200
mac80211: avoid calling ieee80211_work_work unconditionally
On suspend, there might be usb wireless drivers which wrongly trigger
the warning in ieee80211_work_work. If an usb driver doesn't have a
suspend hook, the usb stack will disconnect the device. On disconnect,
a mac80211 driver calls ieee80211_unregister_hw, which calls dev_close,
which calls ieee80211_stop, and in the end calls ieee80211_work_purge->
ieee80211_work_work.
The problem is that this call to ieee80211_work_purge comes after
mac80211 is suspended, triggering the warning even when we don't have
work queued in work_list (the expected case when already suspended),
because it always calls ieee80211_work_work.
So, just call ieee80211_work_work in ieee80211_work_purge if we really
have to abort work. This addresses the warning reported at
https://bugzilla.kernel.org/show_bug.cgi?id=24402
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 16cad7fba037b34ca32cc0adac65bc089d969fb8
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sat Dec 11 12:19:48 2010 +0100
p54usb: add 5 more USBIDs
This patch adds five more USBIDs to the table.
Source:
http://www.linuxant.com/pipermail/driverloader/2005q3/002307.html
http://wireless.kernel.org/en/users/Drivers/p54/devices (by M. Davis)
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c926d006c1514cfb3572893f41f2324e96823661
Author: Tim Harvey <harvey.tim@xxxxxxxxx>
Date: Thu Dec 9 10:43:13 2010 -0800
mac80211: Fix NULL-pointer deference on ibss merge when not ready
dev_open will eventually call ieee80211_ibss_join which sets up the
skb used for beacons/probe-responses however it is possible to
receive beacons that attempt to merge before this occurs causing
a null pointer dereference. Check ssid_len as that is the last
thing set in ieee80211_ibss_join.
This occurs quite easily in the presence of adhoc nodes with hidden SSID's
revised previous patch to check further up based on irc feedback
Signed-off-by: Tim Harvey <harvey.tim@xxxxxxxxx>
Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4a55d5852adbe66722fb1636c82c7864cd5be441
Author: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Date: Thu Dec 9 09:38:36 2010 +0100
libertas: fix potential NULL-pointer dereference
The code wants to check if there's a channel and it is not disabled,
but it used to check if channel is not NULL and accessed the channel
struct if this check failed.
Signed-off-by: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Acked-by: Dan Williams <dcbw@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 68433b73b104bff388aac376631d32abbbd872b0
Author: Chris Mason <chris.mason@xxxxxxxxxx>
Date: Mon Dec 13 14:47:58 2010 -0500
Btrfs: EIO when we fail to read tree roots
If we just get a plain IO error when we read tree roots, the code
wasn't properly sending that error up the chain. This allowed mounts to
continue when they should failed, and allowed operations
on partially setup root structs. The end result was usually oopsen
on spinlocks that hadn't been spun up correctly.
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit b9d41052794385f9d47ebb7acf4a772f3ad02398
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Mon Dec 13 13:42:24 2010 -0600
dlm: sanitize work_start() in lowcomms.c
The create_workqueue() returns NULL if failed rather than ERR_PTR().
Fix error checking and remove unnecessary variable 'error'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
commit 10c38c3306c04ec26b1536d30b8b11ccab32faa5
Merge: 6942fec92d3d1b6918425730de31b4c6d0d5c196 d9319560b86839506c2011346b1f2e61438a3c73
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 13 14:41:23 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
commit c4d6fd40df38eb4c187565d48807f5f902481ba8
Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Date: Mon Nov 29 04:09:53 2010 +0200
firewire: net: ratelimit error messages
Unfortunately its easy to trigger such error messages by removing the
cable while sending streams of data over the link.
Such errors are normal, and therefore this patch stops firewire-net from
flooding the kernel log with these errors, by combining series of same
errors together.
Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
(Stefan R:) Eventually we should remove this logging when firewire-net
and related firewire-ohci facilities have been stabilized.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit dd23736e092035b71df1117482b71fdfb5634239
Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Date: Mon Nov 29 04:09:50 2010 +0200
firewire: ohci: restart iso DMA contexts on resume from low power mode
Restore iso channels DMA so that iso channels could continue to work
after resume from RAM/disk.
Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 8662b6b029636c35e5876e184d90daf6b0072667
Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Date: Mon Nov 29 04:09:49 2010 +0200
firewire: ohci: restore GUID on resume.
Some lousy BIOSes, e.g. my Aspire 5720 BIOS forget to restore the GUID
register on resume from RAM.
Fix that by setting it to the last value that was read from it.
Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit ec766a7970126f99665992c0b0b10bd60a4d6208
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Tue Nov 30 08:25:17 2010 +0100
firewire: ohci: use common buffer for self IDs and AR descriptors
The buffers used for the selfIDs packets and the AR request and response
descriptors end up using three pages because dma_alloc_coherent()
allocates at least one page per call. However, these data structures
would all fit into 4 KB, so we can save space by using a common buffer
for them.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 2dd5bed59356e03610bebe1a37c397788df50b9b
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Tue Nov 30 08:25:05 2010 +0100
firewire: ohci: optimize iso context checks in the interrupt handler
When the isochRx/isochTx bit is clear, we do not need to read the
corresponding iso interrupt event register.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 5b06db166c4d38638980283505259fa165d4f369
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Tue Nov 30 08:24:47 2010 +0100
firewire: make PHY packet header format consistent
Change the header of PHY packets to be sent to include a pseudo
transaction code. This makes the header consistent with that of
received PHY packets, and allows at_context_queue_packet() and
log_ar_at_event() to see the packet type directly instead of having
to deduce it from the header length or even from the header contents.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 8327b37b18addfc6f8cf41a2f1a4490b656377b9
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Tue Nov 30 08:24:32 2010 +0100
firewire: ohci: properly clear posted write errors
To remove the error information from the controller's queue and to allow
more posted writes, the driver has to read the failed posted write
address before clearing the postedWriteErr interrupt bit.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
(Stefan R:) The spec is somewhat fuzzy about the actual requirements.
To err on the safe side, let's do these two read accesses.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit e597e9898abe45beff4696159c7fe5c96f53e581
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Tue Nov 30 08:24:19 2010 +0100
firewire: ohci: flush MMIO writes in the interrupt handler
Make sure that interrupt event clear bit writes are executed before the
interrupt handler returns.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit c088ab30ebf184afae01d919c77cebcfdce39df3
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Tue Nov 30 08:24:01 2010 +0100
firewire: ohci: fix AT context initialization error handling
Add proper error handling for the context_init() calls.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 7a39d8b82165462729d09066bddb395a19025acd
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date: Fri Nov 26 08:57:31 2010 +0100
firewire: ohci: Asynchronous Reception rewrite
Move the AR DMA descriptors out of the buffer pages, and map the buffer
pages linearly into the kernel's address space. This allows the driver
to ignore any page boundaries in the DMA data and thus to avoid any
copying around of packet payloads.
This fixes the bug where S800 packets that are so big (> 4080 bytes)
that they can be split over three pages were not handled correctly.
Due to the changed algorithm, we can now use arbitrarily many buffer
pages, which improves performance because the controller can more easily
unload its DMA FIFO.
Furthermore, using streaming DMA mappings should improve perfomance on
architectures where coherent DMA mappings are not cacheable. Even on
other architectures, the caching behaviour should be improved slightly
because the CPU no longer writes to the buffer pages.
v2: Detect the last filled buffer page by searching the descriptor's
residual count value fields in order (like in the old code), instead
of going backwards through the transfer status fields; it looks as
if some controllers do not set the latter correctly.
v3: Fix an old resume bug that would now make the handler run into
a BUG_ON, and replace that check with more useful error handling.
Increase the buffer size for better performance with non-TI chips.
Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Maxim Levitsky writes:
Works almost perfectly. I can still see RCODE_BUSY errors
sometimes, not very often though. 64K here eliminates these errors
completely. This is most likely due to nouveau drivers and lowest
perf level I use to lower card temperature. That increases
latencies too much I think. Besides that the IO is just perfect.
Tested-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit a388eb1727c15a7da1f64fcf16e60fcb7aca40bd
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:04:00 2010 -0800
staging: hv: Convert camel cased struct fields in rndis.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 53d21fdbf4d38dcfe27173d746acf74ea1a19958
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:03:59 2010 -0800
staging: hv: Convert camel cased struct fields in netvsc.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 72a2f5bd53bf83302f4dcfe8500d4ec440545d27
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:03:58 2010 -0800
staging: hv: Convert camel cased struct fields in netvsc_api.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9c26aa0d763a8390177f50ae841148706a249793
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:03:57 2010 -0800
staging: hv: Convert camel cased functions in rndis_filter.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c2a4efddc73bfd44479fc8d84dadbb352c4efb07
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:03:56 2010 -0800
staging: hv: Convert camel cased variables in rndis_filter.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5a71ae303c0f82968d93d86724c1d94d753b34d7
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:03:55 2010 -0800
staging: hv: Convert camel cased functions in netvsc.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 85799a37553f89b23797ec4f69e45f6c5e9109df
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:03:54 2010 -0800
staging: hv: Convert camel cased variables in netvsc.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e1b8a37ede8b47dbad002ec61a67706b70b23ccf
Author: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Date: Sun Dec 12 18:56:30 2010 +0100
Staging: rt2860: Avoid extern in .c file
rt28xx_close and rt28xx_open are already declared in a file included in
rt_config.h, so there is no need to declare them again.
Signed-off-by: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ced17a68b727d8509a4bde0b2ee7d0d120371e66
Author: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Date: Sun Dec 12 18:56:29 2010 +0100
Staging: rt2860: Clean spaces before tabs
Fix checkpatch complains
Signed-off-by: L. Alberto Giménez <agimenez@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6292817d58637f85dd623cfe563c7f5ec4f4c470
Author: Ruben Smits <ruben.smits@xxxxxxxxxxxxxxxx>
Date: Sat Dec 11 08:26:18 2010 +0100
staging: comedi: add support for newer jr3 1-channel pci board
add DEVICE_ID to table
Signed-off-by: Ruben Smits <ruben.smits@xxxxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ed271e049d4e0bf8c6586c9626964a01d1c62fa2
Author: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Date: Fri Dec 10 21:07:25 2010 +0200
Staging: comedi: Fix coding style issues in ni_tiocmd.c
This patch fixes the following issues in ni_tiocmd.c:
WARNING: braces {} are not necessary for any arm of this statement
WARNING: braces {} are not necessary for single statement blocks
WARNING: printk() should include KERN_ facility level
WARNING: line over 80 characters
__func__ should be used instead of gcc specific __FUNCTION__
ERROR: that open brace { should be on the previous line
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
Signed-off-by: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 448d40140196b33f63a0a3f3f8bcad8f14c9c432
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Mon Dec 13 10:39:20 2010 +0100
staging: ft1000: Always extract device number from netdev name.
Using gCardIndex as global variable was not correctly used because
for every plugged device was set to 0 in init_ft1000_netdev.
Remove global definition. Use it locally and for every plugged
device extract number from net device name.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8c4877a4128e7931077b024a891a4b284d8756a3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Dec 13 10:05:14 2010 -0800
ehea: Use the standard logging functions
Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0a6bf658c3b9d1d0e520d320b6392c8680c2e381
Author: Ira W. Snyder <iws@xxxxxxxxxxxxxxxx>
Date: Mon Dec 13 11:42:30 2010 -0500
hwmon: (ltc4215) make sysfs file match the alarm cause
The ltc4215 driver used the chip's "power good" status bit to provide
the power1_alarm file. This is wrong: the chip is really reporting the
status of one of the monitored voltages.
Change the sysfs file from power1_alarm to in2_min_alarm instead. This
matches the voltage that the chip is raising an alarm for.
Signed-off-by: Ira W. Snyder <iws@xxxxxxxxxxxxxxxx>
Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit 5f29805a4f4627e766f862ff9f10c14f5f314359
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Mon Dec 13 10:31:58 2010 -0500
x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled
When adjusting the code to handle removing the old nmi watchdog,
I forgot to consider the compile case when the local apic is not
enabled.
This change fixes the following build error:
arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of â??touch_nmi_watchdogâ??
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Rakib Mullick <rakib.mullick@xxxxxxxxx>
LKML-Reference: <20101213153719.GD18577@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 862af8adbe6b9ccb7c00c13717b1f92465f79aa2
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Fri Dec 10 20:53:55 2010 +0200
ASoC: Fix bias power down of non-DAPM codec
Currently bias of non-DAPM codec will be powered down (standby/off) whenever
there is a stream stop. This is wrong in simultaneous playback/capture since
the bias is put down immediately after stopping the first stream.
Fix this by using the codec->active count when figuring out the needed bias
level after stream stop.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit fb410aef0314ef183fe6da879d29536311971a20
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Thu Dec 9 23:12:37 2010 +0800
ARM: mxs: Add helper definition and function
Add helper definition and function for MXS-based.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit b0b6e42aa63fbd00a3b509e75702aca4be8618cd
Author: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Mon Dec 13 20:54:58 2010 +0800
ARM: mxs: Add core definitions
Add core definitions for MXS-based SoC MX23 and MX28.
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit f1c18071ad70e2a78ab31fc26a18fcfa954a05c6
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Mon Dec 13 12:43:23 2010 +0100
x86: HPET: Chose a paranoid safe value for the ETIME check
commit 995bd3bb5 (x86: Hpet: Avoid the comparator readback penalty)
chose 8 HPET cycles as a safe value for the ETIME check, as we had the
confirmation that the posted write to the comparator register is
delayed by two HPET clock cycles on Intel chipsets which showed
readback problems.
After that patch hit mainline we got reports from machines with newer
AMD chipsets which seem to have an even longer delay. See
http://thread.gmane.org/gmane.linux.kernel/1054283 and
http://thread.gmane.org/gmane.linux.kernel/1069458 for further
information.
Boris tried to come up with an ACPI based selection of the minimum
HPET cycles, but this failed on a couple of test machines. And of
course we did not get any useful information from the hardware folks.
For now our only option is to chose a paranoid high and safe value for
the minimum HPET cycles used by the ETIME check. Adjust the minimum ns
value for the HPET clockevent accordingly.
Reported-Bistected-and-Tested-by: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <alpine.LFD.2.00.1012131222420.2653@xxxxxxxxxxxxxxxxxxxxxxx>
Cc: Simon Kirby <sim@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Andreas Herrmann <Andreas.Herrmann3@xxxxxxx>
Cc: John Stultz <johnstul@xxxxxxxxxx>
commit a8760eca6cf60ed303ad494ef45901f63165d2c8
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Mon Dec 13 11:28:02 2010 +0100
x86: Check tsc available/disabled in the delayed init function
The delayed TSC init function does not check whether the system has no
TSC or TSC is disabled at the kernel command line, which results in a
crash in the work queue based extended calibration due to division by
zero because the basic calibration never happened.
Add the missing checks and do not touch TSC when not available or
disabled.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: John Stultz <johnstul@xxxxxxxxxx>
commit 598e227ea9af687547d46bff6906151e728f7b7b
Merge: 2818b19102fdc414248f772c46af176d36520ae7 f6d84f4a7df8057247a3f1723169586af3882436 cd8ab0041d131e8e210c4b5ded7257da50473dcb
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 13 15:36:36 2010 +0900
Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest
commit c43328e890b9e3a4ab8e8cb1020a8b1e9fda9ed1
Merge: 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e 80fbf8382e110656ea67327300f16cfd2488a9bf 852af59f6084bf1c48df16d2728216705621d598
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 13 15:35:10 2010 +0900
Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest
commit 852af59f6084bf1c48df16d2728216705621d598
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 13 15:33:16 2010 +0900
sh: mach-rsk: Add polled GPIO buttons support for RSK+7203.
Now that there's an upstream polled gpio-keys driver, add the outstanding
platform data for it.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 323e126f0c5995f779d7df7fd035f6e8fed8764d
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 12 21:55:08 2010 -0800
ipv4: Don't pre-seed hoplimit metric.
Always go through a new ip4_dst_hoplimit() helper, just like ipv6.
This allowed several simplifications:
1) The interim dst_metric_hoplimit() can go as it's no longer
userd.
2) The sysctl_ip_default_ttl entry no longer needs to use
ipv4_doint_and_flush, since the sysctl is not cached in
routing cache metrics any longer.
3) ipv4_doint_and_flush no longer needs to be exported and
therefore can be marked static.
When ipv4_doint_and_flush_strategy was removed some time ago,
the external declaration in ip.h was mistakenly left around
so kill that off too.
We have to move the sysctl_ip_default_ttl declaration into
ipv4's route cache definition header net/route.h, because
currently net/ip.h (where the declaration lives now) has
a back dependency on net/route.h
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 80fbf8382e110656ea67327300f16cfd2488a9bf
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 13 14:59:51 2010 +0900
sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.
There are still quite a number of MFD and GPIO expander drivers that are
using the old irq_chip APIs that haven't had a chance to update during
the .37 cycle, resulting in allyes/modconfig errors on some
configurations.
Mark Brown has done most of the legwork to get these fixed up in .38,
so this should just be a .37 stop-gap that we can drop at the end of the
.38 merge window.
Reported-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a02e4b7dae455151c423e2f69ef222c502a321fd
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 12 21:39:02 2010 -0800
ipv6: Demark default hoplimit as zero.
This is for consistency with ipv4. Using "-1" makes
no sense.
It was made this way a long time ago merely to be consistent
with how the ipv6 socket hoplimit "default" is stored.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5170ae824ddf1988a63fb12cbedcff817634c444
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 12 21:35:57 2010 -0800
net: Abstract RTAX_HOPLIMIT metric accesses behind helper.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit abbf46ae0e4954584eac599bec73502c1c805e9e
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 12 21:14:46 2010 -0800
ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cd8ab0041d131e8e210c4b5ded7257da50473dcb
Author: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Date: Thu Dec 9 01:55:55 2010 +0000
ARM: mach-shmobile: mackerel: Add keypad tca6408a support
This patch maps key0/key1/key2/key3 as HOME/MENU/BACK/POWER buttons
on mackerel board.
Signed-off-by: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 819c1a651fec6b370211609ce6eceefd20cf31e4
Merge: 440e2e4759805437f89f7eda78de72cb46729d04 9f1ee150fc7039eb65039ab17d9a95dfa6250133
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 12 23:45:39 2010 +0000
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
commit 440e2e4759805437f89f7eda78de72cb46729d04
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 12 23:24:28 2010 +0000
ARM: Update mach-types
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit da30e0ac0f9a521f0cfec8145ddd1ad131f66d61
Author: Catalin Marinas <catalin.marinas@xxxxxxx>
Date: Tue Dec 7 16:56:29 2010 +0100
ARM: 6528/1: Use CTR for the I-cache line size on ARMv7
The current implementation of the v7_coherent_*_range function assumes
that the D and I cache lines have the same size, which is incorrect
architecturally. This patch adds the icache_line_size macro which reads
the CTR register. The main loop in v7_coherent_*_range is split in two
independent loops or the D and I caches. This also has the performance
advantage that the DSB is moved outside the main loop.
Reported-by: Kevin Sapp <ksapp@xxxxxxxxxxx>
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit f91e2c3bd427239c198351f44814dd39db91afe0
Author: Catalin Marinas <catalin.marinas@xxxxxxx>
Date: Tue Dec 7 16:52:04 2010 +0100
ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7
The current implementation of the dcache_line_size macro reads the L1
cache size from the CCSIDR register. This, however, is not guaranteed to
be the smallest cache line in the cache hierarchy. The patch changes to
the macro to use the more architecturally correct CTR register.
Reported-by: Kevin Sapp <ksapp@xxxxxxxxxxx>
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 2a27a03d3a891e87ca33d27a858b4db734a4cbab
Author: Andrej Ota <andrej@xxxxxx>
Date: Sun Dec 12 15:06:16 2010 -0800
pppoe.c: Fix kernel panic caused by __pppoe_xmit
__pppoe_xmit function return value was invalid resulting in
additional call to kfree_skb on already freed skb. This resulted in
memory corruption and consequent kernel panic after PPPoE peer
terminated the link.
This fixes commit 55c95e738da85373965cb03b4f975d0fd559865b.
Reported-by: Gorik Van Steenberge <gvs@xxxxxxxxx>
Reported-by: Daniel Kenzelmann <kernel.bugzilla@xxxxxxxxxxxxxxxxxxxxxx>
Reported-by: Denys Fedoryshchenko <nuclearcat@xxxxxxxxxxxxxx>
Reported-by: Pawel Staszewski <pstaszewski@xxxxxxxxx>
Diagnosed-by: Andrej Ota <andrej@xxxxxx>
Diagnosed-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Tested-by: Denys Fedoryshchenko <nuclearcat@xxxxxxxxxxxxxx>
Tested-by: Pawel Staszewski <pstaszewski@xxxxxxxxx>
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: Andrej Ota <andrej@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit eaff9453d3e2b63969af93e9d42a85e803060121
Author: Krzysztof Halasa <khc@xxxxxxxxx>
Date: Sun Dec 12 12:06:47 2010 +0000
WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.
We must not wake the TX queue without free TX descriptors.
sca_xmit() expects at least one free descriptor and BUGs otherwise.
Problem reported and fix tested by Bernie Innocenti and Ward Vandewege.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9f5449611c9d6d7bdcae8020a197d8b4d9b6443c
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Sun Dec 12 04:12:29 2010 +0000
bnx2x: Advance a version number to 1.60.01-0
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 372e43eb2fc34001250e27d63f99c20e46ea58a7
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Sun Dec 12 04:12:12 2010 +0000
bnx2x: Fixed a compilation warning
bnx2x_src_init_t2() is used only when BCM_CNIC is defined.
So, to avoid a compilation warning, we won't define it unless
BCM_CNIC is defined.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 099978b434d4924594516db540ccc50652e7cc94
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Sun Dec 12 04:11:45 2010 +0000
bnx2x: LSO code was broken on BE platforms
Make the LSO code work on BE platforms: parsing_data field of
a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong
values for TCP header's length and offset and, as a result, the corresponding
PCI device was performing bad DMA reads triggering EEH.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87
Author: Ron Mercer <ron.mercer@xxxxxxxxxx>
Date: Sat Dec 11 11:06:50 2010 +0000
qlge: Fix deadlock when cancelling worker.
Removing usage of rtnl_lock() to protect firmware interface registers.
These registers are accessed in some worker threads and can create a
deadlock if rtnl_lock is taken by upper layers while the worker is still
pending.
We remove rtnl_lock and use a driver mutex just while mailboxes are
accessed.
Signed-off-by: Ron Mercer <ron.mercer@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bce5feeab418fb1df9ce1c3fcc14f0aacf740208
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 12 14:57:53 2010 -0800
sparc: Eliminate prom_stdin.
Completely unused.
Based upon a patch by Julian Calaby.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 154337688bfa970453836e65a27de011aba55331
Author: Julian Calaby <julian.calaby@xxxxxxxxx>
Date: Fri Dec 3 17:56:45 2010 +0000
sparc: prom: Sanitize return value from prom_nbputchar()
Signed-off-by: Julian Calaby <julian.calaby@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 36eac2130cdbac08606bb2c05775e52ab79b163c
Merge: a19faf0250e09b16cac169354126404bc8aa342b e4dde731ae70072338352c6f8fb75fd04a42cf8d
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 12 14:16:51 2010 -0800
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
commit 7496351ad87e61e96b49dd7b43c6534e3401f566
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Tue Nov 30 14:05:53 2010 -0600
timers: Use this_cpu_read
Eric asked for this.
[tglx: Because it generates faster code according to Erics ]
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: linux-mm@xxxxxxxxx
LKML-Reference: <alpine.DEB.2.00.1011301404490.4039@xxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 1635953305694ece16d99078ca6d32f3d4e7eb36
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:15 2010 +0100
hostap: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. Drop flush_scheduled_work()
from prism2_free_local_data() and replace it with explicit flushing of
work items on the respective free functions. Work items in ap_data
are flushed from hostap_free_data() and the ones in local_info from
prism2_free_local_data().
Flush is used instead of cancel as some process and free items from
queue.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Jes Sorensen <jes@xxxxxxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit 781ba4567698be9db7ca94d827c4b38d8583c168
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
i2400m: drop i2400m_schedule_work()
i2400m implements dynamic work allocation and queueing mechanism in
i2400_schedule_work(); however, this is only used for reset and
recovery which can be served equally well with preallocated per device
works.
Replace i2400m_schedule_work() with two work structs in struct i2400m.
These works are explicitly canceled when the device is released making
calls to flush_scheduled_work(), which is being deprecated,
unnecessary.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@xxxxxxxxx>
Cc: linux-wimax@xxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
commit fe8998c5e3b173f3d5c450bbde6173e7fbe5158d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
sungem: update gp->reset_task flushing
gp->reset_task_pending is always set right before reset_task is
scheduled and as there is no synchronization between the setting and
scheduling, busy looping on reset_task_pending before flushing
reset_task doesn't really buy anything.
Directly flush gp->reset_task on suspend and cancel on detach.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit 760141a53e5d72d4cc1d8c6e2a0232a24bedb36b
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
igb[v],ixgbe: don't use flush_scheduled_work()
All three drivers use flush_scheduled_work() similarly during driver
detach. Replace it with explicit cancels.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: e1000-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
commit 9beb4896cec71e40738a7752072174fbf0d5b7b4
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
iseries_veth: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. Remove its usage from
iseries_veth.
* Cancelling a delayed work, queueing it for immediate execution if
cancelled and then waiting for completion can be done by simply
calling flush_delayed_work_sync().
* Explicitly cancel cnx->statemachine_wq on module unload.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Santiago Leon <santil@xxxxxxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit f5c35cc191afd08d660e6db0fecc9f431dc8f273
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
ehea: don't use flush_scheduled_work()
Directly cancel port->reset_task from ehea_shutdown_single_port()
instead. As this cancels the work for each port on driver detach,
flushing system_wq from ehea_remove() or ehea_module_exit() is no
longer necessary.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit 3d6b892bcc4c810071e36d8aff25aa171f55f93d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
ehea: kill unused ehea_rereg_mr_task
ehea_rereg_mr_task is not used. Remove it and drop @work parameter
from ehea_rereg_mrs().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit 23f333a2bfafba80339315b724808982a9de57d9
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
drivers/net: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. This patch contains simple
conversions to replace flush_scheduled_work() usage with direct
cancels and flushes.
Directly cancel the used works on driver detach and flush them in
other cases.
The conversions are mostly straight forward and the only dangers are,
* Forgetting to cancel/flush one or more used works.
* Cancelling when a work should be flushed (ie. the work must be
executed once scheduled whether the driver is detaching or not).
I've gone over the changes multiple times but it would be much
appreciated if you can review with the above points in mind.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Jay Cliburn <jcliburn@xxxxxxxxx>
Cc: Michael Chan <mchan@xxxxxxxxxxxx>
Cc: Divy Le Ray <divy@xxxxxxxxxxx>
Cc: e1000-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Cc: Samuel Ortiz <samuel@xxxxxxxxxx>
Cc: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Cc: Andrew Gallatin <gallatin@xxxxxxxx>
Cc: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Ramkrishna Vepa <ramkrishna.vepa@xxxxxxxx>
Cc: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: Shreyas Bhatewara <sbhatewara@xxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit 6e07ebd84eef00be9e169a6d15a0bc20b06578fa
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sun Dec 12 16:45:14 2010 +0100
drivers/net: remove unnecessary flush_scheduled_work() calls
janz-ican3, sh_eth, skge and vxge don't use workqueue at all and there
is no reason to flush the system_wq. Drop flush_scheduled_work()
calls and references to workqueue.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Wolfgang Grandegger <wg@xxxxxxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Cc: Ramkrishna Vepa <ramkrishna.vepa@xxxxxxxx>
Cc: Sivakumar Subramani <sivakumar.subramani@xxxxxxxx>
Cc: Sreenivasa Honnur <sreenivasa.honnur@xxxxxxxx>
Cc: Jon Mason <jon.mason@xxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
commit 5878730be4e3d0c9527d6f2f688874e38acacc98
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 14:08:27 2010 -0700
firewire: core: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit 9993e0fe0f5f29c69e79efcb271ffc9843002985
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 20:32:40 2010 +0100
firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
Agere FW643 rev 06, listed as "11c1:5901 (rev 06) (prog-if 10 [OHCI])",
produced SBP-2 I/O errors since kernel 2.6.36. Disabling MSI fixes it.
Since MSI work on Agere FW643-E (same vendor and device ID, but rev 07),
introduce a device revision field into firewire-ohci's quirks list so
that different quirks can be defined for older and newer revisions.
Reported-by: Jonathan Isom <jeisom@xxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx> # 2.6.36.y
commit 60a74a6ff86b4e90b9558956589390efdeb4e924
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Sat Oct 23 13:18:56 2010 +0200
firewire: nosy: char device is not seekable
Amend .open handler accordingly and remove the .llseek handler.
.llseek = NULL means no_llseek (return error) since commit 776c163b1b93.
The only client that uses this interface is nosy-dump in linux/tools/firewire
and it knows not to seek in this char dev.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
commit af0cdf4947818becfe209610b209315578645ab4
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 19:16:02 2010 +0100
firewire: ohci: fix regression with VIA VT6315, disable MSI
"VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]"
does not generate any interrupts if Message Signaled Interrupts were
enabled. This is a regression since kernel 2.6.36 in which MSI support
was added to firewire-ohci. Hence blacklist MSI on all VIA controllers.
Reported-by: Robin Cook <rcook@xxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx> # 2.6.36.y
commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0
Author: Manuel Lauss <manuel.lauss@xxxxxxxxxxxxxx>
Date: Sat Dec 11 09:53:42 2010 +0000
net: au1000_eth: remove unused global variable.
The driver global au_macs[] is unused in the entire kernel tree,
so remove it.
Signed-off-by: Manuel Lauss <manuel.lauss@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 85a564983aff948b9ea8b6e734b3e80b5755d12a
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 15:40:04 2010 +0000
s2io: Using static const generally increases object text and decreases data size. It also generally decreases overall object size.
text data bss dec hex filename
109387 389 24432 134208 20c40 drivers/net/s2io.o.old
109358 389 24432 134179 20c23 drivers/net/s2io.o.new
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 11410b62cf9bdaed5863696c7994286a900424c7
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 15:40:03 2010 +0000
s2io: Update Driver Version
Update Driver Version
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 15:40:02 2010 +0000
s2io: make strings at tables const
Put immutable data in read/only section.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1853e2e15dc95ff3430530941b5856581251ef70
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 15:40:01 2010 +0000
s2io: rx_ring_sz bounds checking
modparm rx_ring_sz can be set to be greater than the maximum allowable
number of blocks. This results in an array overrun when probing the
driver, and causes memory corruption.
Also, the MAX_RX_DESC_1 multiply the max number of rings by max number
of blocker per ring by 127, but the driver does the same calculation
with 127+1. This results in the possibility of the value being set
being larger than the maximum allowable value.
Finally, clean-up the s2io_ethtool_gringparam code to be more
intuitive.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c4ffafa51bb0bea648a4ca119033a95057799c9d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Sat Dec 11 17:51:36 2010 +0100
HID: hid-picolcd: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush picolcd_fb_cleanup on exit instead.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 45f74264e18449cf3c93cccaf098ee6e9524ab78
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Sat Dec 11 12:34:34 2010 +0100
timerqueue: Make timerqueue_getnext() static inline
No point in calling a function just to dereference a pointer.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: John Stultz <john.stultz@xxxxxxxxxx>
commit e4a2b3565fc7ac2d70361a36337be57a59d783da
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Fri Dec 10 22:48:28 2010 +0300
usb: musb: core: kill unneeded #include's
musb_core.c #include's a bunch of ARM and DaVinci specific headers, goodness
knows why -- it happily compiles without them...
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 5a166f4f9999355720f829e94cf3bd306bae6f8b
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date: Fri Dec 10 20:23:06 2010 +0300
DA8xx: assign name to MUSB IRQ resource
Commit fcf173e4511193b1efeccb0f22a8c641b464353b (usb: musb: add names for IRQs
in structure resource) forgot to assign name to the DA8xx MUSB IRQ resource.
Because of that MUSB driver fails to load on DA8xx machines.
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 57a7872fa0f03e90be0fa224b9ea533f5b03ee4f
Author: Kevin Granade <kevin.granade@xxxxxxxxx>
Date: Fri Dec 10 23:04:02 2010 -0800
Input: wacom - add another Bamboo Pen ID (0xd4)
Add the features struct and device table entry to enable yet another
version of Wacom Bamboo Pen (CTL460, Product ID 0xD4).
Signed-off-by: Kevin Granade <kevin.granade@xxxxxxxxx>
Acked-by: Ping Cheng <pingc@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290
Merge: a5dc4f898c2a0f66e2cefada6c687db82ba2fcbc 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b 12b3b5afed67e08aa641d30e57df20dab2e33432 bec4f22a2dbd5a26079cbddbcadf38f8c7e5381f 12d3206466d2074ef0684aaf7759ae01a0a92560
Author: Len Brown <len.brown@xxxxxxxxx>
Date: Sat Dec 11 02:02:02 2010 -0500
Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.6.37' and 'osi-regression' into release
commit bec4f22a2dbd5a26079cbddbcadf38f8c7e5381f
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date: Tue Dec 7 14:58:44 2010 +0000
ACPI/HEST: adjust section selection
Properly const-, __init-, and __read_mostly-annotate this code.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 091aad6af4ab29af693ced5d6970ceee9d5981c8
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date: Tue Dec 7 14:52:25 2010 +0000
ACPI: eliminate unused variable warning for !ACPI_SLEEP
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 66c3ec4f1f70ee87833363166b594855631d7ba6
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date: Tue Dec 7 15:05:49 2010 +0000
ACPI/PNP: avoid section mismatch warning
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit b9047599695ae835252ba3d6a19eada98c19dc89
Author: Zhang Rui <rui.zhang@xxxxxxxxx>
Date: Wed Dec 8 10:40:26 2010 +0800
ACPI thermal: remove two unused functions
When CONFIG_CPU_FREQ=n ...
drivers/acpi/processor_thermal.c:159:12: warning: â??acpi_thermal_cpufreq_increaseâ?? defined but not used
drivers/acpi/processor_thermal.c:163:12: warning: â??acpi_thermal_cpufreq_decreaseâ?? defined but not used
Remove unused declaration of â??acpi_thermal_cpufreq_increaseâ?? and
â??acpi_thermal_cpufreq_decreaseâ??
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 32d47eeff05981bfb89a95747eb182bc12630d58
Author: Zhang Rui <rui.zhang@xxxxxxxxx>
Date: Wed Dec 8 10:40:36 2010 +0800
ACPI: fix a section mismatch
WARNING: drivers/acpi/acpi.o(.text+0xeda): Section mismatch in reference from the function acpi_os_initialize1() to the function .init.text:set_osi_linux()
The function acpi_os_initialize1() references
the function __init set_osi_linux().
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192
Author: Huang Ying <ying.huang@xxxxxxxxx>
Date: Thu Dec 2 10:40:53 2010 +0800
ACPI, APEI, use raw spinlock in ERST
ERST writing may be used in NMI or Machine Check Exception handler. So
it need to use raw spinlock instead of normal spinlock. This patch
fixes it.
Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit b72512ed706efb26087fcbbc5f98ed64ac1230d5
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun Sep 5 14:51:49 2010 +0100
ACPI: video: fix build for CONFIG_ACPI=n
In file included from drivers/gpu/drm/i915/intel_opregion.c:30:
include/acpi/video.h:22: warning: â??struct acpi_deviceâ?? declared inside parameter list
...
include/acpi/video.h:24: error: â??ENODEVâ?? undeclared (first use in this function)
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 3353bebe7c89725ab2f476b9d8d618259402d52e
Author: Len Brown <len.brown@xxxxxxxxx>
Date: Tue Nov 30 18:21:46 2010 -0500
ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
drivers/built-in.o: In function `acpi_video_bus_put_devices':
video.c:(.text+0x79663): undefined reference to
`video_output_unregister'
drivers/built-in.o: In function `acpi_video_bus_add':
video.c:(.text+0x7b0b3): undefined reference to `video_output_register'
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 12d3206466d2074ef0684aaf7759ae01a0a92560
Author: Lin Ming <ming.m.lin@xxxxxxxxx>
Date: Thu Dec 9 16:51:06 2010 +0800
ACPI: fix allowing to add/remove multiple _OSI strings
commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor)
introduced another regression that only one _OSI string can be added or
removed.
Now multiple _OSI strings can be added or removed, for example
acpi_osi=Linux acpi_osi=FreeBSD acpi_osi="!Windows 2006"
Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit d90aa92c0c1625d7f02050e4d2924805840cda3d
Author: Lin Ming <ming.m.lin@xxxxxxxxx>
Date: Thu Dec 9 16:50:52 2010 +0800
acpi: fix _OSI string setup regression
commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor)
introduced a regression that _OSI string setup fails.
There are 2 paths to setup _OSI string.
DMI:
acpi_dmi_osi_linux -> set_osi_linux -> acpi_osi_setup -> copy _OSI
string to osi_setup_string
Boot command line:
acpi_osi_setup -> copy _OSI string to osi_setup_string
Later, acpi_osi_setup_late will be called to handle osi_setup_string.
If _OSI string is "Linux" or "!Linux", then the call path is,
acpi_osi_setup_late -> acpi_cmdline_osi_linux -> set_osi_linux ->
acpi_osi_setup -> copy _OSI string to osi_setup_string
This actually never installs _OSI string(acpi_install_interface not
called), but just copy the _OSI string to osi_setup_string.
This patch fixes the regression.
Reported-and-tested-by: Lukas Hejtmanek <xhejtman@xxxxxxxxxxx>
Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit b007c389d3e09b823eccda1503390fa2a9adca0d
Author: John Stultz <john.stultz@xxxxxxxxxx>
Date: Fri Dec 10 22:19:53 2010 -0800
hrtimer: fix timerqueue conversion flub
In converting the hrtimers to timerqueue, I missed
a spot in hrtimer_run_queues where we loop running
timers. We end up not pulling the new next value out
and instead just use the last next value, causing
boot time hangs in some cases.
The proper fix is to pull timerqueue_getnext each iteration
instead of using a local next value.
Reported-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
commit 9835fd7321a67feba6432e63bf2cba43f5a56bd9
Author: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>
Date: Mon Nov 22 17:17:21 2010 +0000
igb: Add new function to read part number from EEPROM in string format
New adapters will have part numbers stored in string format rather than
simple hex format. This function will read part number formats in either
hex or string.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit c920aa8b87bfec3dbd926ae777430e613e5088df
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Dec 1 08:45:24 2010 +0000
e1000e: increment the driver version
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 61c758166701c4f156c0aba10260f5729b1a6f43
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Thu Dec 9 23:04:25 2010 +0000
e1000e: static analysis tools complain of a possible null ptr p dereference
Adding this default case resolves the issue.
v2- Removed "break" in default case based on feedback
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit e9262447233037e9336d5866628821156a17366f
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:02:06 2010 +0000
e1000e: minor error message corrections
Correct error messages when setting up Rx resources and when checking
module parameters.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 36b973df713e1395b79896de667ad7dbb1925fa7
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 07:42:43 2010 +0000
e1000e: prevent null ptr dereference in e1000_tx_queue()
tx_desc can be dereferenced as a null pointer when count is passed in
as 0.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 073287c037083497ebaaf75ead469b769f218615
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:51 2010 +0000
e1000e: support new PBA format from EEPROM
Provide support to e1000e for displaying the new format of the PBA found
in the EEPROM. The unique PBA identifier is no longer restricted to
hexadecimal numbers and must now be read and displayed as a string.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 664dc878ed6f0476b875547547a49e06f7a4e73b
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:46 2010 +0000
e1000e: 82579 PHY incorrectly identified during init
During init, reading the 2 PHY ID registers back-to-back in the default
fast mode could return invalid data (all F's) and in slow mode could
return data to the second read the data from the first read. To resolve
the issue in fast mode, set to slow mode before any PHY accesses; to
resolve the issue in slow mode, put in a delay for every 82579 PHY access.
Since this PHY is currently only paired with the pch2lan MAC and the PHY
type is not known before the first PHY access which can fail this way,
check for this based on MAC-type.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit ce54afd16d874ac07378a8bb55d26f7f5b613c0e
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:41 2010 +0000
e1000e: 82577/8/9 mis-configured OEM bits during S0->Sx
The LPLU (Low Power Link Up) and Gigabit Disable bits (a.k.a. OEM bits)
were being configured incorrectly when device goes to D3 state.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit d9c76f99c2a79feb413e3e751362d59c0f5323f6
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:35 2010 +0000
e1000e: 82571 Serdes can fail to get link
When link partner is sending continuous Config symbols, the 82571 Serdes
FIFO can overflow resulting in Invalid bit getting set. To resolve this,
if Sync and Config bits are both 1 ignore the Invalid bit and restart
auto-negotiation.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit cbd006cb7d4e7b76c6febf7f51e970bced132914
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:30 2010 +0000
e1000e: 82577/8 must acquire h/w semaphore before workaround
The workaround function e1000_configure_k1_pchlan() assumes the h/w
semaphore is already acquired. This was originally missed when setting up
the part for the ethtool loopback test.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit ed5c2b0b78e5467f7948bef92b21f3c76823f392
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:25 2010 +0000
e1000e: 82574/82583 performance improvement
Increasing the transmit fifo by 4K (by decreasing the receive fifo size
specified in .pba by the same amount) increases Tx performance.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Wed Nov 24 06:01:20 2010 +0000
e1000e: 82571-based mezzanine card can fail ethtool link test
On certain 82571-based mezzanine NICs in some blade servers, the ethtool
link test can fail due to the serdes_has_link flag not set correctly.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 9633e63bb1d82c02950983d5d3317e6656b11c8e
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Wed Nov 17 15:43:52 2010 +0000
e1000e: fix double initialization in blink path
The kernel goes BUG() at the time 'ethtool -p eth0 3' comes
back, which is due to adapter->led_blink_task initialized
several times. At the time it is still running this results
in a corrupted task_list of the associated workqueue.
The fix is to move the workqueue initialization to the
probe function instead.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 9fe93afdd07aba52a018eb52784124579a80470e
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 09:33:54 2010 +0000
ixgbe: cleanup string function calls to use bound checking versions.
Some minor cleanup to use string calls that use bound checks just to
be extra safe.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af
Author: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Date: Wed Dec 1 05:47:05 2010 +0000
ixgbe: fix ntuple support
commit f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef
ixgbe: Update ixgbe to use new vlan accleration.
removed ETH_FLAG_NTUPLE from the supported flags.
This patch puts it back on to allow for setting ntuple via ethtool.
CC: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit d994653db465616a7bf27703e733170c47488cdf
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Thu Dec 9 06:55:19 2010 +0000
ixgbe: fix X540 to use it's own info struct
This patch enables X540 hardware to use it's own set of support
functions. This is useful as it has no need of SFP+ support. A
couple minor bugs with the eeprom semaphore were also cleaned up.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 2b264909c660717a67da997a181a4a4f551ef9b6
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Thu Dec 9 06:55:14 2010 +0000
ixgbe: fix X540 phy id to correct value
The existing PHY ID for X540 was from early production hardware and
is no longer correct. This patch corrects that.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit ae54496f9e8d40c89e5668205c181dccfa9ecda1
Author: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Date: Sat Dec 4 05:35:17 2010 +0000
ixgb: Don't check for vlan group on transmit
Based on a patch from Jesse Gross.
Enable vlan tag insertion even when vlan group is not configured.
For ixgb HW both CTRL0.VME and VLE bit in the Tx descriptor need to be set
in order to enable HW acceleration.
Introduced separate functions for enabling/disabling of vlan tag stripping
similar to ixgbe.
CC: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Tested-by: Jeff Pieper <jeffrey.e.pieper@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 667445008db3f45a760c235d771be0c9671e59e5
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Wed Dec 1 19:59:50 2010 +0000
Intel Wired LAN drivers: Use static const
Based on work by Joe Perches <joe@xxxxxxxxxxx>
Using static const to decrease data and overall object size.
CC: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
commit 19a0b67afd174c4db261d587b5c67704dcd53c17
Author: Dean Nelson <dnelson@xxxxxxxxxx>
Date: Thu Nov 11 05:50:25 2010 +0000
e1000: fix return value not set on error
Dean noticed that 'err' wasn't being set when the "goto err_dma"
statement is executed in the following hunk from the commit. It's value
will be zero as a result of a successful call to e1000_init_hw_struct().
This patch changes the error condition to be correctly propagated.
CC: stable@xxxxxxxxxx
Signed-off-by: Dean Nelson <dnelson@xxxxxxxxxx>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit fa795e6b9c59a14c80a475428df7e4cb97396f47
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Fri Dec 10 00:09:08 2010 -0800
MAINTAINERS: Update Intel Wired LAN info
Update with Intel Wired Ethernet public git trees.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit dabee56860bc6b617c7ea481bb9b00fba41c9c48
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Fri Dec 10 00:01:44 2010 -0800
Documentation/networking/ixgbevf.txt: Update documentation
Update Intel Wired LAN ixgbevf documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 872857a84e18f4bf9b56b298309a977b2ce77b5b
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Thu Dec 9 23:55:47 2010 -0800
Documentation/networking/ixgbe.txt: Update ixgbe documentation
Update Intel Wired LAN ixgbe documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit f2be1429798785c6b7d4747ac1fda2c40b3f26eb
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Thu Dec 9 23:49:34 2010 -0800
Documentation/networking/igbvf.txt: Update documentation
Update Intel Wired LAN igbvf documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 1ffd7246445038569f4c2f4b39bda1e71e68f1a2
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Thu Dec 9 23:47:39 2010 -0800
Documentation/networking/igb.txt: update documentation
Update Intel Wired LAN igb documentation.
v2- Updated the ethtool support link, removed the LRO section and
anti-spoofing sections.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 072ed34fa97374b390a2493fa281ec8a7888b312
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Thu Dec 9 23:44:42 2010 -0800
Documentation/networking/e1000e.txt: Update documentation
Update Intel Wired LAN e1000e documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 96c3c0330dea8856f02fc59e25c866d6d5eebed5
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date: Thu Dec 9 23:42:00 2010 -0800
Documentation/networking/e1000.txt: Update documentation
Update Intel Wired LAN e1000 documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit c2015dc88a57090bcf67ab7cfcdbc34671598d36
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Mon Dec 6 20:52:40 2010 +0000
OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
After Charu's GPIO hwmod patches, GPIO initialization on N800 emits
the following messages for all GPIO banks:
omap_hwmod: gpio1: cannot be enabled (3)
This is due to OMAP24XX_ST_GPIOS_SHIFT being defined as a bitmask.
Fix this and also fix two other macros that had the same problem.
Thanks to Tony Lindgren <tony@xxxxxxxxxxx> for originally reporting
this bug.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx
Cc: Charulatha Varadarajan <charu@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit a5d62a149bb8f5359aff7ed7dce339752fbabfd9
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 16:49:24 2010 -0800
isdn: Fix printed out copy_from_user() return value after previous change.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca
Merge: 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 595a251c0740785fd3c0d2156d78578c7479811e
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 16:34:10 2010 -0800
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit f073c7ca29a4a7e14060d9d3ddf09bfbb7cd9cc0
Author: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Date: Thu Dec 9 15:17:13 2010 +0000
bonding: add the debugfs facility to the bonding driver
This patch provides the debugfs facility to the bonding driver.
The "bonding" directory is created in the debugfs root and directories of
each bonding interface (like bond0, bond1...) are created in that.
# mount -t debugfs none /sys/kernel/debug
# ls /sys/kernel/debug/bonding
bond0 bond1
Signed-off-by: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6c2c9d964e71770e7d6efc1a82f3621005d12185
Author: Roopa Prabhu <roprabhu@xxxxxxxxx>
Date: Fri Dec 10 12:02:33 2010 +0000
enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: David Wang <dwang2@xxxxxxxxx>
Signed-off-by: Christian Benvenuti <benve@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a19faf0250e09b16cac169354126404bc8aa342b
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Dec 5 18:50:32 2010 +0000
net: fix skb_defer_rx_timestamp()
After commit c1f19b51d1d8 (net: support time stamping in phy devices.),
kernel might crash if CONFIG_NETWORK_PHY_TIMESTAMPING=y and
skb_defer_rx_timestamp() handles a packet without an ethernet header.
Fixes kernel bugzilla #24102
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=24102
Reported-and-tested-by: Andrew Watts <akwatts@xxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 36accaed22347f4b09cbc3c9fe2c1163a3575ea1
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Dec 10 02:40:09 2010 +0000
isdn: return -EFAULT if copy_from_user() fails
We should be returning -EFAULT here.
Mostly this patch is to silence a smatch warning. The upper levels
of this driver turn all non-zero return values from isar_load_firmware()
into 1.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5d52040d4d1eabb56a4d51b760ab8f74eabb9001
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:03:02 2010 +0000
vxge: update driver version
Update vxge driver version to 2.5.1
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b55e7b153f698bb027102759388d0c09542f68bd
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:03:01 2010 +0000
vxge: independent interrupt moderation
Configure the workload clock register and TIM register for independent
interrupt moderation based on the individual vpath utilization instead
of common link utilization. This greatly improves latency.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9c1638871671721e8f3693a0dfbb0e2e05b08742
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:03:00 2010 +0000
vxge: hotplug stall
When hot-unplugging a vxge adapter while running, the driver's remove
routine prints warning and then stalls the calling thread. This is due
to vxge_remove calling vxge_device_unregister to unregister the netdev
before calling flush_scheduled_work clear any pending work. Swapping
the order of these two functions resolves the issue.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2e41f6449c561e6e3f572e11d0f2240bd51104db
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:02:59 2010 +0000
vxge: transmit timeout deadlock
Use a workqueue to handle the device reset during a transmit timeout, as
there can be a deadlock during bringup. Also, set the netif carrier off
before the watchdog reset is started to prevent the timeout from
reoccurring while still processing the first.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:02:58 2010 +0000
vxge: use pci_request_region()
Only BAR0 is ever accessed, thus making the calls to pci_request_regions
overkill. Change calls of pci_request_regions to pci_request_region to
reduce the size of the mapped area.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c92bf70dcb9d08f821e4c9f09f8fc328495ba998
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:02:57 2010 +0000
vxge: fix crash of VF when unloading PF
Calling pci_disable_sriov when unloading a SR-IOV physical function
driver from a host when a guest is using a virtual function from that
device can cause a host crash or VM crash. The crash is caused by the
virtual config space no longer being present when PF is removed (due to
the pci_disable_sriov). This can be avoided by not calling
pci_disable_sriov to disable the PCI space when shutting down the PF.
Each function in the X3100 operates independently and in this case will
operate properly in the absence of the PF.
Also, added improved logic in the detection of SR-IOV initialization.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 528f727279ae840db8a06c94f5e82cdaeb00da6f
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Fri Dec 10 14:02:56 2010 +0000
vxge: code cleanup and reorganization
Move function locations to remove the need for internal declarations and
other misc clean-ups.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Arpit Patel <arpit.patel@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit deef4b522b814593407cfd56216840c2b75e9f15
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 9 17:38:11 2010 +0000
bridge: Use consistent NF_DROP returns in nf_pre_routing
The nf_pre_routing functions in bridging have collected two
distinct ways of returning NF_DROP over the years, inline and
via goto. There is no reason for preferring either one.
So this patch arbitrarily picks the inline variant and converts
the all the gotos.
Also removes a redundant comment.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c053fd96d0d3d18c721f880b8fdd0b925894d9c4
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Fri Dec 10 16:02:20 2010 -0800
af_packet: use swap() instead of the open coded macro XC()
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ed4ba4b5b96742d29225308ccccbdb1810b63064
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 9 12:10:25 2010 +0000
netdev: Use default implementation of ethtool_ops::get_link where possible
Various drivers are using implementations of ethtool_ops::get_link
that are equivalent to the default ethtool_op_get_link(). Change
them to use that instead.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e596e6e4d578f2639416e620d367a3af34814a40
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 9 12:08:35 2010 +0000
ethtool: Report link-down while interface is down
While an interface is down, many implementations of
ethtool_ops::get_link, including the default, ethtool_op_get_link(),
will report the last link state seen while the interface was up. In
general the current physical link state is not available if the
interface is down.
Define ETHTOOL_GLINK to reflect whether the interface *and* any
physical port have a working link, and consistently return 0 when the
interface is down.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c710245caa41060e983cc9cb5ffcc020e02ca45f
Author: Casey Leedom <leedom@xxxxxxxxxxx>
Date: Thu Dec 9 09:38:24 2010 +0000
cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes
Was using L1_CACHE_BYTES for the Ingress Queue Entry Size but it really
needs to be 64 bytes in order to support the largest message sizes.
Signed-off-by: Casey Leedom <leedom@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 377ecca9ba6d98f31517e2322075e94d1be94561
Author: Giuseppe CAVALLARO <peppe.cavallaro@xxxxxx>
Date: Wed Dec 8 23:05:13 2010 +0000
phy: add the IC+ IP1001 driver
This patch adds the IC+ IP1001 (Gigabit Ethernet Transceiver) driver.
I've had to add an additional delay (2ns) to adjust RX clock phase at
GMII/ RGMII interface (according to the PHY data-sheet). This helps to
have the RGMII working on some ST platforms.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d9ca676bcb26e1fdff9265a3e70f697cd381c889
Author: Dan Williams <dcbw@xxxxxxxxxx>
Date: Wed Dec 8 19:40:47 2010 +0000
atm: correct sysfs 'device' link creation and parent relationships
The ATM subsystem was incorrectly creating the 'device' link for ATM
nodes in sysfs. This led to incorrect device/parent relationships
exposed by sysfs and udev. Instead of rolling the 'device' link by hand
in the generic ATM code, pass each ATM driver's bus device down to the
sysfs code and let sysfs do this stuff correctly.
Signed-off-by: Dan Williams <dcbw@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fb890ae7d615f4b4f5689144b6832230ab2046aa
Author: Kyle McMartin <kyle@xxxxxxxxxxx>
Date: Thu Dec 9 09:50:08 2010 +0000
MAINTAINERS: remove me from tulip
It was a nice idea, but -ENOTIME and -ENOHW. I never got around to doing
a lot of the clean up that I intended to.
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Acked-by: Grant Grundler <grundler@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 29639059a0122d95b34b5475bd9fee3910b401a3
Author: Roopa Prabhu <roprabhu@xxxxxxxxx>
Date: Wed Dec 8 13:54:03 2010 +0000
enic: Use VF mac set by IFLA_VF_MAC in port profile provisioning data
This patch adds support in enic 802.1Qbh port profile provisioning code
to use the mac address set by IFLA_VF_MAC. For now we handle this mac as a
special case for a VM mac address sent to us by libvirt. The VM mac address
is sent to the switch along with the rest of the port profile provisioning
data. This patch also adds calls to register and deregister the mac address
during port profile association/deassociation.
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: David Wang <dwang2@xxxxxxxxx>
Signed-off-by: Christian Benvenuti <benve@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7
Author: Roopa Prabhu <roprabhu@xxxxxxxxx>
Date: Wed Dec 8 13:53:58 2010 +0000
enic: Add ndo_set_vf_mac support for enic dynamic devices
This patch implements the ndo_set_vf_mac netdev operation for enic
dynamic devices. It treats the mac address set by IFLA_VF_MAC as a
special case to use it in the port profile provisioning data.
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: David Wang <dwang2@xxxxxxxxx>
Signed-off-by: Christian Benvenuti <benve@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 319d7e847355ec7e03d3c865917b2b0e2e592fb8
Author: Roopa Prabhu <roprabhu@xxxxxxxxx>
Date: Wed Dec 8 13:19:58 2010 +0000
enic: Add ndo_set_rx_mode support for enic vnics
Add ndo_set_rx_mode support to register unicast and multicast
address filters for enic devices
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Signed-off-by: David Wang <dwang2@xxxxxxxxx>
Signed-off-by: Christian Benvenuti <benve@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a8d764b9832d3cc86019f71916665dd2d337d7c2
Author: Junchang Wang <junchangwang@xxxxxxxxx>
Date: Wed Dec 8 16:55:16 2010 +0000
pktgen: adding prefetchw() call
We know for sure pktgen is going to write skb->data right after
*_alloc_skb, causing unnecessary cache misses.
Idea is to add a prefetchw() call to prefetch the first cache line
indicated by skb->data. On systems with Adjacent Cache Line Prefetch,
it's probably two cache lines are prefetched.
With this patch, pktgen on Intel SR1625 server with two E5530
quad-core processors and a single ixgbe-based NIC went from 8.63Mpps
to 9.03Mpps, with 4.6% improvement.
Signed-off-by: Junchang Wang <junchangwang@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 40a010395cd66053f07bffeb3da5e44683bac30e
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:11:09 2010 +0000
SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
SCTP_SET_PEER_PRIMARY_ADDR does not accpet v4mapped address, using
v4mapped address in SCTP_SET_PEER_PRIMARY_ADDR socket option will
get -EADDRNOTAVAIL error if v4map is enabled. This patch try to
fix it by mapping v4mapped address to v4 address if allowed.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Acked-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4f05af136016958f52455da3070ca6622439b10
Author: Ondrej Puzman <puzman@xxxxxxxxx>
Date: Sat Dec 4 21:17:38 2010 +0100
8250: fix uninitialized FIFOs
I have found a bug in 8250.c driver which causes that 16550A uart FIFOs
are not turned on during initialization if they are manually configured
by setserial. UART is then working only as plain 16450 without FIFOs. On
systems with higher interrupt latency this causes buffer overruns and
loss of received data when using higher communication speeds.
I'm working for a company which produces industrial computers. These
devices typically contain high number (8 or more) of traditional 16550A
uarts - we use TL16C554A chips, but that is not much relevant. UARTs are
connected to the CPU by ISA bus (Celeron based devices) or LPC bus (Atom
based devices).
In the Linux the UARTs are using standard 8250.c driver and are
initialized using setserial command:
setserial /dev/ttyS4 uart 16550A port 0x3E0 irq 10 baud_base 115200
This executes the UART initialization through serial8250_startup()
function. At the beginning of the function up->capabilities is
initialized from uart_config:
up->capabilities = uart_config[up->port.type].flags;
Please note that neither up->port.fifosize nor up->tx_loadsz is
initialized here!!
Later in the same function serial8250_clear_fifos() is called and
disables FIFOs. The above comment says that they will be reenabled in
set_termios (they won't ...)
After serial8250_startup() the serial8250_set_termios() is called. In
this function the following check fails because up->port.fifosize is
zero because it is not initialized correctly.
if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
if (baud < 2400)
fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
else
fcr = uart_config[up->port.type].fcr;
}
fcr variable remains zero and in the end the FCR register is set to zero
which results in disabled FIFOs even if the UART type is 16550A. This is
also true for other types of UARTs with FIFOs.
If the UART is autoconfigured via 'setserial /dev/ttySx autoconfig' then
port.fifosize and tx_loadsz are initialized correctly in the
autoconfig() function and the UART is working correctly then.
I checked the source codes and I can say that this bug is present in
2.6.x series of kernels for a couple of years. Namely I can confirm its
presence in 2.6.16.57, 2.6.32.24 and 2.6.36.1 (tested all of them on our
hardware).
I think it was not noticed before because not many people use manually
configured non PNP UARTs on ISA/LPC bus these days. Also the data loss
caused by buffer overruns occures only if IRQ latency is higher then
time needed to receive one character on given communication speed.
For example our hardware looses received characters only if the UARTs
are connected throught LPC bus with SERIRQ (serial IRQ transport) and
not if they are connected to ISA bus because LPC SERIRQ has higher
interrupt latency then parallel ISA interupt lines.
Here is the patch to correct the bug created against 2.6.36.1:
Signed-off-by: Ondrej Puzman <puzman@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 53139e36cdd7bbc5efcbdc5e70fbff66e2da3c09
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Tue Dec 7 23:27:43 2010 +0900
ip2: fix compiler warning on ip2main_pci_tbl
Annotate ip2main_pci_tbl as '__used' to fix following warning:
CC drivers/char/ip2/ip2main.o
drivers/char/ip2/ip2main.c:3227: warning: â??ip2main_pci_tblâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: "Michael H. Warfield" <mhw@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fd0f5c54eeb66e3e89e3cdd34c5abf8d5fbcf61c
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Tue Dec 7 23:27:42 2010 +0900
specialix: fix compiler warning on specialix_pci_tbl
Annotate specialx_pci_tbl as '__used' to fix following warning:
CC drivers/char/specialix.o
drivers/char/specialix.c:2358: warning: â??specialx_pci_tblâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: Roger Wolff <R.E.Wolff@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6835a209f6c24b3704aa58d8b558a513a5a08c52
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Tue Dec 7 23:27:41 2010 +0900
rocket: fix compiler warning on rocket_pci_ids
Annotate rocket_pci_ids as '__used' to fix following warning:
CC drivers/char/rocket.o
drivers/char/rocket.c:1767: warning: â??rocket_pci_idsâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a3ae0fc34f58e7163b7724feb3d77aa4603f0dc3
Author: Jamie Iles <jamie@xxxxxxxxxxxxx>
Date: Wed Dec 1 23:39:36 2010 +0000
8250: add a UPIO_DWAPB32 for 32 bit accesses
Some platforms contain a Synopsys DesignWare APB UART that is attached
to a 32-bit APB bus where sub-word accesses are not allowed. Add a new
IO type (UPIO_DWAPB32) that performs 32 bit acccesses to the UART.
v2:
- don't test for 32 bit in the output fast path, provide a
separate dwabp32_serial_out() function. Refactor
dwabp_serial_out() so that we can reuse the LCR saving
code.
v3:
- rebased on top of "8250: use container_of() instead of
casting"
Signed-off-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 49d5741be27aa90301b89bf254972b355ed9c8ee
Author: Jamie Iles <jamie@xxxxxxxxxxxxx>
Date: Wed Dec 1 23:39:35 2010 +0000
8250: use container_of() instead of casting
The 8250 driver structure uart_8250_port took advantage of the fact
that the struct uart_port was the first member of its structure and
used an explicit cast to convert to the derived class. Replace the
explicit casts with container_of() for safety and clarity.
Signed-off-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1b41dbc1296269797efbb2b0837732b74de4731d
Author: Cosmin Cojocar <cosmin.cojocar@xxxxxxxxx>
Date: Sun Dec 5 16:15:10 2010 +0100
serial: omap-serial: Add support for kernel debugger
The kgdb invokes the poll_put_char and poll_get_char when communicating
with the host. This patch also changes the initialization order because the
kgdb will check at the very beginning, if there is a valid serial
driver.
Signed-off-by: Cosmin Cojocar <cosmin.cojocar@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5ac387d983149d4658aad17242d24eef85a43fa8
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Thu Dec 2 09:19:48 2010 -0800
serial: fix pch_uart kconfig & build
The dma_request_channel/dma_release_channel interfaces are not
built when DMADEVICES is not enabled, so make the driver depend on
DMADEVICES. Also, the help text says that the driver enables & uses
PCH_DMA, which is not enabled, so select that.
ERROR: "__dma_request_channel" [drivers/serial/pch_uart.ko] undefined!
ERROR: "dma_release_channel" [drivers/serial/pch_uart.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Reported-by: Zimny Lech <napohybelskurwysynom2010@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4afb7527ac8cc7bd8f03570e12f6eed0eca03363
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Dec 6 12:33:01 2010 +0000
sfc: convert references to LRO to GRO
This driver now uses Generic Receive Offload, not the older LRO.
Change references to LRO in names and comments.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Acked-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 79aeec5822cea63cf732bbc0c9f3337542352616
Author: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Date: Wed Dec 8 13:05:45 2010 +0000
enic: Bug Fix: Pass napi reference to the isr that services receive queue
Pass reference to napi instead of enic device to the isr that services receive queue.
Signed-off-by: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: David Wang <dwang2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 376d940ee91318cc6becefbb9454bb4454d7473f
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 9 04:37:48 2010 +0000
inet6: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e51d67ebb8e109a0990a13dafa937fb469aa3fb
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 9 04:50:22 2010 +0000
stmmac: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 040253c931e336360453c8d81f76d1b010b2b5e7
Author: Martin Willi <martin@xxxxxxxxxxxxxx>
Date: Wed Dec 8 04:37:51 2010 +0000
xfrm: Traffic Flow Confidentiality for IPv6 ESP
Add TFC padding to all packets smaller than the boundary configured
on the xfrm state. If the boundary is larger than the PMTU, limit
padding to the PMTU.
Signed-off-by: Martin Willi <martin@xxxxxxxxxxxxxx>
Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d979e20f2b9f8a50c8d5f889e0b5d78580440d1f
Author: Martin Willi <martin@xxxxxxxxxxxxxx>
Date: Wed Dec 8 04:37:50 2010 +0000
xfrm: Traffic Flow Confidentiality for IPv4 ESP
Add TFC padding to all packets smaller than the boundary configured
on the xfrm state. If the boundary is larger than the PMTU, limit
padding to the PMTU.
Signed-off-by: Martin Willi <martin@xxxxxxxxxxxxxx>
Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 35d2856b4693e8de5d616307b56cef296b839157
Author: Martin Willi <martin@xxxxxxxxxxxxxx>
Date: Wed Dec 8 04:37:49 2010 +0000
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
The XFRMA_TFCPAD attribute for XFRM state installation configures
Traffic Flow Confidentiality by padding ESP packets to a specified
length.
Signed-off-by: Martin Willi <martin@xxxxxxxxxxxxxx>
Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 957fca95e3521e471aac4c2e4cfbc21f399bdd84
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Sat Dec 4 15:01:52 2010 +0000
ifb: use the lockless variants of skb_queue
rq and tq are both protected by tx queue lock, so we can simply use
the lockless variants of skb_queue.
skb_queue_splice_tail_init() is used instead of the open coded and slow
one.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: Jamal Hadi Salim <hadi@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c6350362cbb19882ba0eb3578cc1abc07e6ea204
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Fri Dec 3 19:55:20 2010 +0000
ifb: remove unused macro TX_TIMEOUT
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: Jamal Hadi Salim <hadi@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e1f91505025db74c261962dc16d58f79b9b0c83c
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Fri Dec 3 19:55:19 2010 +0000
ifb: remove the useless debug stats
These debug stats are not exported, and become useless.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: Jamal Hadi Salim <hadi@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6c34d2888221ca3df81e29f598873b4fb6cf838d
Author: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Date: Wed Dec 8 13:12:06 2010 +0200
usb: gadget: g_ncm added
This patches makes possible to use composite framework and f_ncm
NCM function driver to build a standalone NCM gadget device.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9f6ce4240a2bf456402c15c06768059e5973f28c
Author: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Date: Wed Dec 8 13:12:05 2010 +0200
usb: gadget: f_ncm.c added
Initial submittion of NCM link function driver.
The driver's logic is based on f_ecm driver and does not
use most of the NCM advantages like frame grouping and alignment.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5c1168dbc508282f7717a4472477d52d64403060
Author: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Date: Wed Dec 8 13:12:04 2010 +0200
usb: gadget: u_ether: prepare for NCM
NCM is a Network Control Model, subclass of USB CDC class,
specification is available at http://www.usb.org/developers/devclass_docs
This patch makes possible for u_ether to use multiply of wMaxPacketSize
predefined size transfers without ZLP (Zero Length Packet), required
by NCM spec.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a6a5ff26975c87a97f88c6ea077c325ff20c4cf2
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 02:58:01 2010 +0000
qeth: buffer count imbalance
The used buffers counter is not incremented in case of an error so
the counter can become negative. Increment the used buffers counter
before checking for errors.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 91d4576bfe87980b1b86305c29912d96b96ce98e
Author: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Date: Wed Dec 8 02:58:00 2010 +0000
qeth: l3 add vlan hdr in passthru frames
OSA l3 mode is hw accelerated VLAN only for IPv4. Take care we
add the vlan hdr to a passthru frame in the device driver.
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f154b79cd7db221240ab6e8e4d844d3a3f10b04c
Author: Einar Lueck <elelueck@xxxxxxxxxx>
Date: Wed Dec 8 02:57:59 2010 +0000
qeth: support VIPA add/del in offline mode
Only work through the IP adddress to do list if the card is UP or
SOFTSETUP. Enables to configure VIPA add/del in offline mode.
Signed-off-by: Einar Lueck <elelueck@xxxxxxxxxx>
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd
Author: Einar Lueck <elelueck@xxxxxxxxxx>
Date: Wed Dec 8 02:57:58 2010 +0000
qeth: support ipv6 query arp cache for HiperSockets
Function qeth_l3_arp_query now queries for IPv6 addresses, too, if
QETH_QARP_WITH_IPV6 is passed as parameter to the ioctl. HiperSockets
and GuestLAN in HiperSockets mode provide corresponding entries.
Signed-off-by: Einar Lueck <elelueck@xxxxxxxxxx>
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ff176a4e2972bdc7a8d65cdcb0bd0d26ab1528cf
Author: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:28:33 2010 +0100
usb: pch_udc: Fix setup transfers with data out
This patch fixes an issue where the driver does not handle out data in
setup transactions.
The per endpoint cached status register is cleared in the
pch_udc_svc_control_out function. When there is out data available the
function pch_udc_svc_data_out is called which tries to pick it up the
status, which now is cleared to 0. When the status is 0, the function
doesn't start reading the data from the FIFO.
There is a second bug in all this, pch_udc_svc_data_out takes the
endpoint number (0 for EP0), while pch_udc_svc_control_out passes the
endpoint index (1 for EP0). Effectively pch_udc_svc_data_out picks up
the wrong internal ep structure.
This patch makes sure to put back the cached status and pass the
endpoint number rather than index when calling pch_udc_svc_data_out.
Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 49e208346616328e535b5d6ecd510ab38f210858
Author: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:28:30 2010 +0100
usb: pch_udc: Fix compile error, warnings and checkpatch warnings
Building pch_udc in linux-next fails, this patch fixes the a compile
error:
drivers/usb/gadget/pch_udc.c: In function â??usb_gadget_register_driverâ??:
drivers/usb/gadget/pch_udc.c:2645: error: â??struct usb_gadget_driverâ?? has no member named â??bindâ??
drivers/usb/gadget/pch_udc.c:2664: error: â??struct usb_gadget_driverâ?? has no member named â??bindâ??
And a couple of compiler warnings and checkpatch warnings.
Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 969152341e852ae7a5e1b11c33ef6244f3cb3579
Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
Date: Tue Dec 7 15:00:09 2010 +0100
usb: add ab8500 usb transceiver driver
Basic driver for ab8500 usb otg transceiver
TODO:
-Regulators support
-Host and OTG testing
-Interface with PRCMU
-Charging support
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2d0cdcc5a0e4e5e467fc4be4d00cc6c531c80b64
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:54:05 2010 +0530
USB: gadget: Implement runtime PM for MSM bus glue driver
OTG driver takes care of putting hardware in low power mode. Hence
not registered for any runtime PM callbacks.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c036019ed2b729cb9517806c2b388b4f4323a904
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:54:04 2010 +0530
USB: gadget: Implement runtime PM for ci13xxx gadget
The actual suspend/resume work is delegated to bus glue driver, which
is responsible for putting hardware in low power mode.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 33f82f387b9cb27bc903e1368fce88b73213910a
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:54:03 2010 +0530
USB: gadget: Add USB controller driver for MSM SoC
MSM SoC has chipidea USB controller. So use ci13xxx_udc core.
This driver depends on transceiver driver for clock control,
PHY initialization, VBUS detection. Register for notify_event
callback to perform MSM specific quirks after controller is reset
and stopped.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f01ef5748f4c4dcd2e49ccb7d75dc113219559d2
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:54:02 2010 +0530
USB: gadget: Introduce ci13xxx_udc_driver struct
Introduces ci13xxx_udc_driver struct for bus glue drivers to hint
ci13xxx_udc core about their special requirements. The flags include
avoiding hardware register access when controller is not in peripheral
mode, enabling pull-up upon VBUS, disabling streaming mode and dependency
on transceiver driver.
Initialize gadget_ops in udc_probe so that transceiver can notify VBUS
presence even when no gadget driver is bounded.
A notify_event callback is embedded in the same struct. This patch implements
two events called CONTROLLER_RESET_EVENT and CONTROLLER_STOPPED_EVENT to
notify the bus glue driver after resetting and stopping the controller for
performing SoC specific quirks.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 61948ee4d525174cceee2135a38a482124fcc02c
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:54:01 2010 +0530
USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask
dma_alloc_coherent() which is internally called by dma_pool_alloc()
flags a warning if device's coherent DMA mask. Hence initialize
gadget device's coherent DMA mask to it's parent mask.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0a91efa2f951d790969dec96fb675ca7869eca83
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:54:00 2010 +0530
USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc
dma_pool_alloc() require sleeping context when called with GFP_KERNEL
argument. Hence release the spin lock before calling dma_pool_alloc().
usb_ep_alloc_request can also be called with non-atomic GFP flags. Hence
get rid off spin lock while allocation request memory.
Use GFP_ATOMIC flag for allocating request for ep0 in interrupt handler.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 409a15da9851b6e6a5e1c5787be31a987184b7cf
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:53:59 2010 +0530
USB: gadget: Separate out PCI bus code from ci13xxx_udc
Move PCI bus code from ci13xxx_udc to a new file ci13xxx_pci. SoC's
which has MIPS USB core can include the ci13xxx_udc and keep bus glue
code in their respective gadget controller drivers.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 87c0104af742af2acfcbd685f2b9a40f33770dc0
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:53:58 2010 +0530
USB: OTG: msm: Add support for power management
Implement runtime and system pm ops to put hardware into low power
mode (LPM). As part of LPM, USB clocks are turned off, PHY is put
into suspend state and PHY comparators are turned off if VBUS/Id
notifications are not required from PHY.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8bb6a164b906bb7ca319202f85b30e3ef096cd65
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:53:57 2010 +0530
USB: EHCI: msm: Add support for power management
Enable runtime PM and mark no_callbacks flag. OTG device, parent of
HCD takes care of putting hardware into low power mode. Adjust port
power wakeup flags during system suspend and resume.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b0848aea10da186372582f33152efdda43944f26
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:53:56 2010 +0530
USB: EHCI: Add MSM Host Controller driver
This patch adds support for EHCI compliant HSUSB Host controller found
on MSM chips. The root hub has a single port and TT is built into it.
This driver depends on OTG driver for PHY initialization, clock
management and powering up VBUS.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e0c201f339fe7fc38d1b0f6f4755ff627686c7e0
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Dec 7 17:53:55 2010 +0530
USB: Add MSM OTG Controller driver
This driver implements PHY initialization, clock management, ULPI IO ops
and simple OTG state machine to kick host/peripheral based on Id/VBUS
line status. VBUS/Id lines are tied to a reference voltage on some boards.
Hence provide debugfs interface to select host/peripheral mode.
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 05570297ecbe834b1756b522412b68eaffb9ab11
Author: Alex He <alex.he@xxxxxxx>
Date: Tue Dec 7 10:10:08 2010 +0800
USB: EHCI: ASPM quirk of ISOC on AMD SB800
When ASPM PM Feature is enabled on UMI link, devices that use ISOC stream of
data transfer may be exposed to longer latency causing less than optimal per-
formance of the device. The longer latencies are normal and are due to link
wake time coming out of low power state which happens frequently to save
power when the link is not active.
The following code will make exception for certain features of ASPM to be by
passed and keep the logic normal state only when the ISOC device is connected
and active. This change will allow the device to run at optimal performance
yet minimize the impact on overall power savings.
Signed-off-by: Alex He <alex.he@xxxxxxx>
Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 66921edd7df109196bd1a41309c17896ea0913d7
Author: Peter Huewe <peterhuewe@xxxxxx>
Date: Thu Dec 9 23:27:35 2010 +0100
USB: serial: usb_wwan: Add missing uaccess.h / fix build failure
This patch fixes a build failure[1] by adding the missing uaccess.h needed
for copy_from_user and copy_to_user
References:
http://kisskb.ellerman.id.au/kisskb/buildresult/3607218/
Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 352a337832774a6929c16b569abe9cedc3db01cc
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Dec 9 22:46:29 2010 +0100
USB: otg: fix link breakage, when the NOP USB Xceiver is a module
If the NOP USB OTG transceiver driver is built as a module, the otg.h
header declares external functions, but if they are referenced from the
kernel proper, as, e.g., in the OMAP3 case, where the omap3evm board is
calling the usb_nop_xceiv_register() function, linkage breaks. This patch
fixes this problem.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 9 15:52:39 2010 +0100
usb: gadget: f_fs: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 16325f18eaa6066c4b913a5661fc8190ce564f7c
Author: Tobias Ollmann <tobias.ollmann@xxxxxx>
Date: Thu Dec 9 14:24:27 2010 +0100
USB: host: uhci-q: Fixed minor coding style issues
Fixed coding style issues (delete trailing whitespaces, break
long line)
Signed-off-by: Tobias Ollmann <tobias.ollmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 34404082bbdc5d981fa8eb2f9f5dfaae74463877
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Dec 6 17:38:24 2010 +0100
usb: gadget/imx-udc: fix interrupt name again
Commit 06c3859 (usb: gadget/imx-udc: remove usage of deprecated symbol
USBD_INT0) was a bit precipitant because the name used instead didn't
match the usual naming scheme for irqs on arm/imx. I renamed the irq to
the right name in e083000 (ARM: imx: dynamically allocate imx_udc
device) when 06c3859 didn't hit Linus' tree, so I missed to add a
compat #define.
This patch allows compiling imx_udc.c with and without e083000.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8170344cb8aaa726bf1afae83288946b7cfcb556
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Tue Dec 7 01:03:32 2010 +0900
USB: whci-hcd: fix compiler warning
Annotate whci_hcd_id_table as '__used' to fix following warning:
CC drivers/usb/host/whci/hcd.o
drivers/usb/host/whci/hcd.c:359: warning: â??whci_hcd_id_tableâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c07224005dd3fe746246acadc9be652a588a4d7f
Author: Jiri Pirko <jpirko@xxxxxxxxxx>
Date: Thu Dec 9 03:40:30 2010 +0000
net/ipv6/udp.c: fix typo in flush_stack()
skb1 should be passed as parameter to sk_rcvqueues_full() here.
Signed-off-by: Jiri Pirko <jpirko@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3dd1462e82bcab7625cec129952f26dae7a8b742
Author: Jan Beulich <jbeulich@xxxxxxxxxx>
Date: Tue Dec 7 14:54:09 2010 +0000
Btrfs: fix compiler warnings
... regarding an unused function when !MIGRATION, and regarding a
printk() format string vs argument mismatch.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit fdfb1e4f6c61477a61890b64974d65cdc3a98702
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
Date: Fri Dec 10 06:41:56 2010 +0000
Btrfs: Make async snapshot ioctl more generic
If we had reserved some bytes in struct btrfs_ioctl_vol_args, we
wouldn't have to create a new structure for async snapshot creation.
Here we convert async snapshot ioctl to use a more generic ABI, as
we'll add more ioctls for snapshots/subvolumes in the future, readonly
snapshots for example.
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit 914ee295af418e936ec20a08c1663eaabe4cd07a
Author: Xin Zhong <xin.zhong@xxxxxxxxx>
Date: Thu Dec 9 09:30:14 2010 +0000
Btrfs: pwrite blocked when writing from the mmaped buffer of the same page
This problem is found in meego testing:
http://bugs.meego.com/show_bug.cgi?id=6672
A file in btrfs is mmaped and the mmaped buffer is passed to pwrite to write to the same page
of the same file. In btrfs_file_aio_write(), the pages is locked by prepare_pages(). So when
btrfs_copy_from_user() is called, page fault happens and the same page needs to be locked again
in filemap_fault(). The fix is to move iov_iter_fault_in_readable() before prepage_pages() to make page
fault happen before pages are locked. And also disable page fault in critical region in
btrfs_copy_from_user().
Reviewed-by: Yan, Zheng<zheng.z.yan@xxxxxxxxx>
Signed-off-by: Zhong, Xin <xin.zhong@xxxxxxxxx>
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit f106e82caaa0d943e47cacc184f5b40d538e0044
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
Date: Tue Dec 7 01:51:26 2010 +0000
Btrfs: Fix a crash when mounting a subvolume
We should drop dentry before deactivating the superblock, otherwise
we can hit this bug:
BUG: Dentry f349a690{i=100,n=/} still in use (1) [unmount of btrfs loop1]
...
Steps to reproduce the bug:
# mount /dev/loop1 /mnt
# mkdir save
# btrfs subvolume snapshot /mnt save/snap1
# umount /mnt
# mount -o subvol=save/snap1 /dev/loop1 /mnt
(crash)
Reported-by: Michael Niederle <mniederle@xxxxxx>
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit 75eaa0e22c055e38982df267d0f84cc510ba38bf
Author: Sage Weil <sage@xxxxxxxxxxxx>
Date: Fri Dec 10 00:36:28 2010 +0000
Btrfs: fix sync subvol/snapshot creation
We were incorrectly taking the async path even for the sync ioctls by
passing in &transid unconditionally.
There's ample room for further cleanup here, but this keeps the fix simple.
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
Reviewed-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit 24ae63656a165c870c0d69fcc8aac1dc35e25e34
Author: Yan, Zheng <zheng.z.yan@xxxxxxxxxxxxxxx>
Date: Mon Dec 6 07:02:36 2010 +0000
Btrfs: Fix page leak in compressed writeback path
"start + num_bytes >= actual_end" can happen when compressed page writeback races
with file truncation. In that case we need unlock and release pages past the end
of file.
Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
Signed-off-by: Chris Mason <chris.mason@xxxxxxxxxx>
commit 84cd948cb11041f205242de457e680b9bb872a36
Author: Josef Bacik <josef@xxxxxxxxxx>
Date: Wed Dec 8 12:24:01 2010 -0500
Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots
Not being able to delete an orphan item isn't a horrible thing. The worst that
happens is the next time around we try and do the orphan cleanup and we can't
find the referenced object and just delete the item and move on.
Signed-off-by: Josef Bacik <josef@xxxxxxxxxx>
commit 457de4383ec6144df7d5a82cdfb110c825305a51
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 13:16:09 2010 -0800
ipv6: Fix 'release_it' logic in tcp_v6_get_peer()
We accidently set it to "true" for the case where we
are using a route bound peer.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5363cdc3c5da9bd431552cf5989ab481596f0c6d
Author: Florian Faber <faberman@xxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 10:11:08 2010 +0100
USB: ftdi_sio: Add D.O.Tec PID
Add FTDI PID to identify D.O.Tec devices correctly.
Signed-off-by: Florian Faber <faberman@xxxxxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4c0833bcd4d302fe783b9f8286a00ca2999d6200
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Fri Dec 10 03:18:04 2010 +0000
bridge: Fix return values of br_multicast_add_group/br_multicast_new_group
If br_multicast_new_group returns NULL, we would return 0 (no error) to
the caller of br_multicast_add_group, which is not what we want. Instead
br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.
Also propagate the error number returned by br_mdb_rehash properly.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e91db5cd6f2203ef2a93ce8770f2728e9107c4f7
Merge: 5f75a1042feca37c0a436ba42a4b1f7f75c35778 0a54917c3fc295cb61f3fb52373c173fd3b69f48
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 12:51:02 2010 -0800
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 5f75a1042feca37c0a436ba42a4b1f7f75c35778
Author: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Date: Tue Dec 7 23:38:31 2010 +0000
ipv6: fix nl group when advertising a new link
New idev are advertised with NL group RTNLGRP_IPV6_IFADDR, but
should use RTNLGRP_IPV6_IFINFO.
Bug was introduced by commit 8d7a76c9.
Signed-off-by: Wang Xuefu <xuefu.wang@xxxxxxxxx>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Acked-by: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3700c3c2934467d53d443682f020cc5c1f75f1f2
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Fri Dec 10 12:27:49 2010 -0800
connector: add module alias
Since connector can be built as a module and uses netlink socket
to communicate. The module should have an alias to autoload when socket
of NETLINK_CONNECTOR type is requested.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Acked-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 998adc3dda59f811966b3ccb21eb223680b25ec4
Author: John Stultz <john.stultz@xxxxxxxxxx>
Date: Mon Sep 20 19:19:17 2010 -0700
hrtimers: Convert hrtimers to use timerlist infrastructure
Converts the hrtimer code to use the new timerlist infrastructure
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
LKML Reference: <1290136329-18291-3-git-send-email-john.stultz@xxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Richard Cochran <richardcochran@xxxxxxxxx>
commit 9bb99b147018945366c763b3d4d7008927dc8557
Author: John Stultz <john.stultz@xxxxxxxxxx>
Date: Mon Dec 6 13:32:12 2010 -0800
timers: Fixup allmodconfig build issue
Adds missed EXPORT_SYMBOL lines that cause the following build
failures with allmodconfig:
ERROR: "timerqueue_add" [drivers/rtc/rtc-core.ko] undefined!
ERROR: "timerqueue_getnext" [drivers/rtc/rtc-core.ko] undefined!
ERROR: "timerqueue_del" [drivers/rtc/rtc-core.ko] undefined!
Reported-by: Ingo Molnar <mingo@xxxxxxx>
Reported-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
commit c04bfc6b223662c42a77727342c1df7d39e686a2
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 10 01:24:16 2010 +0000
sfc: Remove ancient support for nesting of TX stop
Long before this driver went into mainline, it had support for
multiple TX queues per port, with lockless TX enabled. Since Linux
did not know anything of this, filling up any hardware TX queue would
stop the core TX queue and multiple hardware TX queues could fill up
before the scheduler reacted. Thus it was necessary to keep a count
of how many TX queues were stopped and to wake the core TX queue only
when all had free space again.
The driver also previously (ab)used the per-hardware-queue stopped
flag as a counter to deal with various things that can inhibit TX, but
it no longer does that.
Remove the per-channel tx_stop_count, tx_stop_lock and
per-hardware-queue stopped count and just use the networking core
queue state directly.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 6ecfd0c70c05531b2850649d0cec46833cd6c381
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 10 01:19:53 2010 +0000
sfc: Remove unused field and comment on a previously removed field
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 1f5a24794a54588ea3a9efd521be31d826e0b9d7
Author: John Stultz <john.stultz@xxxxxxxxxx>
Date: Thu Dec 9 12:02:18 2010 -0800
timers: Rename timerlist infrastructure to timerqueue
Thomas pointed out a namespace collision between the new timerlist
infrastructure I introduced and the existing timer_list.c
So to avoid confusion, I've renamed the timerlist infrastructure
to timerqueue.
Reported-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
commit 79b357c2171ab3e52148503f0efa66d64a13413e
Merge: b2d6fef51223a1913c0d3230df4252ab49990bc1 5de62b86d2f5cf3459cb02ecb7a4530787bbd898
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 10 11:37:47 2010 -0800
Merge branch 'devel-gpio' into omap-for-linus
commit eaa7dcde1d092c792cbca4be81d2e506e84c6122
Merge: cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4 b7ec19af63b467e30189984fb24e6157603608e3
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 11:22:57 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit c1249c0aae4c93a753c70496ab2e9a51430a6f02
Author: Martin Lucina <mato@xxxxxxxxxx>
Date: Fri Dec 10 00:04:05 2010 +0000
net: Document the kernel_recvmsg() function
Signed-off-by: Martin Lucina <mato@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4fbce740f078bbc925ba5c86648d9c883968479
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Wed Dec 8 15:32:14 2010 +0000
r8169: Fix runtime power management
I noticed that one of the post-2.6.36 patches broke runtime PM of the
r8169 on my MSI Wind test machine in such a way that the link was not
brought up after reconnecting the network cable.
In the process of debugging the issue I realized that we only should
invoke the runtime PM functions in rtl8169_check_link_status() when
link change is reported and if we do so, the problem goes away.
Moreover, this allows rtl8169_runtime_idle() to be simplified quite
a bit.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 983bbfd091be5b3e1a729f31cce29431fbff2d27
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Fri Dec 10 10:56:18 2010 -0800
Staging: iio: fix up world writable sysfs files.
You should not be able to write to sysfs files from any user.
Cc: Graf Yang <graf.yang@xxxxxxxxxx>
Cc: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Cc: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 64d74c6cbe52fbec90ead8f3bf53bfb10a1540d5
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Fri Dec 10 10:55:27 2010 -0800
Staging: ft1000: fix world writable debugfs file
You should not be able to write to a debugfs file from any user.
Cc: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b8b739941eb57ec4c5fc87a73e7e7b554cf395fb
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Fri Dec 10 10:46:30 2010 -0800
Staging: cxt1e1: rename global log_level variable
The driver should not have such a generic global variable name.
Reported-by: Zimny Lech <napohybelskurwysynom2010@xxxxxxxxx>
Cc: Bob Beers <bob.beers@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit bc657f6e9130108651915fe37624e47638c46e0f
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Fri Dec 10 07:37:48 2010 -0800
staging: sep: fix comments in sep_get_static_pool_addr_handler
Original comments were inaccurate
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e91eb2ff1f713837caebbb86a06974cd4b3e8e46
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Dec 10 15:41:18 2010 +0300
Staging: rtl8192u: add missing curly braces
The if condition was ignored in the original code and we just used the
default channel.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4
Merge: 1e13f863ca88014d9550876c05c939fdab1017d1 c39d35ebffeea5996a6f8fd8430fae9acfb8aeaf
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 10:20:43 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
commit 5b362ac3799ff4225c40935500f520cad4d7ed66
Author: Chuck Lever <chuck.lever@xxxxxxxxxx>
Date: Fri Dec 10 12:31:14 2010 -0500
NFS: Fix panic after nfs_umount()
After a few unsuccessful NFS mount attempts in which the client and
server cannot agree on an authentication flavor both support, the
client panics. nfs_umount() is invoked in the kernel in this case.
Turns out nfs_umount()'s UMNT RPC invocation causes the RPC client to
write off the end of the rpc_clnt's iostat array. This is because the
mount client's nrprocs field is initialized with the count of defined
procedures (two: MNT and UMNT), rather than the size of the client's
proc array (four).
The fix is to use the same initialization technique used by most other
upper layer clients in the kernel.
Introduced by commit 0b524123, which failed to update nrprocs when
support was added for UMNT in the kernel.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=24302
BugLink: http://bugs.launchpad.net/bugs/683938
Reported-by: Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
Tested-by: Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx # >= 2.6.32
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 1e13f863ca88014d9550876c05c939fdab1017d1
Merge: f404c2fea37e02bec7c8b6edddf5edd22ca60505 f435d9eea01309aa7b6c1f134569a7b5957918ae
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 10 09:50:47 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
commit b2d6fef51223a1913c0d3230df4252ab49990bc1
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 10 09:46:25 2010 -0800
omap1: Delete old defconfigs
Please use omap1_defconfig instead, or search online
for a more optimized defconfig for your omap1 board.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 6cfce27c14aad746fe6f1b0bbeefab52b8b6217f
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 10 09:46:24 2010 -0800
omap1: Add omap1_defconfig
The omap1_defconfig this should be eventually usable for booting
all omap1 machines. Generated based on:
$ grep ARCH_OMAP1=y arch/arm/configs/* | cut -d: -f1 | xargs cat | \
sort | uniq >> arch/arm/configs/omap1_defconfig
Then change few things manually, like use Nokia 770 CONFIG_CMDLINE
as it does not allow setting it in the bootloader.
Finally ran make savedefconfig on it.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 10 09:46:24 2010 -0800
omap1: Add initcall checks for omap1 and booted board
Otherwise multi-omap1 configurations will fail.
Tested-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit df1e9d1c218ba696e376cad371b57c0109fe98c9
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 10 09:46:24 2010 -0800
omap: Split omap_read/write functions for omap1 and omap2+
Otherwise multi-omap1 support for omap1 won't work as the cpu_class_is_omap1()
won't work until the SoC is detected.
Note that eventually these will go away, please use ioremap + read/write instead.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 67b738ef32df7ec429004866d2a739a3775894d2
Merge: c451278c2864e253a4bb303b596a29edc3bb527c 5d190c40100793a6dfc37bf325677c10f3c80edf
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Fri Dec 10 09:44:39 2010 -0800
Merge branch 'devel-omap-irq' into omap-for-linus
commit 5d190c40100793a6dfc37bf325677c10f3c80edf
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Thu Dec 9 15:49:23 2010 -0800
omap2+: Initialize omap_irq_base for entry-macro.S from platform code
This way we can use the generic omap SoC detection code instead.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 22ca466847ad477d060baed84733c495bc6e81c8
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 19 07:25:30 2010 -0800
davinci: kconfig: select at24 eeprom for selected boards
Ensure that the at24 eeprom driver is selected for certain boards that
need boot data (e.g. MAC address) from EEPROM.
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 3506f27731439bf6ff3bfa86f04e0104f7edad68
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Fri Nov 19 16:43:04 2010 -0500
da850-evm, trivial: use da850_evm prefix for consistency
There was a single case of 'da850evm' prefix in the board-da850-evm.c file
where the reset of the prefixes were 'da850_evm'; change it to 'da850_evm' for
consistency.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Acked-by: Sekhar Nori <nsekhar@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit d5539ca0a5c9abd5cbf9ddcbbc1c2a507b5fd63c
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Fri Nov 19 09:17:35 2010 -0500
da850-evm: allow pca953x module build
Change the mach-davinci Kconfig file so that GPIO_PCA953X is default when
MACH_DAVINCI_DA850_EVM is set instead of always selecting. This allows users
to compile pca953x as a module.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
CC: Sergei Shtylyov <sshtylyov@xxxxxxxxxx>
CC: Nori, Sekhar <nsekhar@xxxxxx>
Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 47e7cb148a12f6f825302a85cd2b78a0948be741
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date: Mon Nov 15 09:42:52 2010 -0500
davinci: da850-evm: UI expander gpio_set_value can sleep, use _cansleep
When the RMII PHY on the UI board is enabled with CONFIG_DA850_UI_RMII
then then following will be printed to the console when warnings are
also enabled:
WARNING: at drivers/gpio/gpiolib.c:1567 __gpio_set_value+0x4c/0x5c()
Modules linked in:
[<c002c6ac>] (unwind_backtrace+0x0/0xf8) from [<c003b48c>] (warn_slowpath_common+0x4c/0x64)
[<c003b48c>] (warn_slowpath_common+0x4c/0x64) from [<c003b4c0>] (warn_slowpath_null+0x1c/0x24)
[<c003b4c0>] (warn_slowpath_null+0x1c/0x24) from [<c01aed60>] (__gpio_set_value+0x4c/0x5c)
[<c01aed60>] (__gpio_set_value+0x4c/0x5c) from [<c0033bd4>] (da850_evm_ui_expander_setup+0x1e4/0x2
44)
[<c0033bd4>] (da850_evm_ui_expander_setup+0x1e4/0x244) from [<c02e2e1c>] (pca953x_probe+0x1f8/0x29
0)
<snip>
Traced the WARN_ON to the gpio_set_value(rmii_sel,0) call in
da850_evm_setup_emac_rmii. Replacing the call with the _cansleep variant
results in no more warning. Also replacing the gpio_set_value calls in the
teardown function.
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 12cdd3d71954c2cd6dd556eec25dd7d346735831
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Mon Nov 15 19:40:28 2010 +0100
davinci: aemif: signedness bug in davinci_aemif_setup_timing()
aemif_calc_rate() can return a negative error value, so all the
variables that get tested for this value need to be signed.
The maximum bit width of WSETUP(WSETUP_MAX) appears to be 30 bits
(0xf << 26). Using a signed instead of an unsigned integer
shouldn't make a difference here.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Acked-by: Sekhar Nori <nsekhar@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 1a07bfb5215e11227403f121097ed72187dc3241
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Mon Oct 25 14:41:18 2010 +0200
davinci: psc: simplify if-statement
A common do-while loop can be factored out from the end of
the branches.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit ced98628bf6ca7705b2d06df9c71a80cd1cd49bb
Author: Cyril Chemparathy <cyril@xxxxxx>
Date: Wed Oct 20 17:49:57 2010 -0400
davinci: minor tnetv107x clock tree fixes
This patch applies the following modifications to the tnetv107x clock tree:
- reparent tnetv107x usb clocks to usbss
- mark timer1 as always enabled
- enable set_rate on pll divider output clocks
- adjust tnetv107x tsc sysclk rate lower to fix invalid reset defaults
Signed-off-by: Cyril Chemparathy <cyril@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit b1d05be61f5d29118c2934e684628a5034186825
Author: Cyril Chemparathy <cyril@xxxxxx>
Date: Wed Oct 20 17:49:56 2010 -0400
davinci: use divide ratio limits from pll_data
This patch modifies the sysclk rate setting code to use the divider mask
specified in pll_data. Without this, devices with different divider ranges
(e.g. tnetv107x) fail.
Signed-off-by: Cyril Chemparathy <cyril@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 6d1c57c84cc474a0fa63aadaa260b13dc5c7d68b
Author: Andreas Gaeer <Andreas.Gaer@xxxxxxxxxxxxx>
Date: Wed Oct 6 10:38:55 2010 +0200
davinci: Implement sched_clock()
Overwrite the default implementation of sched_clock that is based on
jiffies by something more precise. This improves timestamps in ftrace.
Implementation is copied from OMAP platform code.
Signed-off-by: Andreas Gaeer <Andreas.Gaer@xxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 2ade0c1d9d93b7642212657ef76f4a1e30233711
Merge: 504499f22c08a03e2e19dc88d31aa0ecd2ac815e 6313e3c21743cc88bb5bd8aa72948ee1e83937b6
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Fri Dec 10 15:19:18 2010 +0100
Merge branch 'master' into upstream
commit 504499f22c08a03e2e19dc88d31aa0ecd2ac815e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 9 19:29:08 2010 -0800
HID: simplify an index check in hid_lookup_collection
Save the struct hid_collection * in a temporary to shorten
the generated code a bit and perhaps improve readability.
$ size drivers/hid/hid-core.o*
text data bss dec hex filename
16460 78 8 16546 40a2 drivers/hid/hid-core.o.new
16469 78 8 16555 40ab drivers/hid/hid-core.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit a3789a1783d37f2772ba5046b26416c98dfe1bfa
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 9 19:29:07 2010 -0800
HID: Hoist assigns from ifs
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 16ee4cc82b5dbb81a5dbfedcdb268b9467fe4605
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 9 19:29:05 2010 -0800
HID: Remove superfluous __inline__
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit fe2580204d8bbcd18540736a283ed0b784c6a024
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 9 19:29:04 2010 -0800
HID: Use vzalloc for vmalloc/memset(,0...)
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 4291ee305e9bb0699504a66f0e2b7aefcf0512a5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 9 19:29:03 2010 -0800
HID: Add and use hid_<level>: dev_<level> equivalents
Neaten current uses of dev_<level> by adding and using
hid specific hid_<level> macros.
Convert existing uses of dev_<level> uses to hid_<level>.
Convert hid-pidff printk uses to hid_<level>.
Remove err_hid and use hid_err instead.
Add missing newlines to logging messages where necessary.
Coalesce format strings.
Add and use pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Other miscellaneous changes:
Add const struct hid_device * argument to hid-core functions
extract() and implement() so hid_<level> can be used by them.
Fix bad indentation in hid-core hid_input_field function
that calls extract() function above.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 09e7200221a04ab899e15a0a3cf4b230afd1ab86
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 18:11:42 2010 +0530
arm: OMAP4430: musb: Configure musb to OTG mode
Enabling the musb OTG mode for SDP and PANDA boards.
Signed-off-by: Hema HK <hemahk@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 594632efbb9a4ac323cbf8dbf37c608d418ca8c1
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 18:10:51 2010 +0530
usb: musb: Adding musb support for OMAP4430
OMAP4430 supports UTMI and ULPI types of transceiver interface.
In UTMI mode: The PHY is embedded within OMAP4430. The transceiver functionality
is split between the twl6030 PMIC chip and OMAP4430. The VBUS, ID pin
sensing and OTG SRP generation part is integrated in TWL6030 and UTMI PHY
functionality is embedded within the OMAP4430.
There is no direct interactions between the MUSB controller and TWL6030
chip to communicate the session-valid, session-end and ID-GND events.
It has to be done through a software by setting/resetting bits in
one of the control module register of OMAP4430 which in turn toggles
the appropriate signals to MUSB controller.
musb driver is register for blocking notifications from the transceiver
driver to get the event notifications for connect/disconnect and ID-GND.
Based on these events call the transceiver init/shutdown function to
configure the transceiver to toggle the VBUS valid, session end and ID_GND
signals to musb and power on/off the internal PHY.
For ID_GND event notifications, toggle the ID_GND signal and then wait for
musb to be configured as "A" device, and then call the transceiver function
to set the VBUS.
In OTG mode and musb as a host, When the Micro A connector used, VBUS is turned on
and session bit set. When the device is connected, enumeration goes through.
When the device disconnected from the other end of the connector(ID is still grounded),
link will detect the disconnect and end the session. When the device is connected back,
there are no events generated in the TWL6030-usb, and link is already down.
So the device is not detected. Removed the session bit disable code which
will recognize the connect of the device.
Limitation: In OTG host mode, if device is connected during boot, it does not get
detected. If disconnect and connect it back or connect after boot only it works.
Fix for this, I will submit seperate patch later.
Signed-off-by: Hema HK <hemahk@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 221946d04aa9bd3cffd93e4876bcb2e616941df9
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 18:10:37 2010 +0530
usb: otg: TWL6030: Add twl6030_usb file for compilation
Add the twl6030_usb transceiver file for compilation.
Signed-off-by: Hema HK <hemahk@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit e70357e35c522776d9f56f6800af4ed7a5bdbaaf
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 18:09:52 2010 +0530
mfd: TWL6030: OMAP4: Registering the TWL6030-usb device
Registering the twl6030-usb transceiver device as a child to twl6030 core.
Removed the NOP transceiver init call from board file.
Populated twl4030_usb_data platform data structure with the function
pointers for OMAP4430 internal PHY operation to be used by twl630-usb driver.
Signed-off-by: Hema HK <hemahk@xxxxxx>
Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 0aa002fe602939370e9476e5ec32b562000a0425
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Thu Dec 9 11:47:21 2010 +0100
x86: apic: Cleanup and simplify setup_local_APIC()
setup_local_APIC() is used to setup local APIC early during CPU
initialization and already assumes that preemption is disabled on
entry. However, The function unnecessarily disables and enables
preemption and uses smp_processor_id() multiple times in and out of
the nested preemption disabled section. This gives the wrong
impression that the function might be able to handle being called with
preemption enabled and/or migrated to another processor in the middle.
Make it clear that the function is always called with preemption
disabled, drop the confusing preemption disable block and call
smp_processor_id() once at the beginning of the function.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: brgerst@xxxxxxxxx
LKML-Reference: <4D00B3B9.7060702@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 4c42fbc99fc8656efc7d2b5e92be0d430ccefdc6
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 18:09:35 2010 +0530
usb: musb: TWL6030: Selecting TWL6030_USB transceiver
Selecting the twl6030-usb for OMAP4430SDP and OMAP4PANDA boards and
adding OMAP4 internal phy code for compilation
Signed-off-by: Hema HK <hemahk@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 6b296123cc1d958fe5045114f7ae0c1e19cbb29a
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 18:08:48 2010 +0530
usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver.
Added the TWL6030-usb transceiver option in the Kconfig
Signed-off-by: Hema HK <hemahk@xxxxxx>
Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit c33fad0c37481c4ba5c8b98cb62de3f4d95a44da
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 17:58:20 2010 +0530
usb: otg: Adding twl6030-usb transceiver driver for OMAP4430
Adding the twl6030-usb transceiver support for OMAP4 musb driver.
OMAP4 supports 2 types of transceiver interface.
1. UTMI: The PHY is embedded within OMAP4. The transceiver functionality
is split between the twl6030 PMIC chip and OMAP4430. The VBUS, ID pin
sensing and OTG SRP generation part is integrated in TWL6030 and UTMI PHY
functionality is embedded within the OMAP4430.
There is no direct interactions between the MUSB controller and TWL6030
chip to communicate the session-valid, session-end and ID-GND events.
It has to be done through a software by setting/resetting bits in
one of the control module register of OMAP4430 which in turn toggles
the appropriate signals to MUSB controller.
The internal transceiver has functional clocks and
powerdown bits to powerdown the PHY for power saving.
Since there is no option available for having 2 transceiver drivers
for one USB controller, internal PHY specific APIs are passed through
plaform_data function pointers to use in the twl6030-usb transceiver
driver.
2. ULPI interface is provided for off-chip transceivers.
Signed-off-by: Hema HK <hemahk@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 77b1d3fa88dcb9d6e885926f972c421e4069b849
Author: Hema HK <hemahk@xxxxxx>
Date: Fri Dec 10 17:55:37 2010 +0530
mfd: TWL6030: USBOTG VBUS event generation on
With TWL6030-usb, VBUS SESS_VLD and SESS_END events are not generated
as expected. When these interrupts are enabled, charger VBUS detection
interrupt does not get generated. So USBOTG has to be dependent on charger
VBUS interrupts.
So added one bit for USBOTG and changed the handler to call the
USBOTG handler whenever there is a charger VBUS interrpt.
VBUS SESS_VLD and SESS_END event generation issue is under debug with
HW team. This fix might not be required once after fixing the issue.
Signed-off-by: Balaji TK <balajitk@xxxxxx>
Signed-off-by: Hema HK <hemahk@xxxxxx>
Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit b7ec19af63b467e30189984fb24e6157603608e3
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Fri Dec 10 12:49:23 2010 +0100
dccp: remove unused macros
Remove macros which have been unused since the initial implementation
(commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c, [DCCP]: Initial
implementation from Tue Aug 9 20:14:34 2005 -0700).
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Acked-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 4bc36fd31b07054bdf7378cca7162c10598f3eff
Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
Date: Thu Dec 9 13:05:01 2010 +0100
usb: musb: add support for ux500 platform
Initial support for u8500 and u5500 platform.
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit a9c037832e9624e240c5019d0e01e9352e8f638d
Author: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
Date: Tue Dec 7 18:57:45 2010 +0530
musb: am35x: fix compile error due to control apis
commit 4814ced5116e3b73dc4f63eec84999739fc8ed11 (OMAP:
control: move plat-omap/control.h to mach-omap2/control.h)
moved <plat/control.h> to another location, preventing
drivers from accessing it, so we need to pass function
pointers from arch code to be able to talk to internal
PHY on AM35x.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 46960847ef3e3a5d395121635fffa5dfa279fe90
Author: Felipe Balbi <balbi@xxxxxx>
Date: Tue Dec 7 09:57:59 2010 +0200
arm: omap4: enable usb on 4430sdp
Let musb work on 4430sdp as well. We can now
test any problems with multi-omap builds.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 92b48df24eec49ed1eb0ec9c5f6165d8282153ea
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 14:30:06 2010 +0200
usb: musb: drop board_set_vbus
that's not used anymore. So let's drop it.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 784173723e2fd23332af948a90612950964cd140
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 13:17:53 2010 +0200
usb: musb: drop musb_platform_suspend/resume
all glue layers are now fully moved to the
new setup. We are now using dev_pm_ops to
implement suspend/resume functionality and
thus, musb_platform_suspend/resume has become
deprecated and useless.
This patch drops those function pointers and
its uses.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit fcd22e3b1f12e026dfefca20c97ff550a0e11b2b
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 13:13:09 2010 +0200
usb: musb: blackfin: usb dev_pm_ops structure
instead of using musb_platform_suspend_resume,
we can use dev_pm_ops and let platform_device
core handle when to call musb_core's suspend and
glue layer's suspend.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 6f783e287c074afe1e9cf3f32ded9948e184b45e
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 12:53:22 2010 +0200
usb: musb: am35x: usb dev_pm_ops structure
instead of using musb_platform_suspend_resume,
we can use dev_pm_ops and let platform_device
core handle when to call musb_core's suspend and
glue layer's suspend.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit c20aebb92796cf54ae8171ad7f53a8fa7c61d2d8
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 12:44:40 2010 +0200
usb: musb: omap2430: use dev_pm_ops structure
instead of using musb_platform_suspend/resume,
we can use dev_pm_ops and let the platform_device
core handle when to call musb_core's suspend and
glue layer's suspend.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit e6326358a43a9ac23f6df69ed1f4707c0d1ac473
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 12:35:59 2010 +0200
usb: musb: omap2430: drop the nops
we don't need those nops, so drop them.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 3c8a5fcc051c05cfdd8e3f0d37ba3c183d509cb9
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 12:28:39 2010 +0200
usb: musb: mark musb_save/restore_context static
those aren't used outside musb_core.c, so mark
them as static.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 496351413a227a6c0ea1a704d3d4c775d413fd08
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 12:27:35 2010 +0200
usb: musb: drop musb_platform_save/restore_context
... that can be easily folded into the
musb_platform_suspend/resume calls.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit fa56df915d101770a495569473b4c13b1904087b
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 10:55:29 2010 +0200
usb: musb: drop the set_clock magic
now that platform glue layer handles
clock completely, that function is completely
useless for us. Drop it.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 0349176120aa3024e96ae4fd7dc0e0181dc55f52
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:57:08 2010 +0200
usb: musb: move clock handling to glue layer
musb core doesn't need to know about platform
specific details. So start moving clock
handling to platform glue layer and make
musb core agnostic about that.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 3b7029670d39d22f288ece95254e9ba5ceddd6ba
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:51:00 2010 +0200
usb: musb: mark ->set_clock deprecated
... we will completely drop that need by
moving clock handling to platform glue
layer. Marking as deprecated will allow
us to catch all users easily.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit f7ec94370f417fedad4db1054228ef958d48b926
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:48:58 2010 +0200
usb: musb: pass platform_ops via platform_data
... then we don't need to export any symbols
from glue layer to musb_core.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit a023c631f546ef95d58969385825a47652ab9039
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:42:50 2010 +0200
usb: musb: blackfin: give it a context structure
that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit e6480faa1067af91ab403fd3aaf6db2fe1134b13
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:40:34 2010 +0200
usb: musb: da8xx: give it a context structure
that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit e110de4d5358f2e67c333d23d608cbabe26b6220
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:38:12 2010 +0200
usb: musb: davinci: give it a context structure
that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 1add75d2bd1a44553e2c40e30db5f90a500dc1ab
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:35:58 2010 +0200
usb: musb: tusb6010: give it a context structure
that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 0919dfc12a43d5ea21411e67984c268e84d05204
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:33:24 2010 +0200
usb: musb: am35x: give it a context structure
that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit a3cee12aa9129b576c5403a31e37d0e0113235b3
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:27:29 2010 +0200
usb: musb: omap2430: give it a context structure
that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 9cb0308eec7a965136fe9fc6d1be3548c01a4a1e
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:21:05 2010 +0200
usb: musb: split blackfin to its own platform_driver
Just adding its own platform_driver, not really
using it yet.
Later patches will come to split power management
code from musb_core and move it completely to HW
glue layer.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 8ceae51ed5d1739d4ed5c4b947d12ff1d7df0e89
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:19:35 2010 +0200
usb: musb: split da8xx to its own platform_driver
Just adding its own platform_driver, not really
using it yet.
When all HW glue layers are converted, more patches
will come to split power management code from musb_core
and move it completely to HW glue layer.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 73b089b052a69020b953312a624a6e1eb5b81fab
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:16:55 2010 +0200
usb: musb: split davinci to its own platform_driver
Just adding its own platform_driver, not really
using it yet.
When all HW glue layers are converted, more patches
will come to split power management code from musb_core
and move it completely to HW glue layer.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 18688fbeb09665725c842291bbadd88295a359e1
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:13:54 2010 +0200
usb: musb: split tusb6010 to its own platform_driver
Just adding its own platform_driver, not really
using it yet.
When all HW glue layers are converted, more patches
will come to split power management code from musb_core
and move it completely to HW glue layer.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit ce40c5767a0ea1e77ca5d0b73269cb86301a35cf
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 09:06:51 2010 +0200
usb: musb: split am35x to its own platform_driver
Just adding its own platform_driver, not really
using it yet.
When all HW glue layers are converted, more patches
will come to split power management code from musb_core
and move it completely to HW glue layer.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit dc09886bfa781e2b442301116c18199519e36f0f
Author: Felipe Balbi <balbi@xxxxxx>
Date: Wed Dec 1 15:01:11 2010 +0200
usb: musb: split omap2430 to its own platform_driver
Just adding its own platform_driver, not really
using it yet.
When all HW glue layers are converted, more patches
will come to split power management code from musb_core
and move it completely to HW glue layer.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 05ac10dd6862a3fcce33d2203fbb2ef285e3ca87
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 2 08:49:26 2010 +0200
usb: musb: trivial search and replace patch
change all ocurrences of musb_hdrc to musb-hdrc.
We will call glue layer drivers musb-<glue layer>,
so in order to keep things somewhat standard, let's
change the underscore into a dash.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 7c925546427a0428b84bc5ba1f28b3698e492072
Author: Felipe Balbi <balbi@xxxxxx>
Date: Wed Dec 1 14:23:48 2010 +0200
usb: musb: add Kconfig options for each glue layer
This will make things simpler when choosing which
glue layer to compile. It avoids a lot of magic
around the "default" Kconfig option and lets the
user choose what exactly s/he wants to compile.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 7421107b293cace2fc081731306d447ecd8517ab
Author: Felipe Balbi <balbi@xxxxxx>
Date: Wed Dec 1 13:53:27 2010 +0200
usb: musb: hold context on musb structure
when we start splitting HW glue layer, it's
gonna make it easier to re-use that structure.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 1ea7f352d832d5abe43d5e9198098acb4d611ba3
Author: Felipe Balbi <balbi@xxxxxx>
Date: Wed Dec 1 13:48:54 2010 +0200
arm: omap4: panda: initialize musb
initialize the musb port on pandaboard.
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit f404c2fea37e02bec7c8b6edddf5edd22ca60505
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Wed Dec 8 01:43:37 2010 +0000
bnx2x: Update version number and a date.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5cd737c2e84bebf532f536f7addfdd75162bba04
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Wed Dec 8 01:43:29 2010 +0000
bnx2x: Fixed a compilation warning
bnx2x_src_init_t2() is used only when BCM_CNIC is defined.
So, to avoid a compilation warning, we won't define it unless
BCM_CNIC is defined.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d245a1111251d77c804e9fe362e9f70aba856e1e
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Wed Dec 8 01:43:17 2010 +0000
bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2297a2da5a8507bf6596dc30ace3483c00bd85ed
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Wed Dec 8 01:43:09 2010 +0000
bnx2x: LSO code was broken on BE platforms
Make the LSO code work on BE platforms: parsing_data field of
a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong
values for TCP header's length and offset and, as a result, the corresponding
PCI device was performing bad DMA reads triggering EEH.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4bc65dd8d88671712d71592a83374cfb0b5fce7a
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Dec 7 22:26:15 2010 +0000
filter: use size of fetched data in __load_pointer()
__load_pointer() checks data we fetch from skb is included in head
portion, but assumes we fetch one byte, instead of up to four.
This wont crash because we have extra bytes (struct skb_shared_info)
after head, but this can read uninitialized bytes.
Fix this using size of the data (1, 2, 4 bytes) in the test.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6934d33556b366d22392a415ca09d720fed6a442
Author: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Date: Tue Dec 7 22:21:52 2010 +0000
hso: IP checksuming doesn't work on GE0301 option cards
There is definitly a problem, that some option cards send up broken
IP pakets leading to corrupted IP packets. These corruptions aren't
detected, because the driver claims that the packets are already
checksummed. This change removes the CHECKSUM_UNNECESSARY option
and let IP detect broken data.
Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 78347c8c6b2ddf20535bc1b18d749a3bbdea2a60
Author: Thomas Egerer <thomas.egerer@xxxxxxxxxxx>
Date: Mon Dec 6 23:28:56 2010 +0000
xfrm: Fix xfrm_state_migrate leak
xfrm_state_migrate calls kfree instead of xfrm_state_put to free
a failed state. According to git commit 553f9118 this can cause
memory leaks.
Signed-off-by: Thomas Egerer <thomas.egerer@xxxxxxxxxxx>
Signed-off-by: Steffen Klassert <steffen.klassert@xxxxxxxxxxx>
Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fb4fa76a1fa59340154c42d998d700e1f8bf21e0
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Mon Dec 6 09:05:50 2010 +0000
net: Convert netpoll blocking api in bonding driver to be a counter
A while back I made some changes to enable netpoll in the bonding driver. Among
them was a per-cpu flag that indicated we were in a path that held locks which
could cause the netpoll path to block in during tx, and as such the tx path
should queue the frame for later use. This appears to have given rise to a
regression. If one of those paths on which we hold the per-cpu flag yields the
cpu, its possible for us to come back on a different cpu, leading to us clearing
a different flag than we set. This results in odd netpoll drops, and BUG
backtraces appearing in the log, as we check to make sure that we only clear set
bits, and only set clear bits. I had though briefly about changing the
offending paths so that they wouldn't sleep, but looking at my origional work
more closely, it doesn't appear that a per-cpu flag is warranted. We alrady
gate the checking of this flag on IFF_IN_NETPOLL, so we don't hit this in the
normal tx case anyway. And practically speaking, the normal use case for
netpoll is to only have one client anyway, so we're not going to erroneously
queue netpoll frames when its actually safe to do so. As such, lets just
convert that per-cpu flag to an atomic counter. It fixes the rescheduling bugs,
is equivalent from a performance perspective and actually eliminates some code
in the process.
Tested by the reporter and myself, successfully
Reported-by: Liang Zheng <lzheng@xxxxxxxxxx>
CC: Jay Vosburgh <fubar@xxxxxxxxxx>
CC: Andy Gospodarek <andy@xxxxxxxxxxxxx>
CC: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 60d509c823cca21e77d537bd356785f7cfe8f0d1
Author: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 02:39:01 2010 +0000
The new jhash implementation
The current jhash.h implements the lookup2() hash function by Bob Jenkins.
However, lookup2() is outdated as Bob wrote a new hash function called
lookup3(). The patch replaces the lookup2() implementation of the 'jhash*'
functions with that of lookup3().
You can read a longer comparison of the two and other hash functions at
http://burtleburtle.net/bob/hash/doobs.html.
Signed-off-by: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>
Acked-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 68835aba4d9b74e2f94106d13b6a4bddc447c4c8
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 30 19:04:07 2010 +0000
net: optimize INET input path further
Followup of commit b178bb3dfc30 (net: reorder struct sock fields)
Optimize INET input path a bit further, by :
1) moving sk_refcnt close to sk_lock.
This reduces number of dirtied cache lines by one on 64bit arches (and
64 bytes cache line size).
2) moving inet_daddr & inet_rcv_saddr at the beginning of sk
(same cache line than hash / family / bound_dev_if / nulls_node)
This reduces number of accessed cache lines in lookups by one, and dont
increase size of inet and timewait socks.
inet and tw sockets now share same place-holder for these fields.
Before patch :
offsetof(struct sock, sk_refcnt) = 0x10
offsetof(struct sock, sk_lock) = 0x40
offsetof(struct sock, sk_receive_queue) = 0x60
offsetof(struct inet_sock, inet_daddr) = 0x270
offsetof(struct inet_sock, inet_rcv_saddr) = 0x274
After patch :
offsetof(struct sock, sk_refcnt) = 0x44
offsetof(struct sock, sk_lock) = 0x48
offsetof(struct sock, sk_receive_queue) = 0x68
offsetof(struct inet_sock, inet_daddr) = 0x0
offsetof(struct inet_sock, inet_rcv_saddr) = 0x4
compute_score() (udp or tcp) now use a single cache line per ignored
item, instead of two.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e83df17f178360a8e7874441bca04a710c869e42
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 22:40:40 2010 +0000
OMAP2+: PM/serial: fix console semaphore acquire during suspend
commit 0d8e2d0dad98a693bad88aea6876ac8b94ad95c6 (OMAP2+: PM/serial:
hold console semaphore while OMAP UARTs are disabled) added use of the
console semaphore to protect UARTs from being accessed after disabled
during idle, but this causes problems in suspend.
During suspend, the console semaphore is acquired by the console
suspend method (console_suspend()) so the try_acquire_console_sem()
will always fail and suspend will be aborted.
To fix, introduce a check so the console semaphore is only attempted
during idle, and not during suspend. Also use the same check so that
the console semaphore is not prematurely released during resume.
Thanks to Paul Walmsley for suggesting adding the same check during
resume.
Cc: Paul Walmsley <paul@xxxxxxxxx>
Tested-by: Jean Pihet <j-pihet@xxxxxx>
Tested-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 88ab8a8445838785e38af378740ab57f8cb6cb8a
Author: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Date: Sat Dec 4 00:17:55 2010 +0200
Staging: comedi: Fix coding style issues in drivers.c
This patch fixes line over 80 characters warning issues found
in file drivers.c
Signed-off-by: Xenofon Foukas <foukas.xenofon@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fd599985e649c71162495d307a2fd1bbddc258e4
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:32:53 2010 -0800
Staging: sep: eliminate kernel crash due to null parameter in dma_alloc_coherent
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 653bf0cfa55896b74d8cbe7e561401813ca359ad
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:32:38 2010 -0800
Staging: sep: ensure that caller id buffer is little endian
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c100fa4d6142271cc6d228fd84a5da2390ec5ec1
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:32:26 2010 -0800
Staging: sep: reduce 64 and 32 bit compile warnings
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit be38efe11748684d54ff86810443979a59b96cfc
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:32:13 2010 -0800
Staging: sep: limit time to wait for reconfig shared area complete
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8f9346a091ac523afa73643aae69f74f0f8a6e80
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:31:57 2010 -0800
Staging: sep: remove completed items in TODO
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0dd12c44510c342282145c8048b447a13ce78a32
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:31:43 2010 -0800
Staging: sep: remove code for Moorestown device
The Moorestown (older device) will be added to driver
later.
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 08740c97e191d4d5bb1f472a6ec0fa24ebdbc8bc
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:31:31 2010 -0800
Staging: sep: initialize driver copy of send and receive count with device
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 843f65c669c1164897dc5ef79c0df00cb66490bf
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:31:18 2010 -0800
Staging: sep: clean up error checking in probe function
Add pci_disable
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b0daf59c5fc9ac6c65645ffb40156f5d5a0052a4
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:30:31 2010 -0800
Staging: sep: sram_addr is 32 bit; this is not a kernel address, but device internal value
This does not have to be 64 bits wide
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e957b063abdf0f005ba2c298345c75aa7ac4c22a
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:30:17 2010 -0800
Staging: sep: remove spaces at end of lines
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f15662755f7eb3db4a416d52af24771cc208e7b0
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Thu Dec 9 09:30:03 2010 -0800
Staging: sep: remove virtual address being passed to user space application
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c5e61563e26b5a43646393c5f5020d172b2767c7
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:54 2010 +0100
staging: ft1000: Add file header to ft1000_proc.c
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e2398c61272f378b257b3107fdb960e0b642eeb6
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:53 2010 +0100
staging: ft1000: Remove dead code.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 96ff77f7350576d1b25908b59f15d2ab5222c432
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:52 2010 +0100
staging: ft1000: Fix coding style.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 85d47cff4ea2ab0d5380ba649ac4515d1a5bcf23
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:51 2010 +0100
staging: ft1000: Coding style fix in ft1000ReadProc.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 92914cc8bb6d2d710d102051c9bb7566b0ac75a0
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:50 2010 +0100
staging: ft1000: Fix coding style in ft1000NotifyProc.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1c46282421c8b31b37323f7b007c4562ce17578c
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:49 2010 +0100
staging: ft1000: Use return value for ft1000InitProc.
Add checking for return value ft1000InitProc and cleanup
if something fail.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 04c6620117488c0ccc612da5f2bcbcde025e9301
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:48 2010 +0100
staging: ft1000: Fix coding style.
Fix coding style in ft1000CleanupProc and ft1000InitProc
functions.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5fd866fb6401cf6a912e75e1b9c4b906bf42434e
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 16:13:47 2010 +0100
staging: ft1000: Fix proc initialization handling.
Cleaning proc entries when error occures was not handled correctly.
So fix and also add proper cleaning.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 115884118a65c18af290476e44ca6c76a2c0a694
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:53 2010 +0100
staging: ft1000: Fix debug messages.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 05371d1861df75c7d89985760c9ce75fc806f4b8
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:52 2010 +0100
staging: ft1000: Remove unused headers.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c82632d247ce839bfb001723ad1988d30d9febb9
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:51 2010 +0100
staging: ft1000: Remove dead code.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4d791234f484002d57f634e3d90ca2cd51ed144e
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:50 2010 +0100
staging: ft1000: Fix camelcase functions and variables.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 67e9f9e26b7d8862ec2e2a3ac0e56590088e9281
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:49 2010 +0100
staging: ft1000: Remove unused variable.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e34dc580dc4a76106755b88ada5903eaa427c9f4
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:48 2010 +0100
staging: ft1000: Remove unused pdevobj array.
We don't need to store pointer to device in some local
array because we always pass to debugfs correct device pointer.
So remove it.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6d96940b2de8f8ac2bc938ea9249ed380cf906e0
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:47 2010 +0100
staging: ft1000: Fix private data pointer usage.
Assign private data pointer to device for usage in file operations.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9119dee1ce32453dfe24656091d69f8d57397fe0
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 11:26:46 2010 +0100
staging: ft1000: Convert char device to debugfs.
Character device was used only for debugging purposes.
Convert it to debugfs functionality. For every plugged device
create new directory with one file.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 372058f1b4b3603a7e0c26f38d6eb20a3dd8c453
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Thu Dec 9 09:38:34 2010 -0800
staging: solo6010 depends on I2C
This driver uses i2c interfaces, so it should depend on I2C
(unless someone wants to break it into pieces or make it more
config-dependent).
drivers/staging/solo6x10/solo6010-i2c.c:47: error: implicit declaration of function 'i2c_transfer'
drivers/staging/solo6x10/solo6010-i2c.c:299: error: implicit declaration of function 'i2c_add_adapter'
drivers/staging/solo6x10/solo6010-i2c.c:310: error: implicit declaration of function 'i2c_del_adapter'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0e0792fef4ea8e9f8f90819ad97918f61e467855
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Thu Dec 9 19:36:08 2010 +0100
staging: brcm80211: removed ap related comments
Code cleanup, reaction on the 2nd email from Dan Carpenter.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6f475b71605c7ebf6f5b06b8e4dc58f672b4f9b5
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Fri Dec 10 01:40:25 2010 +0900
Staging: sm7xx: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5eaa53de2d9acd9dbcf737b247a0bb0788e79fdf
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Fri Dec 10 01:40:27 2010 +0900
Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 94ab896367d5d6e0bc3064852569c1ff9658ec9c
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Fri Dec 10 01:40:26 2010 +0900
Staging: cx25821: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit abb9eb75a34cbd34ee4e9160ac349eff91b926d8
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Fri Dec 10 01:40:28 2010 +0900
Staging: phison: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 270b64bb4cf27a2ad7819bad89d8c9d8a66ba1b8
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Fri Dec 10 01:40:29 2010 +0900
Staging: vme_tsi148: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2cea0cf284048b03a06e4370709cd751ddb9354e
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Fri Dec 10 01:40:30 2010 +0900
Staging: vme_ca91cx42: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 310d605293f0ab6dc9c7fe7a3cb5c850c60527b4
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 9 16:01:07 2010 +0100
staging: brcm80211: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 28dd31983f6c3a4d89369ff8f0c93de2cda868db
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 01:02:12 2010 +0000
OMAP1: SRAM: fix size for OMAP1611 SoCs
Kernel was failing to boot on omap1611 based OSK boards due to
mis-configured SRAM size. Existing code was using a hard-coded value
for 250k, which was then rounded down by PAGE_SIZE. Increasing this to
256k allows kernel to boot on omap1611 SoCs.
Problem reported by and initial fix suggested by Tim Bird.
Thanks to Tony Lindgren for helping diagnose the problem to being
specific to OMAP1611 and not affecting OMAP1610/OMAP1623.
Reported-by: Tim Bird <tim.bird@xxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 1f0613158ea14b399fd7a16470630a729ba9d0c3
Author: Chen, Chien-Chia <machen@xxxxxxxxxx>
Date: Thu Dec 9 10:52:08 2010 +0800
Staging: rt2860: fix previous patch error
Somehow Greg messed up the last patch and missed a chunk. This patch
contains the missing chunk.
Acked-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Signed-off-by: Chen, Chien-Chia <machen@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 03a9e5126147c9f92aeba4b34f62b15b625087fb
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Thu Dec 9 15:49:23 2010 -0800
omap1: Use asm_irq_flags for entry-macro.S
Initialize asm_irq_flags in omap_init_irq and use it in
get_irqnr_and_base to detect between omap7xx and omap15xx/16xx.
Note that both INT_1510_IH2_IRQ and INT_1510_IH2_IRQ are defined
as 0, so use INT_1510_IH2_IRQ for both of them.
Tested-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit c451278c2864e253a4bb303b596a29edc3bb527c
Merge: 7b045c96cd1405597a6a2e98bc53a4ac01d835b1 5403187f83c12c6f4c03547e0cc05bac0310be7b
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Thu Dec 9 15:48:03 2010 -0800
Merge branch 'devel-cleanup' into omap-for-linus
commit 39c99f12f15c8bf8257985d9b2a2548a03d18c00
Author: Tristan Ye <tristan.ye@xxxxxxxxxx>
Date: Tue Dec 7 14:35:07 2010 +0800
Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.
Due to newly-introduced 'coherency=full' O_DIRECT writes also takes the EX
rw_lock like buffered writes did(rw_level == 1), it turns out messing the
usage of 'level' in ocfs2_dio_end_io() up, which caused i_alloc_sem being
failed to get up_read'd correctly.
This patch tries to teach ocfs2_dio_end_io to understand well on all locking
stuffs by explicitly introducing a new bit for i_alloc_sem in iocb's private
data, just like what we did for rw_lock.
Signed-off-by: Tristan Ye <tristan.ye@xxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 388c4bcb4e63e88fb1f312a2f5f9eb2623afcf5b
Author: Sunil Mushran <sunil.mushran@xxxxxxxxxx>
Date: Fri Nov 19 15:06:50 2010 -0800
ocfs2/dlm: Migrate lockres with no locks if it has a reference
o2dlm was not migrating resources with zero locks because it assumed that that
resource would get purged by dlm_thread. However, some usage patterns involve
creating and dropping locks at a high rate leading to the migrate thread seeing
zero locks but the purge thread seeing an active reference. When this happens,
the dlm_thread cannot purge the resource and the migrate thread sees no reason
to migrate that resource. The spell is broken when the migrate thread catches
the resource with a lock.
The fix is to make the migrate thread also consider the reference map.
This usage pattern can be triggered by userspace on userdlm locks and flocks.
Signed-off-by: Sunil Mushran <sunil.mushran@xxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 67b96c182c36c83cd6881122b4a7922b2634047b
Merge: efc70d241f5c7fc0a9f1c2a01781ed946d9dbe21 ddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 10 00:31:30 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit efc70d241f5c7fc0a9f1c2a01781ed946d9dbe21
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Dec 10 00:27:23 2010 +0100
perf, sparc: Fix CONFIG_PERF_EVENTS=y build error
Fix a typo in:
004417a6d468: perf, arch: Cleanup perf-pmu init vs lockup-detector
Which caused a build failure on Sparc, reported by Stephen Rothwell.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5dc3055879b8f659f62abb7c3d1eaa4d02e36d65
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Mon Nov 29 17:07:17 2010 -0500
x86, NMI: Add back unknown_nmi_panic and nmi_watchdog sysctls
Originally adapted from Huang Ying's patch which moved the
unknown_nmi_panic to the traps.c file. Because the old nmi
watchdog was deleted before this change happened, the
unknown_nmi_panic sysctl was lost. This re-adds it.
Also, the nmi_watchdog sysctl was re-implemented and its
documentation updated accordingly.
Patch-inspired-by: Huang Ying <ying.huang@xxxxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Reviewed-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
LKML-Reference: <1291068437-5331-3-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 96a84c20d635fb1e98ab92f9fc517c4441f5c424
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Mon Nov 29 17:07:16 2010 -0500
lockup detector: Compile fixes from removing the old x86 nmi watchdog
My patch that removed the old x86 nmi watchdog broke other
arches. This change reverts a piece of that patch and puts the
change in the correct spot.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Reviewed-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
Cc: yinghai@xxxxxxxxxx
LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a5dc4f898c2a0f66e2cefada6c687db82ba2fcbc
Author: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
Date: Thu Dec 9 17:07:54 2010 -0500
ACPI: EC: Add another dmi match entry for MSI hardware
http://bugzilla.kernel.org/show_bug.cgi?id=15418
Signed-off-by: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
cc: stable@xxxxxxxxxx
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit dc6bbc991b0c408daad5df43e5851f1d369e50f7
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 9 15:51:32 2010 +0100
msm_serial: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
commit 7c03b87048f2467087ae7e51392e5fb57ea8f58b
Author: Mike Miller <mike.miller@xxxxxx>
Date: Wed Dec 1 11:16:07 2010 -0600
[SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as 3fff in
hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It is
intended only as part a complete storage solution. As such, this patch
removes the redefinition and the StorageWorks P1210m from the product table.
It also removes a duplicate line for the "unknown" controller support.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit d1b758ebc2a82d738092cb42e742470f9d0ea53e
Author: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Date: Thu Dec 9 14:53:29 2010 -0500
xen/irq: Cleanup the find_unbound_irq
The "find_unbound_irq" is a bit unusual - it allocates
virtual IRQ (event channels) in reverse order. This means
starting at the "top" of the available IRQs (nr_irqs) down
to the GSI/MSI IRQs (nr_irqs_gsi). Lets document this and
also make the variables easier to understand.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
commit 0e3fa13f4ee110de007bca3bf395b77997319fc8
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Wed Dec 8 15:18:57 2010 +0800
x86: Further simplify mp_irq info handling
assign_to_mp_irq() is copying the struct mpc_intsrc members one by
one. That's silly. Use memcpy() and let the compiler figure it out.
Same for the identical function assign_to_mpc_intsrc()
mp_irq_mpc_intsrc_cmp() is comparing the struct members one by one,
but no caller ever checks the different return codes. Use memcmp()
instead.
Remove the extra printk in MP_ioapic_info()
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: "Alan Cox <alan@xxxxxxxxxxxxxxx>
Cc: Len Brown <len.brown@xxxxxxxxx>
LKML-Reference: <20101208151857.212f0018@feng-i7>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 2d8009ba67f9503ceadf9d5a3b5637cee291ea8d
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Nov 19 11:33:35 2010 +0800
x86: Unify 3 similar ways of saving mp_irqs info
There are 3 places defining similar functions of saving IRQ vector
info into mp_irqs[] array: mmparse/acpi/mrst.
Replace the redundant code by a common function in io_apic.c as it's
only called when CONFIG_X86_IO_APIC=y
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Cc: Len Brown <len.brown@xxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <20101207133204.4d913c5a@feng-i7>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 60d79fd99ff3b9c692b260a4d53a203f537c052a
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Dec 7 00:59:49 2010 -0800
x86, ioapic: Avoid writing io_apic id if already correct
For 32bit mptable path, setup_ids_from_mpc() always writes the io_apic
id register, even there is no change needed.
Skip the write, when readout and mptable match.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Sebastian Siewior <bigeasy@xxxxxxxxxxxxx>
LKML-Reference: <4CFDF785.7010401@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 0450193bffed6e4b6160c4a5ccb0df158eba7d2a
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Dec 7 00:55:56 2010 -0800
x86, x2apic: Don't map lapic addr for preenabled x2apic systems
If x2apic is preenabled and used by the kernel, we don't need to map
the lapic address. That mapping will never be used.
So just skip that in register_lapic_address()
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
LKML-Reference: <4CFDF69C.9070501@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 53301f36f316a6519c464b0ef2a155386c20be19
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Dec 7 00:55:47 2010 -0800
x86, sfi: Use register_lapic_address()
register_lapic_address() and mp_sfi_register_lapic_address() are
almost identical. Use the common function.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
LKML-Reference: <4CFDF693.6000908@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 326a2e6bae250b1172c0ae80f3b259d79e9cb56c
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Dec 7 00:55:38 2010 -0800
x86, apic: Use register_lapic_address() in init_apic_mapping()
Remove the printk as well, we don't want to print when nothing
changed. We print in register_lapic_address() already.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
LKML-Reference: <4CFDF68A.7020902@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit f1157141636848f52c5f74040bed0ba355cf59b7
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Dec 7 00:55:29 2010 -0800
x86, apic: Remove early_init_lapic_mapping()
It is almost the same as smp_register_lapic_addr(). We just need to
let smp_read_mpc() call smp_register_lapic_addr() when early==1.
Add the apic_printk to smp_register_lapic_address()
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
LKML-Reference: <4CFDF681.3030509@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit c0104d38a740b25662c592c71f6907676510289c
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date: Tue Dec 7 00:55:17 2010 -0800
x86, apic: Unify identical register_lapic_address() functions
They are the same, move the common function to apic.c to allow
further cleanups.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
LKML-Reference: <4CFDF675.4060305@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b
Author: Zhang Rui <rui.zhang@xxxxxxxxx>
Date: Wed Dec 8 10:40:49 2010 +0800
ACPI battery: update status upon sysfs query
Sometimes the Battery driver doesn't get notifications when it's
plugged/unplugged. And this results in the incorrect Battery
status reported by the power supply sysfs I/F.
Update Battery status first when querying from sysfs.
http://marc.info/?l=linux-acpi&m=128855015826728&w=2
Tested_by: Seblu <seblu@xxxxxxxxx>
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 3151dbb04ad5a5bd6358371c0bfb457216d00205
Author: Zhang Rui <rui.zhang@xxxxxxxxx>
Date: Wed Dec 8 10:40:45 2010 +0800
ACPI ac: update AC status upon sysfs query
http://marc.info/?l=linux-acpi&m=128855015826728&w=2
https://bugzilla.kernel.org/show_bug.cgi?id=21722
Tested_by: Seblu <seblu@xxxxxxxxx>
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 63abf3edaf42d0b9f278df90fe41c7ed4796b6b1
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 16:48:21 2010 +0000
drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
BIOSes. Can't live without them (apparently), definitely can't live with
them.
Reported-by: Ben Gamari <bgamari@xxxxxxxxx>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=24312
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit f8bbeabc34aa945ab4275abc9a4dfde0aea798ca
Author: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Date: Thu Dec 9 10:29:00 2010 -0800
xhci: Fix issue with port array setup and buggy hosts.
Fix two bugs with the port array setup.
The first bug will only show up with broken xHCI hosts with Extended
Capabilities registers that have duplicate port speed entries for the same
port. The idea with the original code was to set the port_array entry to
-1 if the duplicate port speed entry said the port was a different speed
than the original port speed entry. That would mean that later, the port
would not be exposed to the USB core. Unfortunately, I forgot a continue
statement, and the port_array entry would just be overwritten in the next
line.
The second bug would happen if there are conflicting port speed registers
(so that some entry in port_array is -1), or one of the hardware port
registers was not described in the port speed registers (so that some
entry in port_array is 0). The code that sets up the usb2_ports array
would accidentally claim those ports. That wouldn't really cause any
user-visible issues, but it is a bug.
This patch should go into the stable trees that have the port array and
USB 3.0 port disabling prevention patches.
Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 13d38d9df26b5b9a5ad5f9fbc065078bc42a8748
Author: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Date: Tue Nov 23 16:52:50 2010 -0800
[SCSI] qla2xxx: Update version number to 8.03.05-k0.
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 69abf61ea1005bc362b678639a4ae219e23829f3
Author: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
Date: Tue Nov 23 16:52:49 2010 -0800
[SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function.
A return value is not set for the successful case and it has a garbage value.
This fix will set the default value to SUCCESS and in case of any failures
it is changed.
Signed-off-by: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 087c621e22f49c326cdc65d98c6fc0737ac13533
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date: Tue Nov 23 16:52:48 2010 -0800
[SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
This would cause a panic while reading the NPIV-config data.
Cc: stable@xxxxxxxxxx
Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7992abfc8b851456f2dfac3229ecb3a5e5637df0
Author: Mike Hernandez <michael.hernandez@xxxxxxxxxx>
Date: Tue Nov 23 16:52:47 2010 -0800
[SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
IRQF_SHARED flag should not be set when calling request_irq for MSI
since this interrupt mechanism cannot be shared like standard INTx.
Signed-off-by: Mike Hernandez <michael.hernandez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 85727e1f78bd8392a0657ad6a4ff85fef1cc4a6d
Author: Mike Hernandez <michael.hernandez@xxxxxxxxxx>
Date: Tue Nov 23 16:52:46 2010 -0800
[SCSI] qla2xxx: Populate Command Type 6 LUN field properly.
Use the host_to_fcp_swap call to correctly populate the LUN field
in the Command Type 6 path. This field is used during LUN reset
cleanup and must match the field used in the FCP command.
Cc: stable@xxxxxxxxxx
Signed-off-by: Mike Hernandez <michael.hernandez@xxxxxxxxxx>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 7e1fea731da8c1b5fcf5d8e157befd389b030760
Author: Josef Bacik <josef@xxxxxxxxxx>
Date: Wed Dec 8 12:22:34 2010 -0500
Btrfs: fixup return code for btrfs_del_orphan_item
If the orphan item doesn't exist, we return 1, which doesn't make any sense to
the callers. Instead return -ENOENT if we didn't find the item. Thanks,
Signed-off-by: Josef Bacik <josef@xxxxxxxxxx>
commit b8399dee478db7939cd0d6fda8ecacddf2facd03
Author: Josef Bacik <josef@xxxxxxxxxx>
Date: Wed Dec 8 09:15:11 2010 -0500
Btrfs: do not do fast caching if we are allocating blocks for tree_root
Since the fast caching uses normal tree locking, we can possibly deadlock if we
get to the caching via a btrfs_search_slot() on the tree_root. So just check to
see if the root we are on is the tree root, and just don't do the fast caching.
Reported-by: Sage Weil <sage@xxxxxxxxxxxx>
Signed-off-by: Josef Bacik <josef@xxxxxxxxxx>
commit 2b20982e3154266106573beac2a4d4ba57a2789a
Author: Josef Bacik <josef@xxxxxxxxxx>
Date: Fri Dec 3 13:17:53 2010 -0500
Btrfs: deal with space cache errors better
Currently if the space cache inode generation number doesn't match the
generation number in the space cache header we will just fail to load the space
cache, but we won't mark the space cache as an error, so we'll keep getting that
error each time somebody tries to cache that block group until we actually clear
the thing. Fix this by marking the space cache as having an error so we only
get the message once. This patch also makes it so that we don't try and setup
space cache for a block group that isn't cached, since we won't be able to write
it out anyway. None of these problems are actual problems, they are just
annoying and sub-optimal. Thanks,
Signed-off-by: Josef Bacik <josef@xxxxxxxxxx>
commit 955256f2c3e25c94ad373c43fbc38d2ac8af2a71
Author: Josef Bacik <josef@xxxxxxxxxx>
Date: Fri Nov 19 09:41:10 2010 -0500
Btrfs: fix use after free in O_DIRECT
This fixes a bug where we use dip after we have freed it. Instead just use the
file_offset that was passed to the function. Thanks,
Signed-off-by: Josef Bacik <josef@xxxxxxxxxx>
commit defb3519a64141608725e2dac5a5aa9a3c644bae
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 21:16:57 2010 -0800
net: Abstract away all dst_entry metrics accesses.
Use helper functions to hide all direct accesses, especially writes,
to dst_entry metrics values.
This will allow us to:
1) More easily change how the metrics are stored.
2) Implement COW for metrics.
In particular this will help us put metrics into the inetpeer
cache if that is what we end up doing. We can make the _metrics
member a pointer instead of an array, initially have it point
at the read-only metrics in the FIB, and then on the first set
grab an inetpeer entry and point the _metrics member there.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
commit 6942fec92d3d1b6918425730de31b4c6d0d5c196
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Thu Dec 9 10:09:14 2010 -0800
iwlagn: implement layout-agnostic EEPROM reading
From: Johannes Berg <johannes.berg@xxxxxxxxx>
The current EEPROM reading code has some layout
assumptions that now turned out to be false with
some newer versions of the EEPROM. Luckily, we
can avoid all such assumptions by using data in
the EEPROM itself, so implement using that.
However, for risk mitigation purposes, keep the
old reading code for current hardware for now.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit cbf68a668d0e41527572c762824a1b6a9225d33f
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 30 11:03:44 2010 -0800
iwlagn: rename enhanced txpower fields
Some fields we didn't previously use from the
enhanced TX power structure will be needed in
the next patch, so rename them to their correct
names to be able to use them and change code
reading them accordingly.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 51ddafcbc735155a7e946b8b6ff19fcd5351375b
Merge: d834a9dcecae834cd6b2bc5e50e1907738d9cf6a 991cfffa7c19aa648546aff666595af896e568ba
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Thu Dec 9 18:19:13 2010 +0100
Merge branch 'x86/platform' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit d834a9dcecae834cd6b2bc5e50e1907738d9cf6a
Merge: a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4 f658bcfb2607bf0808966a69cf74135ce98e5c2d
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Thu Dec 9 18:17:25 2010 +0100
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts:
arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 4720dd1b3858f0da2593188cb1e57eb0d3bc4af2
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Thu Dec 9 17:43:21 2010 +0100
x86: io_apic: Avoid unused variable warning when CONFIG_GENERIC_PENDING_IRQ=n
arch/x86/kernel/apic/io_apic.c: In function 'ack_apic_level':
arch/x86/kernel/apic/io_apic.c:2433: warning: unused variable 'desc'
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <201010272107.o9RL7rse018212@xxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit e55f87531c2c1eb071a296df7eb67f83d5f0b5df
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Nov 18 14:53:18 2010 +0100
[SCSI] zfcp: Issue FCP command without holding SCSI host_lock
Interrupting the connection to the FCP channel while I/O requests are
being issued can lead to this deadlock. scsi_dispatch_cmd already
holds the host_lock while the recovery trigger tries to acquire the
host_lock again when iterating through the scsi_devices.
INFO: lockdep is turned off.
BUG: spinlock lockup on CPU#1, blast/9660, 0000000078f38878
CPU: 1 Not tainted 2.6.35.7SWEN2 #2
Process blast (pid: 9660, task: 0000000071f75940, ksp: 0000000074393ac0)
0000000074393640 00000000743935c0 0000000000000002 0000000000000000
0000000074393660 00000000743935d8 00000000743935d8 00000000005590c2
0000000000000000 0000000078f38878 0000000026ede800 0000000078f38878
000000000000000d 040000000000000c 0000000074393628 0000000000000000
0000000000000000 0000000000100b2a 00000000743935c0 0000000074393600
Call Trace:
([<0000000000100a32>] show_trace+0xee/0x144)
[<00000000003be202>] do_raw_spin_lock+0x112/0x178
[<000000000055d408>] _raw_spin_lock_irqsave+0x90/0xb0
[<00000000003f1514>] __scsi_iterate_devices+0x38/0xbc
[<00000000004849b0>] zfcp_erp_clear_adapter_status+0xd0/0x16c
[<000000000048587a>] zfcp_erp_adapter_reopen+0x3a/0xb4
[<0000000000489812>] zfcp_fsf_req_send+0x166/0x180
[<000000000048c8d6>] zfcp_fsf_fcp_cmnd+0x272/0x408
[<000000000048f864>] zfcp_scsi_queuecommand+0x11c/0x1e0
[<00000000003f1f2a>] scsi_dispatch_cmd+0x1d6/0x324
[<00000000003f9910>] scsi_request_fn+0x42c/0x56c
[<00000000003828ae>] __blk_run_queue+0x86/0x140
[<000000000037f742>] elv_insert+0x11a/0x208
[<000000000038104c>] blk_insert_cloned_request+0x84/0xe4
[<000003c0032b7c64>] dm_dispatch_request+0x6c/0x94 [dm_mod]
[<000003c0032b7d5c>] map_request+0xd0/0x100 [dm_mod]
[<000003c0032b9a78>] dm_request_fn+0xec/0x1bc [dm_mod]
[<0000000000382c0e>] generic_unplug_device+0x5a/0x6c
[<000003c0032b7f98>] dm_unplug_all+0x74/0x9c [dm_mod]
[<00000000001d1272>] sync_page+0x76/0x9c
[<00000000001d12ba>] sync_page_killable+0x22/0x60
[<000000000055a768>] __wait_on_bit_lock+0xc0/0x124
[<00000000001d1140>] __lock_page_killable+0x78/0x84
[<00000000001d351c>] generic_file_aio_read+0x5a4/0x7e8
[<0000000000228ec0>] do_sync_read+0xc8/0x12c
[<0000000000229edc>] vfs_read+0xac/0x1ac
[<000000000022a0d8>] SyS_read+0x58/0xa8
[<00000000001146de>] sysc_noemu+0x10/0x16
[<00000200000493c4>] 0x200000493c4
INFO: lockdep is turned off.
Call zfcp_fsf_fcp_cmnd without the host_lock and disable the
interrupts when acquiring the req_q_lock. According to the patch
description in "[PATCH] Eliminate error handler overload of the SCSI
serial number", the serial_number is not used, so simply drop the
queuecommand wrapper function and run zfcp_scsi_queuecommand without
holding the host_lock.
Reviewed-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 14718e3cd8e9c6937114cebbf3ce5d504328da8c
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Wed Nov 17 14:23:43 2010 +0100
[SCSI] zfcp: Prevent usage w/o holding a reference
The ERP got values assigned for which no reference was taken. This
can lead to an unpredictable race condition. Fix this by only
assigning the values which are required and for which a reference was
pulled or is held implicitly.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit d3e1088d68735eb7da12f79a0c3c0d951cbc89f1
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Wed Nov 17 14:23:42 2010 +0100
[SCSI] zfcp: No ERP escalation on gpn_ft eval
If the evaluation of GPN_FT requests wants to remove an invalid port
from the system the zfcp_erp_port_shutdown function is triggered.
Depending on the system status a superior action (e.g. adapter reopen)
is required. This can lead to an invalid mem access of the port struct
which might be freed at the time since the superior action is not
holding a reference of the port which triggered this ERP action.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 6fbf25e86beef1c6719e760a241a7aef9ad145e3
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Wed Nov 17 14:23:41 2010 +0100
[SCSI] zfcp: Correct false abort data assignment.
The request data assignment between the fsf abort initiator and its
corresponding handler is not consistent and leads to an unpredictable
behaviour, e.g. kernel panic. This patch fixes this issue and assigns
the correct value.
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 5bfb2c31487eaff3840e02548e6acf89a048765b
Author: Swen Schillig <swen@xxxxxxxxxxxx>
Date: Wed Nov 17 14:23:40 2010 +0100
[SCSI] zfcp: Fix common FCP request reception
The reception of a common FCP request should only be evaluated if the
corresponding SCSI request data is available. Therefore put the
information under the lock protection and verify the existence before
processing. This fixes the following kernel panic.
Unable to handle kernel pointer dereference at virtual kernel address 0000000180000000
Oops: 003b [#1] PREEMPT SMP DEBUG_PAGEALLOC
CPU: 0 Not tainted 2.6.35.7-45.x.20101007-s390xdefault #1
Process blast (pid: 9711, task: 00000000a3be8e40, ksp: 00000000b221bac0)
Krnl PSW : 0704300180000000 0000000000489878 (zfcp_fsf_fcp_handler_common+0x4c/0x3a0)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:3 PM:0 EA:3
Krnl GPRS: 00000000b663c1b8 0000000180000000 000000007ab5bdf0 0000000000000000
00000000b0ccd800 0000000000000018 07000000a3be8e78 00000000b5d3e600
000000007ab5bdf0 0000000000000066 00000000b72137f0 00000000b72137f0
0000000000000000 00000000005a8178 00000000bdf37a60 00000000bdf379f0
Krnl Code: 0000000000489866: e3c030000004 lg %r12,0(%r3)
000000000048986c: e310c0000004 lg %r1,0(%r12)
0000000000489872: e31011e00004 lg %r1,480(%r1)
>0000000000489878: 581011ec l %r1,492(%r1)
000000000048987c: a774001c brc 7,4898b4
0000000000489880: b91400b1 lgfr %r11,%r1
0000000000489884: 5810405c l %r1,92(%r4)
0000000000489888: 5510d00c cl %r1,12(%r13)
Call Trace:
([<000000000010d344>] debug_event_common+0x22c/0x244)
[<000000000048a0b4>] zfcp_fsf_fcp_cmnd_handler+0x2c/0x3b4
[<000000000048b5b6>] zfcp_fsf_req_complete+0x1b6/0x9dc
[<000000000048bede>] zfcp_fsf_reqid_check+0x102/0x138
[<000000000048e478>] zfcp_qdio_int_resp+0x70/0x110
[<000000000044a1ec>] qdio_kick_handler+0xb0/0x19c
[<000000000044c228>] __tiqdio_inbound_processing+0x30c/0xebc
[<000000000014a5fc>] tasklet_action+0x1b4/0x1e8
[<000000000014b676>] __do_softirq+0x106/0x1cc
[<000000000010d91a>] do_softirq+0xe6/0xec
[<000000000014b0c8>] irq_exit+0xd4/0xd8
[<00000000004307ec>] do_IRQ+0x7c0/0xf54
[<0000000000114d28>] io_return+0x0/0x16
[<000000000055fef0>] sub_preempt_count+0x50/0xe4
([<00000000b1f873c0>] 0xb1f873c0)
[<000000000055e25a>] _raw_spin_unlock+0x46/0x74
[<0000000000241c40>] __d_lookup+0x288/0x2c8
[<000000000023502c>] do_lookup+0x7c/0x25c
[<0000000000237fa8>] link_path_walk+0x5e4/0xe2c
[<0000000000238a00>] path_walk+0x98/0x148
[<0000000000238c98>] do_path_lookup+0x74/0xc0
[<000000000023989c>] user_path_at+0x64/0xa4
[<000000000022e366>] vfs_fstatat+0x4e/0xb0
[<000000000022e4d6>] SyS_newstat+0x2e/0x54
[<00000000001146de>] sysc_noemu+0x10/0x16
[<0000020000153456>] 0x20000153456
INFO: lockdep is turned off.
Last Breaking-Event-Address:
[<000000000048a0ae>] zfcp_fsf_fcp_cmnd_handler+0x26/0x3b4
Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx>
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 459dbf72e4d2b4aa13620e6b70d54f098547bf13
Author: James Bottomley <James.Bottomley@xxxxxxx>
Date: Wed Nov 17 10:10:57 2010 -0600
[SCSI] Eliminate error handler overload of the SCSI serial number
The error handler is using the test cmd->serial_number == 0 in the
abort routines to signal that the command to be aborted has already
completed normally. This design was to close a race window in the
original error handler where a command could go through the normal
completion routines after it timed out but before error handling was
started.
Mike Anderson pointed out that when we converted our timeout and
softirq completions, we picked up atomicity here because the block
layer now mediates this with the REQ_ATOM_COMPLETE flag and guarantees
that *either* the command times out or our done routine is called, but
ensures we can't get both occurring. That makes the serial number
zero check redundant and it can be removed.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 5da61410054d125e63aeab9cc7a11874a69465c0
Author: Anil Ravindranath <anil_ravindranath@xxxxxxxxxxxxxx>
Date: Tue Nov 16 13:43:41 2010 -0800
[SCSI] pmcraid: disable msix and expand device config entry
Firmware requires a larger configuration entry size than the driver
currently allows, and MSI-X pretty much doesn't work with current FW,
so disable it for now.
Signed-off-by: Anil Ravindranath <anil_ravindranath@xxxxxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit c7a841f3aca469187db76842676951a672fd27d1
Author: James Smart <james.smart@xxxxxxxxxx>
Date: Sun Nov 14 11:12:04 2010 -0500
[SCSI] bsg: correct fault if queue object removed while dev_t open
This patch corrects an issue in bsg that results in a general protection
fault if an LLD is removed while an application is using an open file
handle to a bsg device, and the application issues an ioctl. The fault
occurs because the class_dev is NULL, having been cleared in
bsg_unregister_queue() when the driver was removed. With this
patch, a check is made for the class_dev, and the application
will receive ENXIO if the related object is gone.
Signed-off-by: Carl Lajeunesse <carl.lajeunesse@xxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 057f02a38e67a944a2d0b89bb0111efb9dbe6e6e
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Nov 12 07:31:46 2010 +0300
[SCSI] osd: checking NULL instead of ERR_PTR()
bio_map_kern() returns ERR_PTRs on failure and never returns NULL.
[jejb: remove redundant unlikely spotted by Tobias Klauser]
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
commit 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583
Author: Rakib Mullick <rakib.mullick@xxxxxxxxx>
Date: Thu Dec 9 14:47:34 2010 +0600
x86: Address 'unused' warning in hw_nmi.c again
arch/x86/kernel/apic/hw_nmi.c:29: warning: backtrace_mask defined but not used
commit 0e2af2a9(x86, hw_nmi: Move backtrace_mask declaration under
ARCH_HAS_NMI_WATCHDOG) addressed this warning, but it was reintroduced
by commit 5f2b0ba4(x86, nmi_watchdog: Remove the old nmi_watchdog).
Move backtrace_mask into the #ifdef arch_trigger_all_cpu_backtrace
section again.
Signed-off-by: Rakib Mullick <rakib.mullick@xxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <AANLkTi=rcc38QzoKa6LFy4m++-p_9=Zt4_kDQE=GeKxf@xxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit b7613370db5ba66ad81e41cd3a5417fde4d5e03c
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 9 09:08:47 2010 -0500
ath: fix build break with ATH_DBG_WARN_ON_ONCE
Description by Hauke:
"If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and
returns something, but if CONFIG_ATH_DEBUG is not set it does not return
anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in
an if case and is not returning anything and causes a compile error.
CC [M] /drivers/net/wireless/ath/ath9k/main.o
/drivers/net/wireless/ath/ath9k/main.c: In function â??ath_isrâ??:
/drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression
before â??doâ??
make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1
make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2"
Reported-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Thu Dec 9 12:20:20 2010 -0200
perf session: Remove unneeded dump_printf calls
Since we check at the beginning of the callers, no need to ask if
dump_trace is set multiple times.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit ba74f0640d963ccc914ac533cb0ba133ee07bcf2
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:49:01 2010 +0000
perf session: Split out user event processing
Simplify further.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124551.110956235@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 3dfc2c0aee789843d18f6e4675658e6879465a56
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:58 2010 +0000
perf session: Split out sample preprocessing
Simplify the code a bit.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124551.014649793@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 532e7269c01098f0be6e08113c6947ec6ed11bfa
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:55 2010 +0000
perf session: Move dump code to event delivery path
Preparatory patch for ordered perf report -D
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124550.918655066@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit f74725dcf2f6931c26bc65e77e34e693eeb8441c
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:53 2010 +0000
perf session: Add file_offset to event delivery function
Preparatory patch for ordered output of perf report -D
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124550.818568607@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit e4c2df132fef60a28b851abc1859a531e64f350c
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:50 2010 +0000
perf session: Store file offset in sample_queue
Preparatory patch for ordered output of perf report -D.
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124550.725128545@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 4e53f78e5b06c073a5c10814c72e98c1ca8a9f10
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Mon Nov 29 19:16:37 2010 +0200
tools/virtio: virtio_test tool
This is the userspace part of the tool: it includes a bunch of stubs for
linux APIs, somewhat simular to linuxsched. This makes it possible to
recompile the ring code in userspace.
A small test example is implemented combining this with vhost_test
module.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit 71ccc212e5b28dfcc870b6db6589c2df264fdc6a
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Mon Nov 29 19:09:01 2010 +0200
vhost test module
This adds a test module for vhost infrastructure.
Intentionally not tied to kbuild to prevent people
from installing and loading it accidentally.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit 28831ee60b79bed50958c9cb0d2e76cdc98406f9
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Mon Nov 29 10:22:10 2010 +0200
vhost: better variable name in logging
We really store a page offset in write_address,
so rename it write_page to avoid confusion.
Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit b7ee1d01c5ff3bf2e51c8565ea00823cdbc2a9f3
Author: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Tue Dec 7 22:35:50 2010 +0100
ath5k: Fix modinfo does not list alias -> pci-id lines
The AHB bus support patchset moved the table "Known PCI ids" from base.c
to pci.c - unfortunately, MODULE_DEVICE_TABLE() was not transferred.
With this fix 'modinfo ath5k' lists the alias -> pci-id lines, again.
The issue was introduced by:
commit e5b046d86fac609f636d127a38de94a175c7e83b
"ath5k: Move PCI bus functions to separate file."
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6a66bbd693c12f71697c61207aa18bc5a12da0ab
Author: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Date: Wed Dec 8 15:08:04 2010 -0800
HID: magicmouse: Don't report REL_{X,Y} for Magic Trackpad
With the recent switch to having the hid layer handle standard axis
initialization, the Magic Trackpad now reports relative axes. This would
be fine in the normal mode, but the driver puts the device in multitouch
mode where no relative events are generated. Also, userspace software
depends on accurate axis information for device type detection. Thus,
ignoring the relative axes from the Magic Trackpad is best.
Signed-off-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 3bf9be40ff76b6df136f14a497167c116b2b3c53
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Mon Nov 29 10:19:07 2010 +0200
vhost: correctly set bits of dirty pages
Fix two bugs in dirty page logging:
When counting pages we should increase address by 1 instead of
VHOST_PAGE_SIZE. Make log_write() correctly process requests
that cross pages with write_address not starting at page boundary.
Reported-by: Jason Wang <jasowang@xxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit a290aec88a9c4747353ea7aa9b2569bd61297c3c
Author: Jason Wang <jasowang@xxxxxxxxxx>
Date: Mon Nov 29 13:48:40 2010 +0800
vhost: fix typos in comment
Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit bf5e0bd27f7cbaca4d52ae395bbf3715775efebd
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Sun Nov 14 17:33:25 2010 +0200
vhost: remove unused include
vhost.c does not need to know about sockets,
don't include sock.h
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit 9aefcab0de472ee2b3ab195a6827ddd4b170e3a7
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:47 2010 +0000
perf session: Consolidate the dump code
The dump code used by perf report -D is scattered all over the place.
Move it to separate functions.
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124550.625434869@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 79a14c1f458d598642bf11f09512c83d33a114e6
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:44 2010 +0000
perf session: Dont queue events w/o timestamps
If the event has no timestamp assigned then the parse code sets it to
~0ULL which causes the ordering code to enqueue it at the end.
Process it right away.
Reported-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124550.528788441@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 3835bc00c5b2d8e337a6e9d7b44f47e02760dba3
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Dec 7 12:48:42 2010 +0000
perf event: Prevent unbound event__name array access
event__name[] is missing an entry for PERF_RECORD_FINISHED_ROUND, but we
happily access the array from the dump code.
Make event__name[] static and provide an accessor function, fix up all
callers and add the missing string.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101207124550.432593943@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit b226a5a72901bc9c73d639ea2e53e6c304bf3b74
Author: David Ahern <daahern@xxxxxxxxx>
Date: Tue Dec 7 19:39:46 2010 -0700
perf report: Allow user to specify path to kallsyms file
This is useful for analyzing a perf data file on a different system than
the one data was collected on and still include symbols from loaded
kernel modules in the output.
Commiter note: Updated the man page accordingly.
LKML-Reference: <1291775986-16475-1-git-send-email-daahern@xxxxxxxxx>
Signed-off-by: David Ahern <daahern@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 8c0a6bfef165ccdbf5d73afb9dd660107b0c98d5
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 9 12:56:37 2010 +0000
drm/i915/ringbuffer: Handle wrapping of the autoreported HEAD
If the tail advances beyond the autoreport HEAD value, then we need to
fallback to an uncached read of the HEAD register in order to ascertain
the correct amount of remaining space in the ringbuffer.
Reported-by: Fang, Xun <xunx.fang@xxxxxxxxx>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32259
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit a0968628097380be52db8b4664da98fc425546a5
Author: Seungwhan Youn <sw.youn@xxxxxxxxxxx>
Date: Thu Dec 9 18:07:52 2010 +0900
ASoC: WM8580: Fix R8 initial value
Acc to WM8580 manual, the default value for R8 is 0x10, not 0x1c.
Signed-off-by: Seungwhan Youn <sw.youn@xxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 3f343f8512c7882a3637d9aea4ec6b3801cbcdc5
Author: Dmitry Artamonow <mad_soft@xxxxxxxx>
Date: Wed Dec 8 23:36:17 2010 +0300
ASoC: fix deemphasis control in wm8904/55/60 codecs
Deemphasis control's .get callback should update control's value instead
of returning it - return value of callback function is used for indicating
error or success of operation.
Signed-off-by: Dmitry Artamonow <mad_soft@xxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 1b39ed0cf51193f3ba03044369ab4d144712a9b8
Author: Danny Huang <dahuang@xxxxxxxxxx>
Date: Wed Dec 1 13:37:31 2010 -0700
regulator: tps6586x: correct register table
Correct the register table for SM2, LDO8, RTC
Change-Id: I45348cec5ffbb7da9bd7523764fb611b537236b8
Signed-off-by: Danny Huang <dahuang@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olofj@xxxxxxxxxxxx>
Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 1dbcf35cb5b775e564a793a338c7c3eb65fc6980
Author: Danny Huang <dahuang@xxxxxxxxxx>
Date: Wed Dec 1 13:37:30 2010 -0700
regulator: tps6586x: Handle both enable reg/bits being the same
Change-Id: I40400bb65eab496bb1becd26b37a9653b99d4f41
Signed-off-by: Danny Huang <dahuang@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olofj@xxxxxxxxxxxx>
Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
(Split into separate patches)
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 64db657b5a45f1676d421e2bdfb7d4910dce87d3
Author: Danny Huang <dahuang@xxxxxxxxxx>
Date: Wed Dec 1 13:37:29 2010 -0700
regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
Change-Id: Idacf5e1e51dbbbcd5ea93f310a4e907977e7359e
Signed-off-by: Danny Huang <dahuang@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olofj@xxxxxxxxxxxx>
Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
(Split into separate patches)
(Minor formatting fixes)
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 4f58670709af7b890eceab325e9e470f209459ca
Author: Danny Huang <dahuang@xxxxxxxxxx>
Date: Wed Dec 1 13:37:28 2010 -0700
regulator: tps6586x: Add missing bit mask generation
Change-Id: I76eaceb31b56264f6978af15db1e6fc7e2e01b5a
Signed-off-by: Danny Huang <dahuang@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olofj@xxxxxxxxxxxx>
Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
(Split into separate patches)
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 7c1a70e99819d723cde610d83de48a8ab01ec609
Author: Martin Persson <martin.persson@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:13:42 2010 +0100
ux500: Add cpufreq support for u8500
Signed-off-by: Martin Persson <martin.persson@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit e0befb23dfed4d4d0de9d97dac936ccc0bbec093
Author: Martin Persson <martin.persson@xxxxxxxxxxxxxx>
Date: Wed Dec 8 15:13:28 2010 +0100
ux500: Add prcmu support for operating points
Adds support in PRCMU driver to handle CPU and APE operating points.
Signed-off-by: Martin Persson <martin.persson@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit f3886f85cfde578f1d0ba6e40ac5f9d70043923b
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Wed Dec 8 10:05:34 2010 -0500
drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP
It should be required for all 7xx asics, but seems to cause
problems on some AGP 7xx chips.
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=19002
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Reported-and-Tested-by: Duncan <1i5t5.duncan@xxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 6f331623b99e1900e3a664bbe6e95406ff4b27f4
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Thu Dec 9 08:35:40 2010 +0300
drm: use after free in drm_queue_vblank_event()
The "e" pointer is either NULL or freed when we call
drm_vblank_put(dev, e->pipe) on the error path. Just pass the "pipe"
variable directly instead.
I changed another caller to use "pipe" as well for consistency.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit d70ab7f7ee0692efc880d772dc5c212174d67e3b
Merge: 58936b29c4c3e633a92bb918409fe1f0ca148144 2a7b1a00206895cfa444fd83477dca67a88a9d25
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 9 08:24:32 2010 +0100
Merge branch 'fix/asoc' into for-linus
commit 58936b29c4c3e633a92bb918409fe1f0ca148144
Merge: 2ff38c9fbaa86264ad819117ab137361067ab5f1 8a96b1e02029aa512199b1b6d281dcede9ed81f1
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 9 08:24:25 2010 +0100
Merge branch 'fix/hda' into for-linus
commit 8a96b1e02029aa512199b1b6d281dcede9ed81f1
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date: Thu Dec 9 07:17:27 2010 +0100
ALSA: HDA: Quirk for Dell Vostro 320 to make microphone work
BugLink: http://launchpad.net/497546
Confirmed that the ideapad model works better than the current
quirk for Dell Vostro 320.
Cc: stable@xxxxxxxxxx (2.6.35+)
Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit e76116ca9671e2e5239054a40303b94feab585ad
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Wed Dec 8 19:09:42 2010 -0500
drm/kms: remove spaces from connector names (v2)
Grub doesn't parse spaces in parameters correctly, so
this makes it impossible to force video= parameters
for kms on the grub kernel command line.
v2: shorten the names to make them easier to type.
Reported-by: Sergej Pupykin <ml@xxxxxxxxxxxx>
Cc: Sergej Pupykin <ml@xxxxxxxxxxxx>
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 589a594be1fb8815b3f18e517be696c48664f728
Author: NeilBrown <neilb@xxxxxxx>
Date: Thu Dec 9 17:02:14 2010 +1100
md: protect against NULL reference when waiting to start a raid10.
When we fail to start a raid10 for some reason, we call
md_unregister_thread to kill the thread that was created.
Unfortunately md_thread() will then make one call into the handler
(raid10d) even though md_wakeup_thread has not been called. This is
not safe and as md_unregister_thread is called after mddev->private
has been set to NULL, it will definitely cause a NULL dereference.
So fix this at both ends:
- md_thread should only call the handler if THREAD_WAKEUP has been
set.
- raid10 should call md_unregister_thread before setting things
to NULL just like all the other raid modules do.
This is applicable to 2.6.35 and later.
Cc: stable@xxxxxxxxxx
Reported-by: "Citizen" <citizen_lee@xxxxxxxxxx>
Signed-off-by: NeilBrown <neilb@xxxxxxx>
commit 1a855a0606653d2d82506281e2c686bacb4b2f45
Author: NeilBrown <neilb@xxxxxxx>
Date: Thu Dec 9 16:36:28 2010 +1100
md: fix bug with re-adding of partially recovered device.
With v0.90 metadata, a hot-spare does not become a full member of the
array until recovery is complete. So if we re-add such a device to
the array, we know that all of it is as up-to-date as the event count
would suggest, and so it a bitmap-based recovery is possible.
However with v1.x metadata, the hot-spare immediately becomes a full
member of the array, but it record how much of the device has been
recovered. If the array is stopped and re-assembled recovery starts
from this point.
When such a device is hot-added to an array we currently lose the 'how
much is recovered' information and incorrectly included it as a full
in-sync member (after bitmap-based fixup).
This is wrong and unsafe and could corrupt data.
So be more careful about setting saved_raid_disk - which is what
guides the re-adding of devices back into an array.
The new code matches the code in slot_store which does a similar
thing, which is encouraging.
This is suitable for any -stable kernel.
Reported-by: "Dailey, Nate" <Nate.Dailey@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: NeilBrown <neilb@xxxxxxx>
commit a035fc3e2531703b539f23bec4ca7943cfc69349
Author: NeilBrown <neilb@xxxxxxx>
Date: Thu Dec 9 16:17:51 2010 +1100
md: fix possible deadlock in handling flush requests.
As recorded in
https://bugzilla.kernel.org/show_bug.cgi?id=24012
it is possible for a flush request through md to hang. This is due to
an interaction between the recursion avoidance in
generic_make_request, the insistence in md of only having one flush
active at a time, and the possibility of dm (or md) submitting two
flush requests to a device from the one generic_make_request.
If a generic_make_request call into dm causes two flush requests to be
queued (as happens if the dm table has two targets - they get one
each), these two will be queued inside generic_make_request.
Assume they are for the same md device.
The first is processed and causes 1 or more flush requests to be sent
to lower devices. These get queued within generic_make_request too.
Then the second flush to the md device gets handled and it blocks
waiting for the first flush to complete. But it won't complete until
the two lower-device requests complete, and they haven't even been
submitted yet as they are on the generic_make_request queue.
The deadlock can be broken by using a separate thread to submit the
requests to lower devices. md has such a thread readily available:
md_wq.
So use it to submit these requests.
Reported-by: Giacomo Catenazzi <cate@xxxxxxxxxx>
Tested-by: Giacomo Catenazzi <cate@xxxxxxxxxx>
Signed-off-by: NeilBrown <neilb@xxxxxxx>
commit a7a07e69653acf8540daa1da053cd84bf86e8e66
Author: NeilBrown <neilb@xxxxxxx>
Date: Thu Dec 9 16:04:25 2010 +1100
md: move code in to submit_flushes.
submit_flushes is called from exactly one place.
Move the code that is before and after that call into
submit_flushes.
This has not functional change, but will make the next patch
smaller and easier to follow.
Signed-off-by: NeilBrown <neilb@xxxxxxx>
commit 2b74e12e567feb4163e32815bce0be57489e73b9
Author: NeilBrown <neilb@xxxxxxx>
Date: Thu Dec 9 15:59:01 2010 +1100
md: remove handling of flush_pending in md_submit_flush_data
None of the functions called between setting flush_pending to 1, and
atomic_dec_and_test can change flush_pending, or will anything
running in any other thread (as ->flush_bio is not NULL). So the
atomic_dec_and_test will always succeed.
So remove the atomic_sec and the atomic_dec_and_test.
Signed-off-by: NeilBrown <neilb@xxxxxxx>
commit 4e085e76cbe558b79b54cbab772f61185879bc64
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 18:42:23 2010 -0800
econet: Fix crash in aun_incoming().
Unconditional use of skb->dev won't work here,
try to fetch the econet device via skb_dst()->dev
instead.
Suggested by Eric Dumazet.
Reported-by: Nelson Elhage <nelhage@xxxxxxxxxxx>
Tested-by: Nelson Elhage <nelhage@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 18:41:03 2010 -0800
can: slcan: Add missing linux/sched.h include.
drivers/net/can/slcan.c: In function 'slcan_open':
drivers/net/can/slcan.c:568: error: dereferencing pointer to incomplete type
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7182afea8d1afd432a17c18162cc3fd441d0da93
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Wed Oct 13 09:13:12 2010 +0000
IB/uverbs: Handle large number of entries in poll CQ
In ib_uverbs_poll_cq() code there is a potential integer overflow if
userspace passes in a large cmd.ne. The calls to kmalloc() would
allocate smaller buffers than intended, leading to memory corruption.
There iss also an information leak if resp wasn't all used.
Unprivileged userspace may call this function, although only if an
RDMA device that uses this function is present.
Fix this by copying CQ entries one at a time, which avoids the
allocation entirely, and also by moving this copying into a function
that makes sure to initialize all memory copied to userspace.
Special thanks to Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
for his help and advice.
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
[ Monkey around with things a bit to avoid bad code generation by gcc
when designated initializers are used. - Roland ]
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 38ef4c2e437d11b5922723504b62824e96761459
Author: Serge E. Hallyn <serge@xxxxxxxxxx>
Date: Wed Dec 8 15:19:01 2010 +0000
syslog: check cap_syslog when dmesg_restrict
Eric Paris pointed out that it doesn't make sense to require
both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions.
So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict
is set.
(I'm also consolidating the now common error path)
Signed-off-by: Serge E. Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Acked-by: Eric Paris <eparis@xxxxxxxxxx>
Acked-by: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit be3e5b32462790b91c14d5869fbabaf5bfe7c901
Author: Peter Huewe <peterhuewe@xxxxxx>
Date: Tue Dec 7 23:44:33 2010 +0100
staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 597a1e7cccc9a5a0c47629267ac4b23bf8654578
Author: Peter Huewe <peterhuewe@xxxxxx>
Date: Tue Dec 7 23:38:02 2010 +0100
staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fb657461abf6842b8f7603370ff349f42814ac5b
Author: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Date: Wed Dec 8 13:18:04 2010 -0800
staging: brcm80211: fix documentation on installing firmware
Fix the documentation to have the current firmware filenames and use the
correct path.
Signed-off-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 818c07b894df8c3a6399800bcc632569cbc1e70a
Author: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Date: Wed Dec 8 13:09:49 2010 -0800
MAINTAINERS: update the entry for the BRCM80211 driver
This time with Signed-off-by ...
Removed Nohee, added Roland, Arend and Dowan. Changes were previously made
to drivers/staging/brcm80211{README,TODO}, but MAINTAINERS was missed.
Signed-off-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit baffa2f609863b879703c4b757d63558b2caebdb
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Wed Dec 8 20:16:02 2010 +0100
staging: brcm80211: removed unused struct wlc_ap_info
Code cleanup, reaction on the email from Dan Carpenter.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 08db27dc8d829e6df007cd079fdfa83584f66544
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:46 2010 +0100
staging: brcm80211: replaced typedef wlc_pub_t by struct wlc_pub
Code cleanup
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c41c858f695b6626e2fc0729edc0dd26b091f354
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:45 2010 +0100
staging: brcm80211: replaced typedef wlccore_t by struct wlccore
Code cleanup
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f077f7185ce19adc234b96c6f9fb815301770c26
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:44 2010 +0100
staging: brcm80211: replaced typedef wlcband_t by struct wlcband
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 17d766510b9630cfa723a6711e314565a048c234
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:43 2010 +0100
staging: brcm80211: replaced typedef hnddma_t by struct hnddma_pub
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6cdeaef203155bd7f12d362e5345323cfecde58a
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:42 2010 +0100
staging: brcm80211: replaced typedef wl_if_t by struct wl_if
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d65ddb58325ba2c4fef70f6c9ff542df81e5cdb3
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:41 2010 +0100
staging: brcm80211: replaced typedef bmac_pmq_t by struct bmac_pmq
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 299f8a4658e055d9f9713f7bed45860474544e68
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:40 2010 +0100
staging: brcm80211: replaced typedef antsel_info_t by struct antsel_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0e4934748948b5886c965fe56207b41d3abd58e7
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:39 2010 +0100
staging: brcm80211: replaced typedef wlc_ap_info_t by struct wlc_ap_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1f2fd4531d37553e4613f8f5e79cf199f47a82d2
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:38 2010 +0100
staging: brcm80211: replaced typedef ampdu_info_t by struct ampdu_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4dc79de1e39957575a784cf79bb214e54a42d44e
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:37 2010 +0100
staging: brcm80211: replaced typedef wlc_if_t by struct wlc_if
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 41224eb2dfe76fffc95cf9613c5bb2f4a518ddbf
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:36 2010 +0100
staging: brcm80211: removed unused macro's and typedefs from wpa.h
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0dedc37070ba1eabb2d1c7aa7899c7a9100ecf30
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Tue Dec 7 17:45:35 2010 +0100
staging: brcm80211: removed unused typedefs
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1226056d9608d241db4b558a0d88a347ad5c66ae
Author: Chen, Chien-Chia <machen@xxxxxxxxxx>
Date: Wed Dec 8 14:20:33 2010 -0800
Staging: rt3090: Fix RT3090 scan AP function
Fix RT3090 scan AP function.
This patch fixes the rt3090 wireless module failed
to scan AP around due to Windows driver causing
rt3090 module unable to scan AP in Linux.
Acked-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Signed-off-by: Chen, Chien-Chia <machen@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fe6c791570efe717946ea7b7dd50aec96b70d551
Merge: f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 f19872575ff7819a3723154657a497d9bca66b33
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 13:15:38 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
commit 393934c6b5c8d00f9d1ae20670d4a770f07a418a
Merge: 69f4aab1157d2a386e7ea4de77cc253629d1b4f2 0a54917c3fc295cb61f3fb52373c173fd3b69f48
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Dec 8 16:23:31 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
commit 69f4aab1157d2a386e7ea4de77cc253629d1b4f2
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Dec 7 15:13:23 2010 -0800
ath9k_hw: warn if we cannot change the power to the chip
Suspend requires the device to be in fullsleep otherwise upon
resume the device becomes unresponsive. We need to ensure
that when we want the device to go to sleep it yields to
the request, otherwise we'll have a useless devices upon
resume. Warn when changing the power fails as we need
to look into these issues.
Cc: Paul Stewart <pstew@xxxxxxxxxx>
Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ff9f0b639f33c92a89b0799263ab625444be6ee1
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Dec 7 15:13:22 2010 -0800
ath9k: skip ATH9K_INT_TIM_TIMER when we are idle
We should not be idle when we get the ATH9K_INT_TIM_TIMER,
otherwise its a sign of something broken in our design with
our idle state machine and mac80211. Skip these and WARN once
just in case this is triggerable.
Cc: Paul Stewart <pstew@xxxxxxxxxx>
Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b7e8941b2df518186d9f7679c007f6b619bb4e89
Author: Amitkumar Karwar <akarwar@xxxxxxxxxxx>
Date: Tue Dec 7 13:43:03 2010 -0800
cfg80211: add some element IDs in enum ieee80211_eid
1)WLAN_EID_BSS_COEX_2040
2)WLAN_EID_OVERLAP_BSS_SCAN_PARAM
3)WLAN_EID_EXT_CAPABILITY
Signed-off-by: Amitkumar Karwar <akarwar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 692d2c0fb36c02ad07d54641c26f48e644b27fbd
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 21:56:00 2010 +0100
b43: rename config option for N-PHY, drop BROKEN
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 82a52043c7801f83c7387deb45bf9323af04644b
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 21:55:59 2010 +0100
b43: fix split of N-PHY devices into supported and not (based on PHY rev)
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit abc1f7cd531f80a8468ab654f1dfd35d58bd2490
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 21:55:58 2010 +0100
b43: set TMS to work with current band width for N-PHY
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c7455cf988f06ba578cc6a680392426fce382ca1
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 21:55:57 2010 +0100
b43: N-PHY: silence warnings
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2f886750118c1781d3b53268bf25519aef1d4d71
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Tue Dec 7 11:27:01 2010 -0800
mac80211: Show max number of probe tries in debug message.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 155180803c95c7b14b355f60431bef45116c151e
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 09:42:07 2010 +0100
b43: flush PHY writes when needed
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 755fd183b89bc8a302669b6f35cd98faee473f7a
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 09:42:06 2010 +0100
b43: N-PHY: implement own maskset
This let us avoid double addressing while still having reg check.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f00fe7f6d14ab7bbd4655f55eae71bbd73ef766d
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 09:42:05 2010 +0100
b43: N-PHY: reorder and optimize tables initialization
Order was changed in specs. For writing arrays we have designed bulk function
which makes use of auto increment and do not write table address over and over.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 857581bdf1a3b36bfd42609d6f5433bd83397127
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Dec 7 09:42:04 2010 +0100
b43: N-PHY: update init tables
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a9927ba3c5f3c5f6b0e8fa7557452335edeaf5fa
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Mon Dec 6 21:13:49 2010 -0800
ath9k: Check for NULL sta in ath_tx_start
It can be NULL according to docs, and logging showed it
to be NULL in practice.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 80d7e403c97b712e302ec37e9beceff1dbdc9402
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Fri Nov 19 12:40:26 2010 +0100
mac80211: Apply ht_opmode changes in ieee80211_change_bss
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 50b12f597be354a5a224f05c65c54c0667e57aec
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Fri Nov 19 12:40:25 2010 +0100
cfg80211: Add new BSS attribute ht_opmode
Add a new BSS attribute to allow hostapd to set the current HT opmode.
Otherwise drivers won't be able to set up protection for HT rates in
AP mode.
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f19872575ff7819a3723154657a497d9bca66b33
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Dec 7 12:20:47 2010 +0000
tcp: protect sysctl_tcp_cookie_size reads
Make sure sysctl_tcp_cookie_size is read once in
tcp_cookie_size_check(), or we might return an illegal value to caller
if sysctl_tcp_cookie_size is changed by another cpu.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Cc: William Allen Simpson <william.allen.simpson@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ad9f4f50fe9288bbe65b7dfd76d8820afac6a24c
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Dec 7 12:03:55 2010 +0000
tcp: avoid a possible divide by zero
sysctl_tcp_tso_win_divisor might be set to zero while one cpu runs in
tcp_tso_should_defer(). Make sure we dont allow a divide by zero by
reading sysctl_tcp_tso_win_divisor exactly once.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0a54917c3fc295cb61f3fb52373c173fd3b69f48
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Sun Dec 5 15:43:55 2010 +0000
orinoco: fix TKIP countermeasure behaviour
Enable the port when disabling countermeasures, and disable it on
enabling countermeasures.
This bug causes the response of the system to certain attacks to be
ineffective.
It also prevents wpa_supplicant from getting scan results, as
wpa_supplicant disables countermeasures on startup - preventing the
hardware from scanning.
wpa_supplicant works with ap_mode=2 despite this bug because the commit
handler re-enables the port.
The log tends to look like:
State: DISCONNECTED -> SCANNING
Starting AP scan for wildcard SSID
Scan requested (ret=0) - scan timeout 5 seconds
EAPOL: disable timer tick
EAPOL: Supplicant port status: Unauthorized
Scan timeout - try to get results
Failed to get scan results
Failed to get scan results - try scanning again
Setting scan request: 1 sec 0 usec
Starting AP scan for wildcard SSID
Scan requested (ret=-1) - scan timeout 5 seconds
Failed to initiate AP scan.
Reported by: Giacomo Comes <comes@xxxxxxxx>
Signed-off by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ba34fcee476d11e7c9df95932787a22a96ff6e68
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Sun Dec 5 15:45:58 2010 +0000
orinoco: clear countermeasure setting on commit
... and interface up.
In these situations, you are usually trying to connect to a new AP, so
keeping TKIP countermeasures active is confusing. This is already how
the driver behaves (inadvertently). However, querying SIOCGIWAUTH may
tell userspace that countermeasures are active when they aren't.
Clear the setting so that the reporting matches what the driver has
done..
Signed-off by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7e2447075690860e2cea96b119fc9cadbaa7e83c
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Dec 2 18:44:09 2010 +0100
mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs
mac80211 doesn't handle shared skbs correctly at the moment. As a result
a possible resize can trigger a BUG in pskb_expand_head.
[ 676.030000] Kernel bug detected[#1]:
[ 676.030000] Cpu 0
[ 676.030000] $ 0 : 00000000 00000000 819662ff 00000002
[ 676.030000] $ 4 : 81966200 00000020 00000000 00000020
[ 676.030000] $ 8 : 819662e0 800043c0 00000002 00020000
[ 676.030000] $12 : 3b9aca00 00000000 00000000 00470000
[ 676.030000] $16 : 80ea2000 00000000 00000000 00000000
[ 676.030000] $20 : 818aa200 80ea2018 80ea2000 00000008
[ 676.030000] $24 : 00000002 800ace5c
[ 676.030000] $28 : 8199a000 8199bd20 81938f88 80f180d4
[ 676.030000] Hi : 0000026e
[ 676.030000] Lo : 0000757e
[ 676.030000] epc : 801245e4 pskb_expand_head+0x44/0x1d8
[ 676.030000] Not tainted
[ 676.030000] ra : 80f180d4 ieee80211_skb_resize+0xb0/0x114 [mac80211]
[ 676.030000] Status: 1000a403 KERNEL EXL IE
[ 676.030000] Cause : 10800024
[ 676.030000] PrId : 0001964c (MIPS 24Kc)
[ 676.030000] Modules linked in: mac80211_hwsim rt2800lib rt2x00soc rt2x00pci rt2x00lib mac80211 crc_itu_t crc_ccitt cfg80211 compat arc4 aes_generic deflate ecb cbc [last unloaded: rt2800pci]
[ 676.030000] Process kpktgend_0 (pid: 97, threadinfo=8199a000, task=81879f48, tls=00000000)
[ 676.030000] Stack : ffffffff 00000000 00000000 00000014 00000004 80ea2000 00000000 00000000
[ 676.030000] 818aa200 80f180d4 ffffffff 0000000a 81879f78 81879f48 81879f48 00000018
[ 676.030000] 81966246 80ea2000 818432e0 80f1a420 80203050 81814d98 00000001 81879f48
[ 676.030000] 81879f48 00000018 81966246 818432e0 0000001a 8199bdd4 0000001c 80f1b72c
[ 676.030000] 80203020 8001292c 80ef4aa2 7f10b55d 801ab5b8 81879f48 00000188 80005c90
[ 676.030000] ...
[ 676.030000] Call Trace:
[ 676.030000] [<801245e4>] pskb_expand_head+0x44/0x1d8
[ 676.030000] [<80f180d4>] ieee80211_skb_resize+0xb0/0x114 [mac80211]
[ 676.030000] [<80f1a420>] ieee80211_xmit+0x150/0x22c [mac80211]
[ 676.030000] [<80f1b72c>] ieee80211_subif_start_xmit+0x6f4/0x73c [mac80211]
[ 676.030000] [<8014361c>] pktgen_thread_worker+0xfac/0x16f8
[ 676.030000] [<8002ebe8>] kthread+0x7c/0x88
[ 676.030000] [<80008e0c>] kernel_thread_helper+0x10/0x18
[ 676.030000]
[ 676.030000]
[ 676.030000] Code: 24020001 10620005 2502001f <0200000d> 0804917a 00000000 2502001f 00441023 00531021
Fix this by making a local copy of shared skbs prior to mangeling them.
To avoid copying the skb unnecessarily move the skb_copy call below the
checks that don't need write access to the skb.
Also, move the assignment of nh_pos and h_pos below the skb_copy to point
to the correct skb.
It would be possible to avoid another resize of the copied skb by using
skb_copy_expand instead of skb_copy but that would make the patch more
complex. Also, shared skbs are a corner case right now, so the resize
shouldn't matter much.
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f933ebed7888a9a7d73ebeeb6bcbb3f710c423b4
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Wed Dec 1 12:30:27 2010 +0530
ath9k_htc: Fix suspend/resume
The HW has to be set to FULLSLEEP mode during suspend,
when no interface has been brought up. Not doing this would
break resume, as the chip won't be powered up at all.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b93996cf67d47597efad03d5e5431c7b8b11e688
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Tue Dec 7 13:37:56 2010 -0800
ath5k: Put the right tsf value in mesh beacons
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c26d5339424e68f8643cf3448986c4f77b941a65
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Tue Dec 7 13:36:55 2010 -0800
ath5k: Prevent mesh interfaces from being counted as ad-hoc
This results in an erroneus num_adhoc_vifs count, as the this counter
was incremented but not decremented for mesh interfaces.
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d82b577b8cf89a17cab932db272769dfc69a98df
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Tue Dec 7 13:35:55 2010 -0800
ath5k: Fix beaconing in mesh mode
This patch fixes the oops below when attempting to bring up a mesh
interface on ath5k hardware.
[ 128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197!
[ 128.933099] invalid opcode: 0000 [#1]
(...)
[ 128.933099] Call Trace:
[ 128.933099] [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k]
[ 128.933099] [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
[ 128.933099] [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173
[ath5k]
[ 128.933099] [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e
[mac80211]
[ 128.933099] [<c82f073e>] ?
ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
[ 128.933099] [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
[ 128.933099] [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e
[mac80211]
[ 128.933099] [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211]
[ 128.933099] [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211]
[ 128.933099] [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 229bd792be0bad245b78ed8f119952733a4752e5
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Tue Dec 7 18:50:42 2010 +0000
orinoco: initialise priv->hw before assigning the interrupt
The interrupt handler takes a lock - but since commit bcad6e80f3f this
lock goes through an indirection specified in the hermes_t structure.
We must therefore initialise the structure before setting up the
interrupt handler.
Fix orinoco_cs and spectrum_cs
<https://bugzilla.kernel.org/show_bug.cgi?id=23932>
Bisected by: Matt Domsch <Matt_Domsch@xxxxxxxx>
Signed-off by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c7757fdb41dfcf6add9f8a4576eb85aa5e77a4eb
Author: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 12:19:14 2010 -0800
ehea: Fixing LRO configuration
In order to set LRO on ehea, the user must set a module parameter, which
is not the standard way to do so. This patch adds a way to set LRO using
the ethtool tool.
Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 67631510a318d5a930055fe927607f483716e100
Author: Tom Herbert <therbert@xxxxxxxxxx>
Date: Wed Dec 8 12:16:33 2010 -0800
tcp: Replace time wait bucket msg by counter
Rather than printing the message to the log, use a mib counter to keep
track of the count of occurences of time wait bucket overflow. Reduces
spam in logs.
Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 171995e5d82dcc92bea37a7d2a2ecc21068a0f19
Author: Apollon Oikonomopoulos <apollon@xxxxxxxxxxxx>
Date: Tue Dec 7 09:43:30 2010 +0000
x25: decrement netdev reference counts on unload
x25 does not decrement the network device reference counts on module unload.
Thus unregistering any pre-existing interface after unloading the x25 module
hangs and results in
unregister_netdevice: waiting for tap0 to become free. Usage count = 1
This patch decrements the reference counts of all interfaces in x25_link_free,
the way it is already done in x25_link_device_down for NETDEV_DOWN events.
Signed-off-by: Apollon Oikonomopoulos <apollon@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 408cc293c29ada769ae772420a39961320da1854
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date: Mon Dec 6 03:00:59 2010 +0000
driver/net/benet: fix be_cmd_multicast_set() memcpy bug
Regarding benet be_cmd_multicast_set() function, now using
netdev_for_each_mc_addr() helper for mac address copy, but
when copying to req->mac[] did not increase of the index.
Cc: Sathya Perla <sathyap@xxxxxxxxxxxxxxxxx>
Cc: Subbu Seetharaman <subbus@xxxxxxxxxxxxxxxxx>
Cc: Sarveshwar Bandi <sarveshwarb@xxxxxxxxxxxxxxxxx>
Cc: Ajit Khaparde <ajitk@xxxxxxxxxxxxxxxxx>
Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e8d34a884e4ff118920bb57664def8a73b1b784f
Author: Michal Marek <mmarek@xxxxxxx>
Date: Mon Dec 6 02:39:12 2010 +0000
l2tp: Fix modalias of l2tp_ip
Using the SOCK_DGRAM enum results in
"net-pf-2-proto-SOCK_DGRAM-type-115", so use the numeric value like it
is done in net/dccp.
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad
Author: Nelson Elhage <nelhage@xxxxxxxxxxx>
Date: Wed Dec 8 10:13:55 2010 -0800
econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
We need to drop the mutex and do a dev_put, so set an error code and break like
the other paths, instead of returning directly.
Signed-off-by: Nelson Elhage <nelhage@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 083384755252cde25af187acf1807a0f5edb901f
Merge: 35d9b0c906ad92d32a0b8db5daa6fabfcc2f068d e8f149924a3111015d16dfbbb4816cfc75ba53cd
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 12:13:23 2010 -0800
Merge branch 'sfc-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6
commit 8316f33766a82907c694267ff911e45e256f09f9
Author: David Flynn <davidf@xxxxxxxxxxxx>
Date: Wed Dec 8 16:10:21 2010 +0000
drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI converter
The DisplayPort standard (1.1a) states that:
The I2C-over-AUX Reply field is valid only when Native AUX CH Reply
field is AUX_ACK (00). When Native AUX CH Reply field is not 00, then,
I2C-over-AUX Reply field must be 00 and be ignored.
This fixes broken EDID reading when using an active DisplayPort to
duallink DVI converter. If the AUX CH replier chooses to defer the
transaction, a short read occurs and erroneous data is returned as
the i2c reply due to a lack of length checking and failure to check
for AUX ACK.
As a result, broken EDIDs can look like:
0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef
00: bc bc bc ff bc bc bc ff bc bc bc ac bc bc bc 45 ???.???.???????E
10: bc bc bc 10 bc bc bc 34 bc bc bc ee bc bc bc 4c ???????4???????L
20: bc bc bc 50 bc bc bc 00 bc bc bc 40 bc bc bc 00 ???P???.???@???.
30: bc bc bc 01 bc bc bc 01 bc bc bc a0 bc bc bc 40 ???????????????@
40: bc bc bc 00 bc bc bc 00 bc bc bc 00 bc bc bc 55 ???.???.???.???U
50: bc bc bc 35 bc bc bc 31 bc bc bc 20 bc bc bc fc ???5???1??? ????
60: bc bc bc 4c bc bc bc 34 bc bc bc 46 bc bc bc 00 ???L???4???F???.
70: bc bc bc 38 bc bc bc 11 bc bc bc 20 bc bc bc 20 ???8??????? ???
80: bc bc bc ff bc bc bc ff bc bc bc ff bc bc bc ff ???.???.???.???.
...
which can lead to:
[drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder
[drm:drm_edid_block_valid] *ERROR* Raw EDID:
<3>30 30 30 30 30 30 30 32 38 32 30 32 63 63 31 61 000000028202cc1a
<3>28 00 02 8c 00 00 00 00 18 00 00 00 00 00 00 00 (...............
<3>20 4c 61 73 74 20 62 65 61 63 6f 6e 3a 20 33 32 Last beacon: 32
<3>32 30 6d 73 20 61 67 6f 46 00 05 8c 00 00 00 00 20ms agoF.......
<3>36 00 00 00 00 00 00 00 00 0c 57 69 2d 46 69 20 6.........Wi-Fi
<3>52 6f 75 74 65 72 01 08 82 84 8b 96 24 30 48 6c Router......$0Hl
<3>03 01 01 06 02 00 00 2a 01 00 2f 01 00 32 04 0c .......*../..2..
<3>12 18 60 dd 09 00 10 18 02 00 00 01 00 00 18 00 ..`.............
Signed-off-by: David Flynn <davidf@xxxxxxxxxxxx>
[ickle: fix up some surrounding checkpatch warnings]
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit c277443cfc29b1623b4923219ff0bdb48b91b589
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Dec 8 15:29:02 2010 +0100
perf: Stop all counters on reboot
Use the reboot notifier to detach all running counters on reboot, this
solves a problem with kexec where the new kernel doesn't expect
running counters (rightly so).
It will however decrease the coverage of the NMI watchdog. Making a
kexec specific reboot notifier callback would be best, however that
would require touching all notifier callback handlers as they are not
properly structured to deal with new state.
As a compromise, place the perf reboot notifier at the very last
position in the list.
Reported-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Jason Wessel <jason.wessel@xxxxxxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c079c791c5a0627fc7b752d31d72e274e0596ba8
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Thu Nov 25 08:56:17 2010 +0100
perf, amd: Remove the nb lock
Since all the hotplug stuff is serialized by the hotplug mutex,
do away with the amd_nb_lock.
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 40dc11ffb35e8c4e8fa71092048e0f8de9db758c
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Nov 26 17:22:16 2010 +0100
printk: Use this_cpu_{read|write} api on printk_pending
__get_cpu_var() is a bit inefficient, lets use __this_cpu_read() and
__this_cpu_write() to manipulate printk_pending.
printk_needs_cpu(cpu) is called only for the current cpu :
Use faster __this_cpu_read().
Remove the redundant unlikely on (cpu_is_offline(cpu)) test:
# size kernel/printk.o*
text data bss dec hex filename
9942 756 263488 274186 42f0a kernel/printk.o.new
9990 756 263488 274234 42f3a kernel/printk.o.old
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290788536.2855.237.camel@edumazet-laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 806c09a7db457be3758e14b1f152761135d89af5
Author: Dario Faggioli <raistlin@xxxxxxxx>
Date: Tue Nov 30 19:51:33 2010 +0100
sched: Make pushable_tasks CONFIG_SMP dependant
As noted by Peter Zijlstra at https://lkml.org/lkml/2010/11/10/391
(while reviewing other stuff, though), tracking pushable tasks
only makes sense on SMP systems.
Signed-off-by: Dario Faggioli <raistlin@xxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Acked-by: Gregory Haskins <ghaskins@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291143093.2697.298.camel@Palantir>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 8e9255e6a2141e050d51bc4d96dbef494a87d653
Merge: 5091faa449ee0b7d73bc296a93bca9540fc51d0a 6313e3c21743cc88bb5bd8aa72948ee1e83937b6
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 8 20:15:26 2010 +0100
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit dbd87b5af055a0cc9bba17795c9a2b0d17795389
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Dec 1 10:11:09 2010 +0100
nohz: Fix get_next_timer_interrupt() vs cpu hotplug
This fixes a bug as seen on 2.6.32 based kernels where timers got
enqueued on offline cpus.
If a cpu goes offline it might still have pending timers. These will
be migrated during CPU_DEAD handling after the cpu is offline.
However while the cpu is going offline it will schedule the idle task
which will then call tick_nohz_stop_sched_tick().
That function in turn will call get_next_timer_intterupt() to figure
out if the tick of the cpu can be stopped or not. If it turns out that
the next tick is just one jiffy off (delta_jiffies == 1)
tick_nohz_stop_sched_tick() incorrectly assumes that the tick should
not stop and takes an early exit and thus it won't update the load
balancer cpu.
Just afterwards the cpu will be killed and the load balancer cpu could
be the offline cpu.
On 2.6.32 based kernel get_nohz_load_balancer() gets called to decide
on which cpu a timer should be enqueued (see __mod_timer()). Which
leads to the possibility that timers get enqueued on an offline cpu.
These will never expire and can cause a system hang.
This has been observed 2.6.32 kernels. On current kernels
__mod_timer() uses get_nohz_timer_target() which doesn't have that
problem. However there might be other problems because of the too
early exit tick_nohz_stop_sched_tick() in case a cpu goes offline.
The easiest and probably safest fix seems to be to let
get_next_timer_interrupt() just lie and let it say there isn't any
pending timer if the current cpu is offline.
I also thought of moving migrate_[hr]timers() from CPU_DEAD to
CPU_DYING, but seeing that there already have been fixes at least in
the hrtimer code in this area I'm afraid that this could add new
subtle bugs.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101201091109.GA8984@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f26f9aff6aaf67e9a430d16c266f91b13a5bff64
Author: Mike Galbraith <efault@xxxxxx>
Date: Wed Dec 8 11:05:42 2010 +0100
Sched: fix skip_clock_update optimization
idle_balance() drops/retakes rq->lock, leaving the previous task
vulnerable to set_tsk_need_resched(). Clear it after we return
from balancing instead, and in setup_thread_stack() as well, so
no successfully descheduled or never scheduled task has it set.
Need resched confused the skip_clock_update logic, which assumes
that the next call to update_rq_clock() will come nearly immediately
after being set. Make the optimization robust against the waking
a sleeper before it sucessfully deschedules case by checking that
the current task has not been dequeued before setting the flag,
since it is that useless clock update we're trying to save, and
clear unconditionally in schedule() proper instead of conditionally
in put_prev_task().
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Reported-by: Bjoern B. Brandenburg <bbb.lst@xxxxxxxxx>
Tested-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
LKML-Reference: <1291802742.1417.9.camel@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0f004f5a696a9434b7214d0d3cbd0525ee77d428
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Tue Nov 30 19:48:45 2010 +0100
sched: Cure more NO_HZ load average woes
There's a long-running regression that proved difficult to fix and
which is hitting certain people and is rather annoying in its effects.
Damien reported that after 74f5187ac8 (sched: Cure load average vs
NO_HZ woes) his load average is unnaturally high, he also noted that
even with that patch reverted the load avgerage numbers are not
correct.
The problem is that the previous patch only solved half the NO_HZ
problem, it addressed the part of going into NO_HZ mode, not of
comming out of NO_HZ mode. This patch implements that missing half.
When comming out of NO_HZ mode there are two important things to take
care of:
- Folding the pending idle delta into the global active count.
- Correctly aging the averages for the idle-duration.
So with this patch the NO_HZ interaction should be complete and
behaviour between CONFIG_NO_HZ=[yn] should be equivalent.
Furthermore, this patch slightly changes the load average computation
by adding a rounding term to the fixed point multiplication.
Reported-by: Damien Wyart <damien.wyart@xxxxxxx>
Reported-by: Tim McGrath <tmhikaru@xxxxxxxxx>
Tested-by: Damien Wyart <damien.wyart@xxxxxxx>
Tested-by: Orion Poplawski <orion@xxxxxxxxxxxxx>
Tested-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Cc: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
LKML-Reference: <1291129145.32004.874.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5167695753c63444a9e6cbbef136200a16c7a225
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Tue Dec 7 14:18:20 2010 +0100
perf: Fix duplicate events with multiple-pmu vs software events
Because the multi-pmu bits can share contexts between struct pmu
instances we could get duplicate events by iterating the pmu list.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e726f3c368e7c1919a7166ec09c5705759f1a69d
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Mon Dec 6 16:20:25 2010 +0100
amd64_edac: Fix interleaving check
When matching error address to the range contained by one memory node,
we're in valid range when node interleaving
1. is disabled, or
2. enabled and when the address bits we interleave on match the
interleave selector on this node (see the "Node Interleaving" section in
the BKDG for an enlightening example).
Thus, when we early-exit, we need to reverse the compound logic
statement properly.
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 76f04f2591e60fa76e70a2736965bc810bf1c764
Author: Andrei Konovalov <akonovalov@xxxxxxxxxx>
Date: Tue Dec 7 07:48:00 2010 -0500
EDAC: Correct MiB_TO_PAGES() macro
This corrects the misprint introduced when moving '#if
PAGE_SHIFT' from i7core_edac.c to edac_core.h (commit
e9144601d364d5b81f3e63949337f8507eb58dca)
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Andrei Konovalov <akonovalov@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit bb31b3122c0dd07d2d958da17a50ad771ce79e2b
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Thu Dec 2 17:48:35 2010 +0100
EDAC: Fix workqueue-related crashes
00740c58541b6087d78418cebca1fcb86dc6077d changed edac_core to
un-/register a workqueue item only if a lowlevel driver supplies a
polling routine. Normally, when we remove a polling low-level driver, we
go and cancel all the queued work. However, the workqueue unreg happens
based on the ->op_state setting, and edac_mc_del_mc() sets this to
OP_OFFLINE _before_ we cancel the work item, leading to NULL ptr oops on
the workqueue list.
Fix it by putting the unreg stuff in proper order.
Cc: <stable@xxxxxxxxxx> #36.x
Reported-and-tested-by: Tobias Karnat <tobias.karnat@xxxxxxxxxxxxxx>
LKML-Reference: <1291201307.3029.21.camel@Tobias-Karnat>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit f8bf5681cf15f77692c8ad8cb95d059ff7c622c9
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Tue Dec 7 04:49:06 2010 +0000
isdn/hisax: fix compiler warning on hisax_pci_tbl
Annotate hisax_pci_tbl as '__used' to fix following warning:
CC drivers/isdn/hisax/config.o
drivers/isdn/hisax/config.c:1920: warning: â??hisax_pci_tblâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 545c988b2018a593f24d291b66776a0d08525acd
Author: Suresh Jayaraman <sjayaraman@xxxxxxx>
Date: Mon Dec 6 13:45:50 2010 +0530
cifs: remove bogus remapping of error in cifs_filldir()
As the FIXME points out correctly, now filldir() itself returns -EOVERFLOW if
it not possible to represent the inode number supplied by the filesystem in
the field provided by userspace.
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 920b8d913bd3d963d5c88bca160a272b71e0c95a
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Tue Dec 7 05:05:18 2010 +0000
af_packet: fix freeing pg_vec twice on error path
It is introduced in:
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Tue Dec 7 04:26:16 2010 +0000
af_packet: eliminate pgv_to_page on some arches
Some arches don't need flush_dcache_page(), and don't implement it, so
we can eliminate pgv_to_page() calls on those arches.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 15c2d75f49189e1769c5e8f5f099d03d055c4910
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Dec 7 00:30:37 2010 +0000
net: call dev_queue_xmit_nit() after skb_dst_drop()
Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit()
after skb_dst_drop() in dev_hard_start_xmit().
When queueing a packet into af_packet socket, we drop dst anyway.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 62ab0812137ec4f9884dd7de346238841ac03283
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 6 20:50:09 2010 +0000
filter: constify sk_run_filter()
sk_run_filter() doesnt write on skb, change its prototype to reflect
this.
Fix two af_packet comments.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 38f49e8801565674c424896c3dcb4228410b43a8
Author: Roger Luethi <rl@xxxxxxxxxxx>
Date: Mon Dec 6 00:59:40 2010 +0000
via-rhine: hardware VLAN support
This patch adds VLAN hardware support for Rhine chips.
The driver uses up to 3 additional bytes of buffer space when extracting
802.1Q headers; PKT_BUF_SZ should still be sufficient.
The initial code was provided by David Lv. I reworked it to use standard
kernel facilities. Coding style clean up mostly follows via-velocity.
Adapted to new interface for VLAN acceleration (per request of Jesse Gross).
Signed-off-by: David Lv <DavidLv@xxxxxxxxxxxxxx>
Signed-off-by: Roger Luethi <rl@xxxxxxxxxxx>
drivers/net/via-rhine.c | 326 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 312 insertions(+), 14 deletions(-)
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 941666c2e3e0f9f6a1cb5808d02352d445bd702c
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Dec 5 01:23:53 2010 +0000
net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit :
> Hmm..
>
> If somebody can explain why RTNL is held in arp_ioctl() (and therefore
> in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so
> that your patch can be applied.
>
> Right now it is not good, because RTNL wont be necessarly held when you
> are going to call arp_invalidate() ?
While doing this analysis, I found a refcount bug in llc, I'll send a
patch for net-2.6
Meanwhile, here is the patch for net-next-2.6
Your patch then can be applied after mine.
Thanks
[PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
dev_getbyhwaddr() was called under RTNL.
Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use
RCU locking instead of RTNL.
Change arp_ioctl() to use RCU instead of RTNL locking.
Note: this fix a dev refcount bug in llc
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a2d4b65d477aad1fe8c7218781a031fa9cf5abfc
Merge: 01b0c5cfb23f19837650aa53495ace6d0fd7d3f8 04910265078f08a73208beab70ed2a3cce4a919f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 10:01:00 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit 35d9b0c906ad92d32a0b8db5daa6fabfcc2f068d
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Dec 5 02:03:26 2010 +0000
llc: fix a device refcount imbalance
Le dimanche 05 décembre 2010 à 12:23 +0100, Eric Dumazet a écrit :
> Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit :
>
> > Hmm..
> >
> > If somebody can explain why RTNL is held in arp_ioctl() (and therefore
> > in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so
> > that your patch can be applied.
> >
> > Right now it is not good, because RTNL wont be necessarly held when you
> > are going to call arp_invalidate() ?
>
> While doing this analysis, I found a refcount bug in llc, I'll send a
> patch for net-2.6
Oh well, of course I must first fix the bug in net-2.6, and wait David
pull the fix in net-next-2.6 before sending this rcu conversion.
Note: this patch should be sent to stable teams (2.6.34 and up)
[PATCH net-2.6] llc: fix a device refcount imbalance
commit abf9d537fea225 (llc: add support for SO_BINDTODEVICE) added one
refcount imbalance in llc_ui_bind(), because dev_getbyhwaddr() doesnt
take a reference on device, while dev_get_by_index() does.
Fix this using RCU locking. And since an RCU conversion will be done for
2.6.38 for dev_getbyhwaddr(), put the rcu_read_lock/unlock exactly at
their final place.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Cc: Octavian Purdila <opurdila@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 01b0c5cfb23f19837650aa53495ace6d0fd7d3f8
Author: Thiago Farina <tfransosi@xxxxxxxxx>
Date: Sat Dec 4 15:22:46 2010 +0000
net/9p/protocol.c: Remove duplicated macros.
Use the macros already provided by kernel.h file.
Signed-off-by: Thiago Farina <tfransosi@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 75c1c82566f23dd539fb7ccbf57a1caa7ba82628
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Sat Dec 4 14:09:08 2010 +0000
ifb: goto resched directly if error happens and dp->tq isn't empty
If we break the loop when there are still skbs in tq and no skb in
rq, the skbs will be left in txq until new skbs are enqueued into rq.
In rare cases, no new skb is queued, then these skbs will stay in rq
forever.
After this patch, if tq isn't empty when we break the loop, we goto
resched directly.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: Jamal Hadi Salim <hadi@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa9421041128abb4d269ee1dc502ff65fb3b7d69
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Sat Dec 4 02:31:41 2010 +0000
net: init ingress queue
The dev field of ingress queue is forgot to initialized, then NULL
pointer dereference happens in qdisc_alloc().
Move inits of tx queues to netif_alloc_netdev_queues().
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b1afde60f2b9ee8444fba4e012dc99a3b28d224d
Author: Nandita Dukkipati <nanditad@xxxxxxxxxx>
Date: Fri Dec 3 13:33:44 2010 +0000
tcp: Bug fix in initialization of receive window.
The bug has to do with boundary checks on the initial receive window.
If the initial receive window falls between init_cwnd and the
receive window specified by the user, the initial window is incorrectly
brought down to init_cwnd. The correct behavior is to allow it to
remain unchanged.
Signed-off-by: Nandita Dukkipati <nanditad@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ce9aeb583a1071304d0e4ab8db600bfc8a6a1b44
Author: Dimitris Michailidis <dm@xxxxxxxxxxx>
Date: Fri Dec 3 10:39:04 2010 +0000
cxgb4: fix MAC address hash filter
Fix the calculation of the inexact hash-based MAC address filter.
It's 64 bits but current code is missing a ULL. Results in filtering out
some legitimate packets.
Signed-off-by: Dimitris Michailidis <dm@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a1044e36e457fb6dbdf90ce756d578b251d99b5e
Author: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
Date: Thu Dec 2 10:57:59 2010 +0000
can: add slcan driver for serial/USB-serial CAN adapters
This patch adds support for serial/USB-serial CAN adapters implementing the
LAWICEL ASCII protocol for CAN frame transport over serial lines.
The driver implements the SLCAN line discipline and is heavily based on the
slip.c driver. Therefore the code style remains similar to slip.c to be able
to apply changes of the SLIP driver to the SLCAN driver easily.
For more details see the slcan Kconfig entry.
Signed-off-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 58e481f66e31e9976558f3e4f709baf9201052fe
Author: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Date: Thu Dec 2 02:45:08 2010 +0000
atm: lanai: use kernel's '%pM' format option to print MAC
Signed-off-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Cc: Chas Williams <chas@xxxxxxxxxxxxxxxx>
Cc: linux-atm-general@xxxxxxxxxxxxxxxxxxxxx
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c1ac3ffcd0bc7e9617f62be8c7043d53ab84deac
Author: Neil Brown <neilb@xxxxxxx>
Date: Thu Dec 2 11:14:30 2010 +1100
nfsd: Fix possible BUG_ON firing in set_change_info
If vfs_getattr in fill_post_wcc returns an error, we don't
set fh_post_change.
For NFSv4, this can result in set_change_info triggering a BUG_ON.
i.e. fh_post_saved being zero isn't really a bug.
So:
- instead of BUGging when fh_post_saved is zero, just clear ->atomic.
- if vfs_getattr fails in fill_post_wcc, take a copy of i_ctime anyway.
This will be used i seg_change_info, but not overly trusted.
- While we are there, remove the pointless 'if' statements in set_change_info.
There is no harm setting all the values.
Signed-off-by: NeilBrown <neilb@xxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
commit e83293233faf6e49870e7bfdcddf5374cb463d54
Author: Kim Lilliestierna XX <kim.xx.lilliestierna@xxxxxxxxxxxxxx>
Date: Tue Nov 30 09:11:22 2010 +0000
CAIF: Fix U5500 compile error for shared memory driver
Rearrange pr_fmt so it compiles.
Signed-off-by: Sjur Braendeland <sjur.brandeland@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4f58605e6b7ae30a0d048af6a868582768e6754c
Merge: b8eb3a1046f68a5b8f284830d971c62688cd606b d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 8 08:13:01 2010 -0800
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 73c1160ce377d8fc6d84cb630ebf9658808bec49
Author: Andre Przywara <andre.przywara@xxxxxxx>
Date: Wed Dec 1 12:17:44 2010 +0100
KVM: enlarge number of possible CPUID leaves
Currently the number of CPUID leaves KVM handles is limited to 40.
My desktop machine (AthlonII) already has 35 and future CPUs will
expand this well beyond the limit. Extend the limit to 80 to make
room for future processors.
KVM-Stable-Tag.
Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
commit 24d1b15f72abe3465e871d11cfc9dc34d1aab8b2
Author: Joerg Roedel <joerg.roedel@xxxxxxx>
Date: Tue Dec 7 17:15:05 2010 +0100
KVM: SVM: Do not report xsave in supported cpuid
To support xsave properly for the guest the SVM module need
software support for it. As long as this is not present do
not report the xsave as supported feature in cpuid.
As a side-effect this patch moves the bit() helper function
into the x86.h file so that it can be used in svm.c too.
KVM-Stable-Tag.
Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
commit 3ea3aa8cf67d3bbe00a19b6a4013d19efa7d0f41
Author: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Date: Wed Dec 8 10:49:43 2010 +0800
KVM: Fix OSXSAVE after migration
CPUID's OSXSAVE is a mirror of CR4.OSXSAVE bit. We need to update the CPUID
after migration.
KVM-Stable-Tag.
Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
commit 8b0f1840a46449e1946fc88860ef3ec8d6b1c2c7
Author: Gabriele Gorla <gorlik@xxxxxxxxxxxxxxx>
Date: Wed Dec 8 16:27:22 2010 +0100
hwmon: (adm1026) Allow 1 as a valid divider value
Allow 1 as a valid div value as specified in the ADM1026 datasheet.
Signed-off-by: Gabriele Gorla <gorlik@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
commit 52bc9802ce849d0d287cc5fe76d06b0daa3986ca
Author: Gabriele Gorla <gorlik@xxxxxxxxxxxxxxx>
Date: Wed Dec 8 16:27:22 2010 +0100
hwmon: (adm1026) Fix setting fan_div
Prevent setting fan_div from stomping on other fans that share the
same I2C register.
Signed-off-by: Gabriele Gorla <gorlik@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
commit 6229cdb23648d0c2875b3fb102cdaf4bf08fcfa4
Author: Jean Delvare <khali@xxxxxxxxxxxx>
Date: Wed Dec 8 16:27:22 2010 +0100
hwmon: (it87) Fix manual fan speed control on IT8721F
The manual fan speed control logic of the IT8721F is much different
from what older devices had. Update the code to properly support that.
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Acked-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
commit d9319560b86839506c2011346b1f2e61438a3c73
Author: Jun Nie <njun@xxxxxxxxxxx>
Date: Tue Dec 7 14:03:38 2010 +0800
Bluetooth: add NULL pointer check in HCI
If we fail to find a hci device pointer in hci_uart, don't try
to deref the NULL one we do have.
Signed-off-by: Jun Nie <njun@xxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 6313e3c21743cc88bb5bd8aa72948ee1e83937b6
Merge: 6dde39be39e636c1d41e73590668d5903b11535b e7a3481c0246c8e45e79c629efd63b168e91fcda 18483b81ee7e70ee68d4b18be618be5cfcc0b290 61ab25447ad6334a74e32f60efb135a3467223f8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 06:40:59 2010 -0800
Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/pvclock: Zero last_value on resume
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf record: Fix eternal wait for stillborn child
perf header: Don't assume there's no attr info if no sample ids is provided
perf symbols: Figure out start address of kernel map from kallsyms
perf symbols: Fix kallsyms kernel/module map splitting
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
nohz: Fix printk_needs_cpu() return value on offline cpus
printk: Fix wake_up_klogd() vs cpu hotplug
commit 6dde39be39e636c1d41e73590668d5903b11535b
Merge: f8f5d4f11dc7d321fb372b09fc8767069a18bf30 599bbb9de0fe9c494a223a34d790b353ad4d69f8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 06:34:39 2010 -0800
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: i915 cannot provide switcher services.
drm/radeon/kms: fix vram base calculation on rs780/rs880
drm/radeon/kms: fix formatting of vram and gtt info
drm/radeon/kms: forbid big bo allocation (fdo 31708) v3
drm: Don't try and disable an encoder that was never enabled
drm: Add missing drm_vblank_put() along queue vblank error path
drm/i915/dp: Only apply the workaround if the select is still active
drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo
drm/i915/lvds: Always restore panel-fitter when enabling the LVDS
drm/i915/ringbuffer: Only print an error on the second attempt to reset head
drm/i915: announce to userspace that the bsd ring is coherent
agp/intel: Fix wrong kunmap in i830_cleanup()
drm/i915: Factor in pixel-repeat in FDI M/N calculation
drm/i915: Death to the unnecessary 64bit divide
drm/i915: Clean conflicting modesetting registers upon init
drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI.
drm/i915: Always set the DP transcoder config to 8BPC.
commit f8f5d4f11dc7d321fb372b09fc8767069a18bf30
Merge: 2cedcc4f122934c3ad38dfb2a400b98a62703e6d 47d092352c132a2d0ee4156b5dca263eaad2c17f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 8 06:34:02 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - add new Bamboo PT (0xdb)
Input: add input driver for polled GPIO buttons
Input: turbografx - fix reference counting
Input: synaptics - fix handling of 2-button ClickPads
Input: wacom - add IDs for two new Bamboo PTs
Input: document struct input_absinfo
Input: add keycodes for touchpad on/off keys
Input: usbtouchscreen - add support for LG Flatron T1710B
commit 28257f7fdee0facc3b7f934e82c2485f27120d41
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 8 13:57:48 2010 +0000
ARM: io: simplify ioremap* and iounmap definitions
We don't need to repeat the same definitions of the ioremap*(),
once in terms of __arch_ioremap() and again in terms of __arm_ioremap().
Instead, if the platform hasn't provided an __arch_ioremap, define
this to be __arm_ioremap, and only define the ioremap*() set using
__arch_ioremap.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit a0b7bd0829194c03921915a68ee4a331ee394223
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Wed Dec 8 13:49:04 2010 +0000
ARM: io: make iounmap() a simple macro
Defining iounmap() with arguments prevents it from being used as a
function pointer, causing platforms to work around this. Instead,
define it to be a simple macro.
Do the same for __arch_io(re|un)map too.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5bea7660bba973dc5e8e9d92b11fb1dd5b524ebf
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Tue Dec 7 23:02:48 2010 -0800
HID: add hid_hw_open/close/power() handlers
Instead of exposing the guts of hid->ll_driver relationship to HID
sub-drivers provide these helpers to encapsulate the details.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 20e218a77fc0b0576817b6b204fe5b9391a5b209
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 17:18:46 2010 +0530
ux500: fix 5500 PER6 clock rate
The DB5500 PER6 clock rate is the same as the DB8500 one, i.e. 133.33 MHz.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 22039b7cc54a636f80434e9b149fcdec148c4cb9
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:56 2010 +0530
ux500: remove ambiguous irq macros
Remove the irq number macros which don't specify which SoC they're for.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 01afdd1353ca83904f430be4f6202d1a20912f4d
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:55 2010 +0530
ux500: rework gpio registration
Rework gpio registration to remove build-time
changing macros.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 8d568ae5362c00c5b0b8e61bceb1829c8051002e
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:54 2010 +0530
nomadik-gpio: use dev name if no name is specified
Platforms may choose not to provide an additional name for the GPIO
block.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit ec4a637d35d4e05d1f43a68d647fb2453891379a
Author: Carl-Johan Irekvist <carl-johan.irekvist@xxxxxxxxxxxxxx>
Date: Wed Dec 8 11:07:53 2010 +0530
ux500: fix uncompressor UART address for U5500
The uncompress code for zImage uses the UART to print status messages,
this was hard coded to use UART2 for the U8500 platform. This patch
checks at run time which platform it is run on. U5500 uses UART0 as
console UART.
Signed-off-by: Carl-Johan Irekvist <carl-johan.irekvist@xxxxxxxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit e8b1cc3a341684dfc02fd02f52308752b031668c
Author: Per Forlin <per.forlin@xxxxxxxxxx>
Date: Sun Dec 5 13:35:12 2010 +0100
ux500: Add DMA support for U5500
Add basic DMA configuration for u5500 supporting memcpy.
Make way for SDI0 dma support by setting SDI0 to -1,
indicating it will be configured in runtime.
Signed-off-by: Per Forlin <per.forlin@xxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit bab263e0ce624b05bdcf568e83a9ca4ce71f5e3d
Author: Per Forlin <per.forlin@xxxxxxxxxx>
Date: Sun Dec 5 12:49:03 2010 +0100
ux500: Add eMMC support in U5500.
U5500 now boots from sdi0 (onboard eMMC).
Change machine type to U5500.
Adjust uart and sdi0 clock rates for u5500.
All necessary clocks must be enabled before Linux starts because
there is no clock tree support in u5500 yet.
Signed-off-by: Per Forlin <per.forlin@xxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 9b04f8b9070e60fe9d335613ec538223c159a5c9
Author: Per Forlin <per.forlin@xxxxxxxxxx>
Date: Sun Dec 5 12:27:05 2010 +0100
ux500: Call prmcu_init only for u8500
PRCMU driver only supports u8500. Don't
initialize prcmu if running on u5500.
Signed-off-by: Per Forlin <per.forlin@xxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 592b2f254d68b6eb8665658cc7d8fc3cd61ebc94
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Fri Dec 3 20:35:52 2010 +0530
mach-ux500: clean up checkpatch spits
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit f306954c9b69aa21bd26724c59ac8c98b7d6e003
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date: Fri Dec 3 20:35:51 2010 +0530
mach-ux500: explicit enable MTU TCR in the kernel
PRCM_TCR enables the various timers in the system. This must be achieved
before any of the MTUs are usable for kernel usage. Explicit enabling of
this in the kernel makes it independent of bootloader actions.
Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit dacdc96cd33dee876c704aaed78f41515abe8a81
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Fri Dec 3 20:35:37 2010 +0530
nomadik-gpio: allow sleep mode dir/pull to differ from normal mode
In the nomadik GPIO pin configuration, allow the sleep mode direction
and pull configurations to differ from the ones for the normal state.
PIN_SLPM_PULL_*, PIN_SLPM_INPUT, PIN_SLPM_OUTPUT* macros are provided
for this.
Since the hardware does not allow seperate configurations for sleep mode
and normal mode, this is implemented by having software remux the
configurations as necessary.
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@xxxxxxxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit edaa86a4142474c99e4741efb6a916067978a1ee
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Thu Dec 2 12:05:18 2010 +0100
ux500: minor revision to the eMMC/SD config
A small fixup for the v1(.0) ASIC.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit a5de3dc240eb4e58f02b199ed529c17b65f9adfb
Author: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:00 2010 +0100
mach-ux500: AB8500 irqs is taken from header file
This patch removes the dublicated define for number of
interrupts and instead include the needed header file.
Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit fcbd458e95316fe5031f1b8eaf5e66ce8f3c3146
Author: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Date: Thu Dec 2 16:20:42 2010 +0100
ARM: ux500: prcmu db8500 v2 support
This patch adds support for db8500 chip version 2.
The TCDM memory address of the PRCMU is changed and
dynamic detection of that is added.
Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit fbf1eadf950da1f5f5ed2e454d2f191f90fe1ebe
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Wed Sep 29 19:46:32 2010 +0530
ux500: rework device registration
Change the Ux500 devices to be dynamically allocated and added by
calling functions instead of referencing structures, thereby allowing
5500 and other derivatives' support to be added without having to
duplicate structures, use fixup functions, or use compile-time macros.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 1bde668c8afa279d81b8f26b2120b906f38f7822
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Thu Sep 9 22:29:34 2010 +0200
ux500: use _cansleep GPIO functions
Similar to the patch to MMCI this silences similar messages from
the platform code.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit b8410a150fbc4e61a28032637dc0ae7e8609131d
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date: Mon Aug 9 19:18:17 2010 +0530
ux500: mop500: add TC35892 and MicroSD slot support
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
commit 0bbaee3a58c379c4f7bab9635c71d7bad9c422a2
Author: Anssi Hannula <anssi.hannula@xxxxxx>
Date: Tue Dec 7 21:19:23 2010 +0200
ALSA: hda - Reset sample sizes and max bitrates when reading ELD
When a new HDMI/DP device is plugged in, hdmi_update_short_audio_desc()
is called for every SAD (Short Audio Descriptor) in the ELD data. For
LPCM coding type SAD defines the supported sample sizes. For several
other coding types (such as AC-3), a maximum bitrate is defined.
The maximum bitrate and sample size fields are not always cleared.
Therefore, if a device is unplugged and a different one is plugged in,
and the coding types of some SAD positions differ between the devices,
the old max_bitrate or sample_bits values will persist if the new SADs
do not define those values.
The leftover max_bitrate and sample_bits do not cause any issues other
than wrongly showing up in eld#X.Y procfs file and kernel log.
Fix that by always clearing sample_bits and max_bitrate when reading
SADs.
Signed-off-by: Anssi Hannula <anssi.hannula@xxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 80f1dc7cc9341b160beb9c833edc1cd131f45a7f
Author: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Date: Tue Dec 7 09:12:14 2010 +0000
ARM: mach-shmobile: mackerel: Add Accelerometer sensor support
Signed-off-by: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 356c6f654d1c03e2ae45ef58b267e83dfd1a17f2
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Tue Dec 7 22:11:09 2010 -0800
Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE
This should allow loading this module automatically on systems that
have such device.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 599bbb9de0fe9c494a223a34d790b353ad4d69f8
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Mon Dec 6 12:42:46 2010 +1000
drm/i915: i915 cannot provide switcher services.
it has a DSM but the switcher is done via WMI.
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit b8a3d6bcbc85d7636d9f2adede8479ce2999c232
Author: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Date: Tue Dec 7 02:54:00 2010 -0800
Input: tca6416-keypad - add support for tca6408a
Support 8-bit tca6408a I/O expander as a keypad.
Signed-off-by: Tony SIM <chinyeow.sim.xt@xxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 47d092352c132a2d0ee4156b5dca263eaad2c17f
Author: David Foley <favux.is@xxxxxxxxx>
Date: Tue Dec 7 21:05:59 2010 -0800
Input: wacom - add new Bamboo PT (0xdb)
Adds new Bamboo Pen & Touch model - Bamboo P & T Special Edition
Medium (CTH661/L; Product ID = 0xdb).
Tested-by: Tobias Verbeke <tobias.verbeke@xxxxxxxxx>
Signed-off-by: David Foley <favux.is@xxxxxxxxx>
Acked-by: Ping Cheng <pingc@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 2df485a774ba59c3f43bfe84107672c1d9b731a0
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Dec 7 22:39:17 2010 -0500
nfs: remove extraneous and problematic calls to nfs_clear_request
When a nfs_page is freed, nfs_free_request is called which also calls
nfs_clear_request to clean out the lock and open contexts and free the
pagecache page.
However, a couple of places in the nfs code call nfs_clear_request
themselves. What happens here if the refcount on the request is still high?
We'll be releasing contexts and freeing pointers while the request is
possibly still in use.
Remove those bare calls to nfs_clear_context. That should only be done when
the request is being freed.
Note that when doing this, we need to watch out for tests of req->wb_page.
Previously, nfs_set_page_tag_locked() and nfs_clear_page_tag_locked()
would check the value of req->wb_page to figure out if the page is mapped
into the nfsi->nfs_page_tree. We now indicate the page is mapped using
the new bit PG_MAPPED in req->wb_flags .
Reported-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit e281f7ec95fbbf905c10e11c83231f3d9090c22f
Author: Aaro Koskinen <Aaro.Koskinen@xxxxxxxxx>
Date: Tue Nov 30 14:17:58 2010 +0000
arm: omap2: io: fix clk_get() error check
clk_get() return value should be checked with IS_ERR().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit ed2849d3ecfa339435818eeff28f6c3424300cec
Author: NeilBrown <neilb@xxxxxxx>
Date: Tue Nov 16 16:55:19 2010 +1100
sunrpc: prevent use-after-free on clearing XPT_BUSY
When an xprt is created, it has a refcount of 1, and XPT_BUSY is set.
The refcount is *not* owned by the thread that created the xprt
(as is clear from the fact that creators never put the reference).
Rather, it is owned by the absence of XPT_DEAD. Once XPT_DEAD is set,
(And XPT_BUSY is clear) that initial reference is dropped and the xprt
can be freed.
So when a creator clears XPT_BUSY it is dropping its only reference and
so must not touch the xprt again.
However svc_recv, after calling ->xpo_accept (and so getting an XPT_BUSY
reference on a new xprt), calls svc_xprt_recieved. This clears
XPT_BUSY and then svc_xprt_enqueue - this last without owning a reference.
This is dangerous and has been seen to leave svc_xprt_enqueue working
with an xprt containing garbage.
So we need to hold an extra counted reference over that call to
svc_xprt_received.
For safety, any time we clear XPT_BUSY and then use the xprt again, we
first get a reference, and the put it again afterwards.
Note that svc_close_all does not need this extra protection as there are
no threads running, and the final free can only be called asynchronously
from such a thread.
Signed-off-by: NeilBrown <neilb@xxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
commit 2cedcc4f122934c3ad38dfb2a400b98a62703e6d
Merge: 6142e05f30b101adeafb0d12e35983f44f68233e 812c4e40c27b6ea103ecfbf91d43654356629b81
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 17:13:50 2010 -0800
Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux
* 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
ARM: mini2440: Fix Kconfig to allow kernel to build
ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
ARM: S3C2443: Select properly ARM core type
ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
commit 812c4e40c27b6ea103ecfbf91d43654356629b81
Author: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
Date: Wed Dec 1 08:29:23 2010 +0200
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
Currently the {set,get}_pull callbacks of the s3c24xx_gpiocfg_default structure
are initalized via s3c_gpio_{get,set}pull_1up. This results in a linker
error when only CONFIG_CPU_S3C2442 is selected:
arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f4): undefined reference to
`s3c_gpio_getpull_1up'
arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f8): undefined reference to
`s3c_gpio_setpull_1up'
The s3c2442 has pulldowns instead of pullups compared to the s3c2440.
The method of controlling them is the same though.
So this patch modifies the existing s3c_gpio_{get,set}pull_1up helper functions
to take an additional parameter deciding whether the pin has a pullup or pulldown.
The s3c_gpio_{get,set}pull_1{down,up} functions then wrap that functions passing
either S3C_GPIO_PULL_UP or S3C_GPIO_PULL_DOWN.
Furthermore this patch sets up the s3c24xx_gpiocfg_default.{get,set}_pull fields
in the s3c244{0,2}_map_io function to the new pulldown helper functions.
Based on patch from "Lars-Peter Clausen" <lars@xxxxxxxxxx>
Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
commit a40c406cbdd28dcca3483065bc2ba794cf5aaab7
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Wed Dec 8 00:21:07 2010 +0200
Bluetooth: Make hci_send_to_sock usable for management control sockets
In order to send data to management control sockets the function should:
- skip checks intended for raw HCI data and stack internal events
- make sure RAW HCI data or stack internal events don't go to
management control sockets
In order to accomplish this the patch adds a new member to the bluetooth
skb private data to flag skb's that are destined for management control
sockets.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 0381101fd6a73c7d6b545044dc1472d019fc64e3
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Wed Dec 8 00:21:06 2010 +0200
Bluetooth: Add initial Bluetooth Management interface callbacks
Add initial code for handling Bluetooth Management interface messages.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit c02178d22b3ef2d18c38c96151600ee1c7ed94f0
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Wed Dec 8 00:21:05 2010 +0200
Bluetooth: Add Bluetooth Management interface definitions
Add initial definitions for the new Bluetooth Management interface to
the bluetooth headers.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 0de1b7e800188782973598158e0acbb9e08e6c99
Author: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
Date: Sat Oct 30 10:19:33 2010 +0800
nfs: kernel should return EPROTONOSUPPORT when not support NFSv4
When nfs client(kernel) don't support NFSv4, maybe user build
kernel without NFSv4, there is a problem.
Using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3
filesystem, mount should should success, but fail and get error:
"mount.nfs: an incorrect mount option was specified"
System call mount "nfs"(not "nfs4") with "vers=4",
if CONFIG_NFS_V4 is not defined, the "vers=4" will be parsed
as invalid argument and kernel return EINVAL to nfs-utils.
About that, we really want get EPROTONOSUPPORT rather than
EINVAL. This path make sure kernel parses argument success,
and return EPROTONOSUPPORT at nfs_validate_mount_data().
Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 21ac19d484a8ffb66f64487846c8d53afef04d2b
Author: Sergey Vlasov <vsu@xxxxxxxxxxx>
Date: Sun Nov 28 21:04:05 2010 +0000
NFS: Fix fcntl F_GETLK not reporting some conflicts
The commit 129a84de2347002f09721cda3155ccfd19fade40 (locks: fix F_GETLK
regression (failure to find conflicts)) fixed the posix_test_lock()
function by itself, however, its usage in NFS changed by the commit
9d6a8c5c213e34c475e72b245a8eb709258e968c (locks: give posix_test_lock
same interface as ->lock) remained broken - subsequent NFS-specific
locking code received F_UNLCK instead of the user-specified lock type.
To fix the problem, fl->fl_type needs to be saved before the
posix_test_lock() call and restored if no local conflicts were reported.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=23892
Tested-by: Alexander Morozov <amorozov@xxxxxxxxxxx>
Signed-off-by: Sergey Vlasov <vsu@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 08a22b392a141c201d7ed4d435de942aa853acd3
Author: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 10:42:16 2010 +0000
nfs: Discard ACL cache on mode update
An update of mode bits can result in ACL value being changed. We need
to mark the acl cache invalid when we update mode. Similarly we need
to update file attribute when we change ACL value
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 5de62b86d2f5cf3459cb02ecb7a4530787bbd898
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 7 16:26:58 2010 -0800
omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx
We need to divide the 15xx/16xx offset by 2 for 7xx. Use bank->stride
for that. This allows us to get rid of the duplicate defines for the
MPUIO registers.
Note that this will cause omap-keypad.c driver to not work on 7xx.
However, the right fix there is to move over to matrix_keypad instead
as suggested by Cory Maccarrone <darkstar6262@xxxxxxxxx> and
Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>.
Cc: Cory Maccarrone <darkstar6262@xxxxxxxxx>
Acked-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 77640aabd7558e43b65bc1a0311be2dbb42c3ff8
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:57 2010 -0800
OMAP: GPIO: Implement GPIO as a platform device
Implement GPIO as a platform device.
GPIO APIs are used in machine_init functions. Hence it is
required to complete GPIO probe before board_init. Therefore
GPIO device register and driver register are implemented as
postcore_initcalls.
omap_gpio_init() does nothing now and this function would be
removed in the next patch as it's usage is spread across most
of the board files.
Inorder to convert GPIO as platform device, modifications are
required in clockxxxx_data.c file for OMAP1 so that device names
can be used to obtain clock instead of getting clocks by
name/NULL ptr.
Use runtime pm APIs (pm_runtime_put*/pm_runtime_get*) for enabling
or disabling the clocks, modify sysconfig settings and remove usage
of clock FW APIs.
Note 1: Converting GPIO driver to use runtime PM APIs is not done as a
separate patch because GPIO clock names are different for various OMAPs
and are different for some of the banks in the same CPU. This would need
usage of cpu_is checks and bank id checks while using clock FW APIs in
the gpio driver. Hence while making GPIO a platform driver framework,
PM runtime APIs are used directly.
Note 2: While implementing GPIO as a platform device, pm runtime APIs
are used as mentioned above and modification is not done in gpio's
prepare for idle/ resume after idle functions. This would be done
in the next patch series and GPIO driver would be made to use dev_pm_ops
instead of sysdev_class in that series only.
Due to the above, the GPIO driver implicitly relies on
CM_AUTOIDLE = 1 on its iclk for power management to work, since the
driver never disables its iclk.
This would be taken care in the next patch series (see Note 3 below).
Refer to
http://www.mail-archive.com/linux-omap@xxxxxxxxxxxxxxx/msg39112.html
for more details.
Note 3: only pm_runtime_get_sync is called in gpio's probe() and
pm_runtime_put* is never called. This is to make the implementation
similar to the existing GPIO code. Another patch series would be sent
to correct this.
In OMAP3 and OMAP4 gpio's debounce clocks are optional clocks. They
are enabled/ disabled whenever required using clock framework APIs
TODO:
1. Cleanup the GPIO driver. Use function pointers and register
offest pointers instead of using hardcoded values
2. Remove all cpu_is_ checks and OMAP specific macros
3. Remove usage of gpio_bank array so that only
instance specific information is used in driver code
4. Rename 'method'/ avoid it's usage
5. Fix the non-wakeup gpios handling for OMAP2430, OMAP3 & OMAP4
6. Modify gpio's prepare for idle/ resume after idle functions
to use runtime pm implentation.
Signed-off-by: Charulatha V <charu@xxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Reviewed-by: Basak, Partha <p-basak2@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
[tony@xxxxxxxxxxx: updated for bank specific revision and updated boards]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit f547170fe721f145b7b7d6eb8b252e45f489dc4b
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:57 2010 -0800
OMAP2+: GPIO: device registration
Use omap_device_build() API to do platform_device_register of
GPIO devices. For OMAP2+ chips, the device specific data defined
in the centralized hwmod database will be used.
gpio_init needs to be done before machine_init functions access
gpio APIs. Hence gpio_init is made as a postcore_initcall.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Reviewed-by: Basak, Partha <p-basak2@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 9780a9cfa7b1f913d5f7099290e77b381a8b01d5
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Dec 7 16:26:57 2010 -0800
OMAP4: hwmod data: Add GPIO
Add GPIO hwmod data for OMAP4
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 70034d38fbfd0f98a49367d36aa72f776a9e663a
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:57 2010 -0800
OMAP3: hwmod data: Add GPIO
Add GPIO hwmod data for OMAP3
Also remove "omap34xx.h" header file as it is not required
anymore.
Signed-off-by: Charulatha V <charu@xxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit aeac0e441045974757e901b46719980a98c270a5
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:56 2010 -0800
OMAP2430: hwmod data: Add GPIO
Add GPIO hwmod data for OMAP2430
Also remove "omap24xx.h" header file as it is not required
anymore.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 59c348c38fbe85e6e86c711b9a38c37315008d9e
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:56 2010 -0800
OMAP2420: hwmod data: Add GPIO
Add GPIO hwmod data for OMAP2420 and add the required
GPIO device attributes in the gpio header file
Also remove "omap24xx.h" header file as it is not required
anymore.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 9d52342c27b7b43c4a7b24bac24ff7bee0b80e07
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:56 2010 -0800
OMAP7xx: GPIO: Introduce support for GPIO init
Add support for handling OMAP7xx specific gpio_init by
providing platform device data and doing device registration.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 87fe6229c75a2ca1ebfa1e9e937cba2535e961a8
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:56 2010 -0800
OMAP16xx: GPIO: Introduce support for GPIO init
Add support for handling OMAP16xx specific gpio_init by
providing platform device data and doing device registration.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit c95d10bc49d50a9bc0f63a6eae79bb2707dabfdc
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:56 2010 -0800
OMAP15xx: GPIO: Introduce support for GPIO init
Add support for handling OMAP15xx specific gpio_init by
providing platform device data and doing device registration.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 9a748053f5f58a77cd71864f1d7b804175b0e47d
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 7 16:26:56 2010 -0800
OMAP: GPIO: Make omap_gpio_show_rev bank specific
Otherwise GPIO init on 16xx may try to access uninitialized GPIO
bank as the MPUIO bank does not have a revision register.
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 2fae7fbed072705d91e09ed393b2e580b2d895fc
Author: Varadarajan, Charulatha <charu@xxxxxx>
Date: Tue Dec 7 16:26:55 2010 -0800
OMAP: GPIO: prepare for platform driver
Prepare for implementing GPIO as a platform driver.
Modifies omap_gpio_init() to make use of omap_gpio_chip_init()
and omap_gpio_mod_init(). omap_gpio_mod_init() does the module init
by clearing the status register and initializing the GPIO control register.
omap_gpio_chip_init() initializes the chip request, free, get, set and
other function pointers and sets the gpio irq handler.
This is only to reorganize the code so that the "omap gpio platform driver
implementation patch" looks cleaner and better to review.
Signed-off-by: Charulatha V <charu@xxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit c2cdaffe0bb32015e84af8e31f73e620ba271165
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 7 16:26:55 2010 -0800
omap: Fix gpio_request calls to happen as arch_initcall
Looks like some boards are calling gpio_request from init_irq.
This will make the request_irq fail, as GPIO will be initialized
as postcore_initcall.
Reported-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7b045c96cd1405597a6a2e98bc53a4ac01d835b1
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 7 16:25:41 2010 -0800
omap: Don't select mux by default for each board
This should be only selected in CONFIG_ARCH_OMAP2PLUS_TYPICAL
to make it easy to disable.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 6722a7238d062b747fc03b35d3371b935bcc965d
Author: Shubhrajyoti D <shubhrajyoti@xxxxxx>
Date: Tue Dec 7 16:25:41 2010 -0800
omap: McBSP: Make the free variable update more readable
Using true/false instead of 1/0 to update the free variable.
Signed-off-by: Shubhrajyoti D <shubhrajyoti@xxxxxx>
Acked-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 5f3b7284cb35c9e3eead279cb35f017b9735bb43
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Tue Dec 7 16:25:40 2010 -0800
omap: McBSP: Fix potential memory leak in omap_mcbsp_remove
Function omap_mcbsp_probe allocates struct omap_mcbsp *mcbsp but it is not
freed in omap_mcbsp_remove. Fix this, remove unneeded structure cleanups
and clk_disable calls since they are not needed here.
This is not problem currently but becomes if the mcbsp driver is ever
modularized.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit b1cc4c55c69efed3ebbb2a13e4c77a2a1a4a6bc9
Author: Evgeny Kuznetsov <ext-eugeny.kuznetsov@xxxxxxxxx>
Date: Tue Dec 7 16:25:40 2010 -0800
omap: Ptr "isr_reg" tracked as NULL was dereferenced
Value of "isr_reg" pointer is depend on configuration and GPIO method.
Potentially it may have NULL value and it is dereferenced later
in code. Warning and exit from function are added in this case.
Signed-off-by: Evgeny Kuznetsov <EXT-Eugeny.Kuznetsov@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit be40f7a3d7b53c1a44e11b376b4a395d6b91f58d
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Dec 7 16:25:40 2010 -0800
omap: Fix undefined reference to omap2_i2c_mux_pins
In some cases we can get error function `omap2_i2c_add_bus':
arch/arm/plat-omap/i2c.c:136: undefined reference to `omap2_i2c_mux_pins'
arch/arm/plat-omap/i2c.c:141: undefined reference to `omap_hwmod_lookup'
arch/arm/plat-omap/i2c.c:157: undefined reference to `omap_device_build'
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit c989a7fc139ec8975fdc230e2de42f3c4555880e
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Mon Dec 6 11:09:57 2010 +0100
dmaengine i.MX SDMA: initialize on module_init
The firmware framework gets initialized during fs_initcall time, so
we are not allowed to call request_firmware earlier.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 8961d52d4cc52edf5672f8f2712c57162b736793
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Fri Dec 3 14:37:22 2010 -0500
drm/radeon/kms: fix vram base calculation on rs780/rs880
Avoid overflowing a 32 bit value.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit dd7cc55a258400440aff5869d3e1e111142297cd
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Fri Dec 3 14:37:21 2010 -0500
drm/radeon/kms: fix formatting of vram and gtt info
print the full 64 bit values.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 93225b0d7bc030f4a93165347a65893685822d70
Author: Jerome Glisse <jglisse@xxxxxxxxxx>
Date: Fri Dec 3 16:38:19 2010 -0500
drm/radeon/kms: forbid big bo allocation (fdo 31708) v3
Forbid allocating buffer bigger than visible VRAM or GTT, also
properly set lpfn field.
v2 - use max macro
- silence warning
v3 - don't explicitly set range limit
- use min macro
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Jerome Glisse <jglisse@xxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 541cc966915b6756e54c20eebe60ae957afdb537
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 6 11:24:07 2010 +0000
drm: Don't try and disable an encoder that was never enabled
Prevents code that assumes that the encoder is active when asked to be
disabled from dying a horrible death.
Reported-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit ea5d552c73707645c53d42e8a71c9a4d9cbb85c1
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 19:41:31 2010 +0000
drm: Add missing drm_vblank_put() along queue vblank error path
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Kristian Høgsberg <krh@xxxxxxxxxxxxx>
Acked-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit e516c7df4cfe335a2ea220480cfac558dc738ae4
Merge: 81e8d2162566379adcf4b3700f03845c62577145 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Wed Dec 8 09:30:59 2010 +1000
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes
commit 943d8d8bca431d6c93f17bf38f4b09c65e0a81d7
Author: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Wed Dec 1 19:49:48 2010 +0900
dma : EG20T PCH: Fix miss-setting DMA descriptor
Currently, in case of using scatter/gather mode, head of data is not sent to
destination. The cause is second descriptor address is set to NEXT.
The NEXT must have head of descriptor address.
This patch sets head of descriptor address to the NEXT.
Acked-by: Yong Wang <youg.y.wang@xxxxxxxxx>
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
[dan.j.williams@xxxxxxxxx: fixed up usage of virt_to_phys()]
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 6 11:20:45 2010 +0000
drm/i915/dp: Only apply the workaround if the select is still active
As we may try to power down the link at various times, it is not
necessarily still coupled with an encoder and so we must be careful not
to depend upon an operation that is only valid when the link is still
attached to a pipe.
Fixes regression in 5bddd17.
Reported-and-tested-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx [after applying 5bddd17]
commit 00b4ade1f1968b55bb57a91c1f09a40fc33f72a0
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Dec 7 04:30:57 2010 +0000
OMAP1: I2C: fix device initialization
Commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 ("OMAP: I2C: split
device registration and convert OMAP2+ to omap_device") broke I2C on
OMAP1. The following messages appear at boot:
i2c_omap i2c_omap.1: failure requesting irq 0
i2c_omap: probe of i2c_omap.1 failed with error -22
Investigation revealed that a chunk of code is missing from the
original plat-omap/i2c.c file which configured the IRQ and base address
for the I2C block on OMAP1. Upon adding this back, the OMAP1 I2C block
seems to initialize correctly.
Thanks to Cory Maccarrone <darkstar6262@xxxxxxxxx> for reporting the bug,
and apologies for the breakage.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Tested-by: Cory Maccarrone <darkstar6262@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7659a193f94c0003dd06e9e874d19bade1a8c952
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Tue Dec 7 10:41:47 2010 -0800
mac80211: Fix compilation error when mesh is disabled
Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation
problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cae6b74d907e2abd22d496fe30417b088d3302cf
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Dec 7 21:23:16 2010 +0530
ath9k: Remove dead code in recv.c
The structure struct ieee80211_rx_status *rxs is no longer needed to be
passed to ath_rx_send_to_mac80211 function
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0ce3bcfc84900a64347b0fe1140229bd81314008
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Dec 7 21:14:15 2010 +0530
ath9k: Parse DTIM period from mac80211
With the current save power save implementation we assume a dtim period
of 1.This value is assigned based on a sanity check in the driver
eventhough we had not parsed it from mac80211.This patch obtains the actual
DTIM period from AP by parsing it from mac80211.Yet for handling
multicast traffic we may still have it as fixed rather than parsing it
from mac80211 .This does not breaks power save or anything as the sleep
duration is currently fixed in the driver.This patch may serve to improve
power save in the future by using dtim period for sleep duration and using
correct dtim period adhoc mode.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aaef24b4c9f5db726e618977b74ffef924360de5
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Dec 7 20:40:58 2010 +0530
ath9k: Properly use unlikely check macro
AUTOSLEEP feature is enabled only for AR9271 and AR9003 version
chipsets.So unlikely macro should be used only to check whether
auto-sleep feature is enabled
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit caa0a99acd2c4eb0a8d4e9caae397291e4cf743a
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 7 16:32:02 2010 +0530
ath9k_htc: Fix panic on FW download failure
Use the correct error condition exit in case firmware download
fails for some reason. Not doing so results in a panic:
usb 1-3: ath9k_htc: Transferred FW: ar9271.fw, size: 51280
usb 1-3: ath9k_htc: Firmware - ar9271.fw download failed
usb 1-3: ath9k_htc: Target is unresponsive
Failed to initialize the device
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
Pid: 2823, comm: insmod Tainted: G W 2.6.37-rc4-wl #11
Call Trace:
[<ffffffff81090d7e>] __lock_acquire+0xe3e/0x1d00
[<ffffffff813a9f14>] ? restore_args+0x0/0x30
[<ffffffff81058af1>] ? vprintk+0x321/0x500
[<ffffffff81092290>] lock_acquire+0xa0/0x190
[<ffffffffa02a0eac>] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffff813a8ea8>] _raw_spin_lock_irq+0x48/0x60
[<ffffffffa02a0eac>] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffff813a53fd>] ? printk+0x3c/0x3f
[<ffffffffa02a0eac>] usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffffa0055388>] ath9k_hif_usb_dealloc_urbs+0x18/0x40 [ath9k_htc]
[<ffffffffa00557d7>] ath9k_hif_usb_probe+0x227/0x3d0 [ath9k_htc]
[<ffffffffa02a56ac>] usb_probe_interface+0x10c/0x210 [usbcore]
[<ffffffff812ae826>] driver_probe_device+0x96/0x1c0
[<ffffffff812ae9f3>] __driver_attach+0xa3/0xb0
[<ffffffff812ae950>] ? __driver_attach+0x0/0xb0
[<ffffffff812ad6ae>] bus_for_each_dev+0x5e/0x90
[<ffffffff812ae4c9>] driver_attach+0x19/0x20
[<ffffffff812ae038>] bus_add_driver+0x168/0x320
[<ffffffff812aec71>] driver_register+0x71/0x140
[<ffffffff811fc338>] ? __raw_spin_lock_init+0x38/0x70
[<ffffffffa02a438c>] usb_register_driver+0xdc/0x190 [usbcore]
[<ffffffffa0063000>] ? ath9k_htc_init+0x0/0x4f [ath9k_htc]
[<ffffffffa005599e>] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc]
[<ffffffffa006302b>] ath9k_htc_init+0x2b/0x4f [ath9k_htc]
[<ffffffff8100212f>] do_one_initcall+0x3f/0x180
[<ffffffff8109ef9b>] sys_init_module+0xbb/0x200
[<ffffffff8100bf52>] system_call_fastpath+0x16/0x1b
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 692d6b175b392512881ab374567e900fc825d487
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 7 16:31:54 2010 +0530
ath9k_htc: Add support for handling TX power configuration
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0b5ead91cda63e0db964dadc77601233434f60cb
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Tue Dec 7 16:31:38 2010 +0530
ath9k_htc: Cleanup device identification
ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc.
Adding driver specific data to the shared structure would impact all the
drivers. Handling USB device recognition for devices specific to ath9k_htc
can be handled within the driver itself.
Also, AR7010 refers to the processor used in both AR9280/AR9287 based
devices. Rename the device enumerations accordingly.
While at it, check properly for the bus type when choosing the EEPROM
base address for UB95.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c658e5db01117bf2a321a9a782754dd5b10e2f15
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Tue Dec 7 04:40:18 2010 +0100
mac80211: fix a compiler warning
net/mac80211/mlme.c: In function 'ieee80211_sta_work':
net/mac80211/mlme.c:1981: warning: too many arguments for format
Introduced by commit 04ac3c0ee2c773c321ec472d892635a20556f34d
("mac80211: speed up AP probing using nullfunc frames").
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 22d8d9f81b8b054df2f7f82daffcb71608f411e4
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Dec 7 11:08:12 2010 +0900
ath5k: Use capabilities information for the number of TX queues
One thing I missed in my WME series: Older hardware does not have enough
hardware queues to support WME. In this case we just set up one data queue. Use
the capability information to decide how many queues to set up.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5c6d1125f8dbd1bfef39e38fbc2837003be78a59
Author: Jarkko Sakkinen <ext-jarkko.2.sakkinen@xxxxxxxxx>
Date: Tue Dec 7 13:34:01 2010 +0200
Smack: Transmute labels on specified directories
In a situation where Smack access rules allow processes
with multiple labels to write to a directory it is easy
to get into a situation where the directory gets cluttered
with files that the owner can't deal with because while
they could be written to the directory a process at the
label of the directory can't write them. This is generally
the desired behavior, but when it isn't it is a real
issue.
This patch introduces a new attribute SMACK64TRANSMUTE that
instructs Smack to create the file with the label of the directory
under certain circumstances.
A new access mode, "t" for transmute, is made available to
Smack access rules, which are expanded from "rwxa" to "rwxat".
If a file is created in a directory marked as transmutable
and if access was granted to perform the operation by a rule
that included the transmute mode, then the file gets the
Smack label of the directory instead of the Smack label of the
creating process.
Note that this is equivalent to creating an empty file at the
label of the directory and then having the other process write
to it. The transmute scheme requires that both the access rule
allows transmutation and that the directory be explicitly marked.
Signed-off-by: Jarkko Sakkinen <ext-jarkko.2.sakkinen@xxxxxxxxx>
Signed-off-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
commit d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Mon Dec 6 13:13:07 2010 -0800
ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE.
This decreases spammage in the log. A single line message
will still be printed, so users can be aware that problem
exists.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Acked-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1435894dcd263fdbdd5e1ea2a684289dff187c34
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:28:00 2010 -0800
ath9k: Add device id of AR9485 to pci table
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a95f1600081211433c5ff6f3668061c821552e9f
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:59 2010 -0800
ath9k_hw: Disable MRC CCK for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 11441fb8b700bd782ae72d3dd87453fc5bc2ff12
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:58 2010 -0800
ath9k_hw: Setup paprd only for supported chains
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7090ad1416d0311677c43728494c6028aa2436b6
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:57 2010 -0800
ath9k_hw: Program appropriate register for temperature compensation cal for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 858b7e36e82cc03cb77b64f096b64446a24a346a
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:56 2010 -0800
ath9k_hw: Add IQ cal changes for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 73ff5fc0a86b28b77e02a6963b388d1dbfa0a263
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Dec 7 16:17:28 2010 -0500
selinux: cache sidtab_context_to_sid results
sidtab_context_to_sid takes up a large share of time when creating large
numbers of new inodes (~30-40% in oprofile runs). This patch implements a
cache of 3 entries which is checked before we do a full context_to_sid lookup.
On one system this showed over a x3 improvement in the number of inodes that
could be created per second and around a 20% improvement on another system.
Any time we look up the same context string sucessivly (imagine ls -lZ) we
should hit this cache hot. A cache miss should have a relatively minor affect
on performance next to doing the full table search.
All operations on the cache are done COMPLETELY lockless. We know that all
struct sidtab_node objects created will never be deleted until a new policy is
loaded thus we never have to worry about a pointer being dereferenced. Since
we also know that pointer assignment is atomic we know that the cache will
always have valid pointers. Given this information we implement a FIFO cache
in an array of 3 pointers. Every result (whether a cache hit or table lookup)
will be places in the 0 spot of the cache and the rest of the entries moved
down one spot. The 3rd entry will be lost.
Races are possible and are even likely to happen. Lets assume that 4 tasks
are hitting sidtab_context_to_sid. The first task checks against the first
entry in the cache and it is a miss. Now lets assume a second task updates
the cache with a new entry. This will push the first entry back to the second
spot. Now the first task might check against the second entry (which it
already checked) and will miss again. Now say some third task updates the
cache and push the second entry to the third spot. The first task my check
the third entry (for the third time!) and again have a miss. At which point
it will just do a full table lookup. No big deal!
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 31faff815bd9d87c370f799dff03948ed362d260
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:55 2010 -0800
ath9k_hw: Define IQcal correction coefficient registers using index
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6559e83ebd2cac06c54ebb2b7f635cf2e434f25c
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:54 2010 -0800
ath9k_hw: Program appropriate chianmask for AR9485 before starting AGC/IQ cal
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5f139eba4174d9a3343efc7cfb8a0a9cb184c647
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:53 2010 -0800
ath9k_hw: Configure power control only for the supported chains
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dd040f76cef0cc977b83e905a16b68d41322b735
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:52 2010 -0800
ath9k_hw: Read and configure turnning caps to regulate freq accuracy
Right now it is done for only AR9485, will be done for ar9003 also
after proper testing.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ab09b5b4beda8b33a117bf6fbbb2b5aa8f566129
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Tue Dec 7 02:20:39 2010 -0800
ath9k_hw: Configure internal regulator for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 47e84dfb411fcaa51e12d94ab82570ec3aa86e32
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:49 2010 -0800
ath9k_hw: Read and configure antenna diversity control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9936e65fae6d95c2acc2438c60a8f4908130530e
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:48 2010 -0800
ath9k_hw: Configure xpa bias level for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d9a2545ac713e26ab8c8eee741d2da1626cebd6e
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:47 2010 -0800
ath9k: Read spur channel information from eeprom for AR9485
Also spur channel count and range is different for AR9485.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 272ceba892208013a45847276a00ccae54e2b94a
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:46 2010 -0800
ath9k_hw: Add a helper function to get spur channel pointer from cal data for AR9003 family
This helper function would be used for AR9485.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 85dd0921e686ed2f0283cef358a91ecaa36ccc8f
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:45 2010 -0800
ath9k_hw: Find chansel of AR_PHY_65NM_CH0_SYNTH7 for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d09b17f73fd8f475f33d0b8311d7b5a0bed67c67
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:44 2010 -0800
ath9k: Configure pll control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 47c80de62e9d6d262a829502d689a8b56add8d3d
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:43 2010 -0800
ath9k_hw: Find the maximum number of chains that hw supports
Have it in ah->caps. This will be used during various
calibrations.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8060e169e02fe855f5533b5ef6af1f23ae2db0c4
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:42 2010 -0800
ath9k: Enable extended synch for AR9485 to fix L0s recovery issue
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7f1c7a6ac57ff0482219aa3f62eb9d0f8fe65867
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:41 2010 -0800
ath9k: Disable TX STBC for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 784ad50324ec531fa4ab22586fe305657cc6e307
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:40 2010 -0800
ath9k_hw: Disable LDPC for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 60e0c3a782f9060327751492dac949210154759b
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:39 2010 -0800
ath9k_hw: Eeeprom changes for AR9485
Calibration data are stored at 4k address (0xfff). The cal data
for AR9485 is not compressed so its lengh can exceed 1024 limit,
take care of that.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ff48ba464e3503149657c60d46e8f4e9b4ed27fa
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:38 2010 -0800
ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c88457eb83fb6db7a3286a685ecc6e33a7aac49d
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:37 2010 -0800
ath9k_hw: Initialize mode registers for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3050c9146b2a4c98a916192fac2867c0023ec2b1
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:36 2010 -0800
ath9k_hw: Enable hw initialization for AR9485
Also make it a supported mac
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d9c803e1864d563b07382eb1bb8979cd70b1001e
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:35 2010 -0800
ath9k_hw: Add initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3bbb780cca79dfe0200d33afb95a8990acde65b9
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Mon Dec 6 04:27:34 2010 -0800
ath9k_hw: Define hw version macros for AR9485
AR9485 is a single chain and single band (2.4 Ghz) chip.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b7555ec7c604f2f00e432579dac29df5ce525433
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Tue Dec 7 14:13:49 2010 -0500
ath5k: remove MODULE_VERSION
Since this is updated manually and sporadically, it is fairly useless
anyway.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a1cbc7a88985976267a851a2e1080578711b3b0d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 2 19:12:38 2010 -0800
ath: Fix ath_dbg access beyond array bound
ar9300RateSize is not necessarily a power of 4.
Change ar9003_hw_set_target_power_eeprom
to print the targetPowerValT2 array one per line.
ath9k_hw_ar9300_set_txpower repeated the output 4 times per line,
change it to print the targetPowerValT2 value one per line.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 226afe68fdbd1aa3680158aca0a3631cbd019626
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 2 19:12:37 2010 -0800
ath: Convert ath_print to ath_dbg
Remove ath/debug.h and the includes of these files.
Coalesce long formats.
Correct a few misspellings and missing "\n"s from these logging messages.
Remove unnecessary trailing space before a newline.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3800276a40751539a920ef8e0537ef2e19126799
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 2 19:12:36 2010 -0800
ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err
So these errors are always emitted at KERN_ERR level.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 21a99f934949807dc0c9dc7642bbf0081b7582f9
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Dec 2 19:12:35 2010 -0800
ath: Add and use ath_printk and ath_<level>
Add ath_printk and ath_<level> similar to
dev_printk and dev_<level> from device.h
This allows a more gradual rename of ath_print
to to ath_dbg or perhaps ath_debug.
This basically removes debug.h leaving
only an #define ath_printk ath_dbg
there and moving all the ATH_DBG_<foo>
enums to ath.h
I do not think there's much purpose for struct
ath_common * being passed to the ath_printk
functions, but perhaps there might be.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fdbf3ceeb659f0b3c0e8dd79b331b7ac05910f1e
Author: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Date: Wed Nov 24 18:26:04 2010 +0100
fanotify: Dont try to open a file descriptor for the overflow event
We should not try to open a file descriptor for the overflow event since this
will always fail.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit e9a3854fd4ff3907e6c200a3980e19365ee695e9
Author: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Date: Wed Nov 24 18:22:09 2010 +0100
fanotify: Introduce FAN_NOFD
FAN_NOFD is used in fanotify events that do not provide an open file
descriptor (like the overflow_event).
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 26379198937fcc9bbe7be76be695d06df8334eaa
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 23:48:26 2010 -0500
fanotify: do not leak user reference on allocation failure
If fanotify_init is unable to allocate a new fsnotify group it will
return but will not drop its reference on the associated user struct.
Drop that reference on error.
Reported-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit a2ae4cc9a16e211c8a128ba10d22a85431f093ab
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 18:18:37 2010 -0500
inotify: stop kernel memory leak on file creation failure
If inotify_init is unable to allocate a new file for the new inotify
group we leak the new group. This patch drops the reference on the
group on file allocation failure.
Reported-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
cc: stable@xxxxxxxxxx
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 09e5f14e57c70f9d357862bb56e57026c51092a1
Author: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Date: Fri Nov 19 10:58:07 2010 +0100
fanotify: on group destroy allow all waiters to bypass permission check
When fanotify_release() is called, there may still be processes waiting for
access permission. Currently only processes for which an event has already been
queued into the groups access list will be woken up. Processes for which no
event has been queued will continue to sleep and thus cause a deadlock when
fsnotify_put_group() is called.
Furthermore there is a race allowing further processes to be waiting on the
access wait queue after wake_up (if they arrive before clear_marks_by_group()
is called).
This patch corrects this by setting a flag to inform processes that the group
is about to be destroyed and thus not to wait for access permission.
[additional changelog from eparis]
Lets think about the 4 relevant code paths from the PoV of the
'operator' 'listener' 'responder' and 'closer'. Where operator is the
process doing an action (like open/read) which could require permission.
Listener is the task (or in this case thread) slated with reading from
the fanotify file descriptor. The 'responder' is the thread responsible
for responding to access requests. 'Closer' is the thread attempting to
close the fanotify file descriptor.
The 'operator' is going to end up in:
fanotify_handle_event()
get_response_from_access()
(THIS BLOCKS WAITING ON USERSPACE)
The 'listener' interesting code path
fanotify_read()
copy_event_to_user()
prepare_for_access_response()
(THIS CREATES AN fanotify_response_event)
The 'responder' code path:
fanotify_write()
process_access_response()
(REMOVE A fanotify_response_event, SET RESPONSE, WAKE UP 'operator')
The 'closer':
fanotify_release()
(SUPPOSED TO CLEAN UP THE REST OF THIS MESS)
What we have today is that in the closer we remove all of the
fanotify_response_events and set a bit so no more response events are
ever created in prepare_for_access_response().
The bug is that we never wake all of the operators up and tell them to
move along. You fix that in fanotify_get_response_from_access(). You
also fix other operators which haven't gotten there yet. So I agree
that's a good fix.
[/additional changelog from eparis]
[remove additional changes to minimize patch size]
[move initialization so it was inside CONFIG_FANOTIFY_PERMISSION]
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 1734dee4e3a296cb72b4819fc2e7ef2440737dff
Author: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Date: Mon Nov 22 18:46:33 2010 +0100
fanotify: Dont allow a mask of 0 if setting or removing a mark
In mark_remove_from_mask() we destroy marks that have their event mask cleared.
Thus we should not allow the creation of those marks in the first place.
With this patch we check if the mask given from user is 0 in case of FAN_MARK_ADD.
If so we return an error. Same for FAN_MARK_REMOVE since this does not have any
effect.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit fa218ab98c31eeacd12b89501e6b99d146ea56cc
Author: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Date: Tue Nov 9 18:18:16 2010 +0100
fanotify: correct broken ref counting in case adding a mark failed
If adding a mount or inode mark failed fanotify_free_mark() is called explicitly.
But at this time the mark has already been put into the destroy list of the
fsnotify_mark kernel thread. If the thread is too slow it will try to decrease
the reference of a mark, that has already been freed by fanotify_free_mark().
(If its fast enough it will only decrease the marks ref counter from 2 to 1 - note
that the counter has been increased to 2 in add_mark() - which has practically no
effect.)
This patch fixes the ref counting by not calling free_mark() explicitly, but
decreasing the ref counter and rely on the fsnotify_mark thread to cleanup in
case adding the mark has failed.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit b1085ba80cd2784400a7beec3fda5099198ed01c
Author: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Date: Fri Nov 5 17:05:27 2010 +0100
fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
Unsetting FMODE_NONOTIFY in fsnotify_open() is too late, since fsnotify_perm()
is called before. If FMODE_NONOTIFY is set fsnotify_perm() will skip permission
checks, so a user can still disable permission checks by setting this flag
in an open() call.
This patch corrects this by unsetting the flag before fsnotify_perm is called.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 88d60c32765716289abeb362c44adf6c35c6824c
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 8 18:19:22 2010 -0500
fanotify: remove packed from access response message
Since fanotify has decided to be careful about alignment and packing
rather than rely on __attribute__((packed)) for multiarch support.
Since this attribute isn't doing anything on fanotify_response we just
drop it. This does not break API/ABI.
Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit ecf6f5e7d68471b08603f7c20143ac236602364f
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 8 18:08:14 2010 -0500
fanotify: deny permissions when no event was sent
If no event was sent to userspace we cannot expect userspace to respond to
permissions requests. Today such requests just hang forever. This patch will
deny any permissions event which was unable to be sent to userspace.
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Fri Dec 3 02:16:23 2010 +0200
mac80211: fix dynamic-ps/pm_qos magic numbers
mac80211 uses pm_qos (/dev/network_latency) in order to determine the
dynamic ps timeout (or disable the dynamic-ps at all in some cases).
commit ff616381 added a comparison for the current network_latency
against one high value (1900ms), and against the default value
(2000sec, rather than the commented 2sec).
however, the representation of 1900ms was incorrect:
1900ms = 1900000us ( != 1900000000 )
fix it by using USEC_TO_MSEC/SEC consts.
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 329b32fedc94fd9158f1635ac64f4ae6a00d374c
Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Date: Thu Dec 2 18:19:21 2010 +0000
orinoco: allow IW_AUTH_MFP to pass through
The card doesn't support MFP, so silently accept DISABLED and OPTIONAL
settings.
This avoids the following failure in wpa_supplicant logs:
State: SCANNING -> ASSOCIATING
wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT)
netlink: Operstate: linkmode=-1, operstate=5
wpa_driver_wext_associate
wpa_driver_wext_set_drop_unencrypted
wpa_driver_wext_set_psk
wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP) failed
Association request to the driver failed
Signed-off by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Reported by: Giacomo Comes <comes@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 541a45a142df281c974d74eac2066138fc107b23
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 2 19:12:43 2010 +0900
nl80211/mac80211: Report signal average
Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.
This uses the recently added generic EWMA library function.
--
v2: fix ABI breakage and change factor to be a power of 2.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e8f149924a3111015d16dfbbb4816cfc75ba53cd
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Tue Dec 7 19:47:34 2010 +0000
sfc: Fix NAPI list corruption during ring reallocation
Call netif_napi_{add,del}() on the NAPI contexts in the new and
old channels, respectively.
Since efx_init_napi() cannot fail, make its return type void.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 884a963fa1c828a5c5fa7a46b2877dd463bfd47c
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Tue Dec 7 17:42:18 2010 +0530
ath9k: fix beacon resource related race condition
The beacon tasklet is accesssing the bslot info for beacon generation.
Meanwhile the same slot can be freed on interface deletion.
Current the remove_interface disables the beacon alert after freeing the slot.
This may leads to null pointer access.
This patch disables SWBA and kills the beacon tasklet to prevent access
to the slot to be freed. After releasing the slot, swba will be enabled again
upon the availablity of beaconing interfaces.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 38852b20c8b6d97618204ac64abbf14f0080393e
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Mon Dec 6 19:09:27 2010 +0530
ath9k: Fix STA disconnect issue due to received MIC failed bcast frames
AR_RxKeyIdxValid will not be set for bcast/mcast frames and so relying
this status for MIC failed frames is buggy.
Due to this, MIC failure events for broadcast frames are not sent to
supplicant resulted in AP disconnecting the STA.
Able to pass Wifi Test case 5.2.18 with this fix.
Cc: Stable <stable@xxxxxxxxxx> (2.6.36+)
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 080e1a259acea10b6df8e2a8e49b47481940220a
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Dec 5 20:17:53 2010 +0100
ath9k: fix a DMA related race condition on reset
When ath_drain_all_txq fails to stop DMA, it issues a hw reset. This reset
happens at a very problematic point in time, when the hardware rx path has
not been stopped yet. This could lead to memory corruption, hardware hangs
or other issues.
To fix these issues, simply remove the reset entirely and check the tx DMA
stop status to prevent problems with fast channel changes.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 841051602e3fa18ea468fe5a177aa92b6eb44b56
Author: Matteo Croce <technoboy85@xxxxxxxxx>
Date: Fri Dec 3 02:25:08 2010 +0100
ath9k: fix bug in tx power
The ath9k driver subtracts 3 dBm to the txpower as with two radios the
signal power is doubled.
The resulting value is assigned in an u16 which overflows and makes
the card work at full power.
Cc: stable@xxxxxxxxxx
Signed-off-by: Matteo Croce <matteo@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 94dec6a2d20a26a779b63bb584e48db5fb0ddb53
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Tue Dec 7 19:24:45 2010 +0000
sfc: Fix crash in legacy onterrupt handler during ring reallocation
If we are using a legacy interrupt, our IRQ may be shared and our
interrupt handler may be called even though interrupts are disabled on
the NIC. When we change ring sizes, we reallocate the event queue and
the interrupt handler may use an invalid pointer when called for
another device's interrupt.
Maintain a legacy_irq_enabled flag and test that at the top of the
interrupt handler. Note that this problem results from the need to
work around broken INT_ISR0 reads, and does not affect the legacy
interrupt handler for Falcon A1.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 6142e05f30b101adeafb0d12e35983f44f68233e
Author: David Howells <dhowells@xxxxxxxxxx>
Date: Tue Dec 7 17:41:40 2010 +0000
MN10300: Fix interrupt mask alteration function call name in gdbstub
Fix the name of interrupt mask alteration function (ie the
local_change_intr_mask_level() fn) called in gdbstub to have an arch_
prefix to match the definition in asm/irqflags.h.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 7d161b7f41e24203b54b0f18ae0d26c18a6c6fab
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Tue Dec 7 02:10:35 2010 -0500
cifs: allow calling cifs_build_path_to_root on incomplete cifs_sb
It's possible that cifs_mount will call cifs_build_path_to_root on a
newly instantiated cifs_sb. In that case, it's likely that the
master_tlink pointer has not yet been instantiated.
Fix this by having cifs_build_path_to_root take a cifsTconInfo pointer
as well, and have the caller pass that in.
Reported-and-Tested-by: Robbert Kouprie <robbert@xxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 03ceace5c6923ffbcf2b4d2e37afbffbdb5d4a67
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 6 21:07:33 2010 -0500
cifs: fix check of error return from is_path_accessable
This function will return 0 if everything went ok. Commit 9d002df4
however added a block of code after the following check for
rc == -EREMOTE. With that change and when rc == 0, doing the
"goto mount_fail_check" here skips that code, leaving the tlink_tree
and master_tlink pointer unpopulated. That causes an oops later
in cifs_root_iget.
Reported-and-Tested-by: Robbert Kouprie <robbert@xxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Dec 7 20:16:56 2010 +0100
fuse: fix ioctl ABI
In kernel ABI version 7.16 and later FUSE_IOCTL_RETRY reply from a
unrestricted IOCTL request shall return with an array of 'struct
fuse_ioctl_iovec' instead of 'struct iovec'. This fixes the ABI
ambiguity of 32bit vs. 64bit.
Reported-by: "ccmail111" <ccmail111@xxxxxxxxx>
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
CC: Tejun Heo <tj@xxxxxxxxxx>
commit 02c048b919455aaa38628563cdcc2e691c8a9f53
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Dec 7 20:16:56 2010 +0100
fuse: allow batching of FORGET requests
Terje Malmedal reports that a fuse filesystem with 32 million inodes
on a machine with lots of memory can take up to 30 minutes to process
FORGET requests when all those inodes are evicted from the icache.
To solve this, create a BATCH_FORGET request that allows up to about
8000 FORGET requests to be sent in a single message.
This request is only sent if userspace supports interface version 7.16
or later, otherwise fall back to sending individual FORGET messages.
Reported-by: Terje Malmedal <terje.malmedal@xxxxxxxxxxx>
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
commit 07e77dca8a1f17a724a9b7449f0ca02e70e9d057
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Dec 7 20:16:56 2010 +0100
fuse: separate queue for FORGET requests
Terje Malmedal reports that a fuse filesystem with 32 million inodes
on a machine with lots of memory can go unresponsive for up to 30
minutes when all those inodes are evicted from the icache.
The reason is that FORGET messages, sent when the inode is evicted,
are queued up together with regular filesystem requests, and while the
huge queue of FORGET messages are processed no other filesystem
operation can proceed.
Since a full fuse request structure is allocated for each inode, these
take up quite a bit of memory as well.
To solve these issues, create a slim 'fuse_forget_link' structure
containing just the minimum of information required to send the FORGET
request and chain these on a separate queue.
When userspace is asking for a request make sure that FORGET and
non-FORGET requests are selected fairly: for each 8 non-FORGET allow
16 FORGET requests. This will make sure FORGETs do not pile up, yet
other requests are also allowed to proceed while the queued FORGETs
are processed.
Reported-by: Terje Malmedal <terje.malmedal@xxxxxxxxxxx>
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
commit 8ac835056ca39b242d98332f46e4d65428a8b7db
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Dec 7 20:16:56 2010 +0100
fuse: ioctl cleanup
Get rid of unnecessary page_address()-es.
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
CC: Tejun Heo <tj@xxxxxxxxxx>
commit 3dc86429032910bdf762adeb2969112bb303924c
Author: Anssi Hannula <anssi.hannula@xxxxxx>
Date: Tue Dec 7 20:56:19 2010 +0200
ALSA: hda - Always allow basic audio irrespective of ELD info
Commit bbbe33900d1f3c added functionality to restrict PCM parameters
based on ELD info (derived from EDID data) of the audio sink.
However, according to CEA-861-D no SAD is needed for basic audio
(32/44.1/48kHz stereo 16-bit audio), which is instead indicated with a
basic audio flag in the CEA EDID Extension.
The flag is not present in ELD. However, as all audio capable sinks are
required to support basic audio, we can assume it to be always
available.
Fix allowed audio formats with sinks that have SADs (Short Audio
Descriptors) which do not completely overlap with the basic audio
formats (there are no reports of affected devices so far) by always
assuming that basic audio is supported.
Reported-by: Stephen Warren <swarren@xxxxxxxxxx>
Signed-off-by: Anssi Hannula <anssi.hannula@xxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 4b0dbdb17f846a8887e5f7fbeea2deb0703236bd
Author: Anssi Hannula <anssi.hannula@xxxxxx>
Date: Tue Dec 7 18:41:35 2010 +0200
ALSA: hda - Do not wrongly restrict min_channels based on ELD
Commit bbbe33900d1f3c added functionality to restrict PCM parameters
based on ELD info (derived from EDID data) of the audio sink.
However, it wrongly assumes that the bits 0-2 of the first byte of
CEA Short Audio Descriptors mean a supported number of channels. In
reality, they mean the maximum number of channels (as per CEA-861-D
7.5.2). This means that the channel count can only be used to restrict
max_channels, not min_channels.
Restricting min_channels causes us to deny opening the device in stereo
mode if the sink only has SADs that declare larger numbers of channels
(like Primare SP32 AV Processor does).
Fix that by not restricting min_channels based on ELD information.
Signed-off-by: Anssi Hannula <anssi.hannula@xxxxxx>
Reported-by: Jean-Yves Avenard <jyavenard@xxxxxxxxx>
Tested-by: Jean-Yves Avenard <jyavenard@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c39d35ebffeea5996a6f8fd8430fae9acfb8aeaf
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Tue Dec 7 19:11:26 2010 +0000
sfc: Generalise filter spec initialisation
Move search_depth arrays into per-table state.
Define initialisation function efx_filter_init_rx() which sets
everything apart from the match fields.
Define efx_filter_set_{ipv4_local,ipv4_full,eth_local}() to set the
match fields. This allows some simplification of callers and later
support for additional protocols and more flexible matching using
multiple calls to these functions.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 47c716cbf638a16583441d78be3fc24345eab636
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Dec 7 12:44:56 2010 -0500
NFS: Readdir cleanups
No functional changes, but clarify the code.
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit a96efbc1fc8e4540dc1d561bb5e42a16a7b472d5
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Mon Dec 6 16:38:34 2010 -0200
ARM: mx5/mx51_babbage: Add watchdog support
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 7f77f91dc0171ac11a8b95ba761144d732d4e907
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Mon Dec 6 16:38:33 2010 -0200
ARM: mx5: add watchdog clocks
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 8c2efec3cd5fcc6240da8931222ccab556a40ff3
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Mon Dec 6 16:38:32 2010 -0200
ARM: mx5: add support for the two watchdog modules
MX51 has two watchdog modules.
Add support for both of them.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 8891681af928f1da795cd4bd59043e5e0fadd6c8
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Tue Dec 7 19:02:27 2010 +0000
sfc: Remove filter table IDs from filter functions
The separation between filter tables is largely an internal detail
and it may be removed in future hardware. To prepare for that:
- Merge table ID with filter index to make an opaque filter ID
- Wrap efx_filter_table_clear() with a function that clears filters
from both RX tables, which is all that the current caller requires
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit bcd7278d8a423a255e45f4d10afe564328f1885f
Author: Bob Peterson <rpeterso@xxxxxxxxxx>
Date: Tue Dec 7 13:58:56 2010 -0500
GFS2: fsck.gfs2 reported statfs error after gfs2_grow
When you do gfs2_grow it failed to take the very last
rgrp into account when adding up the new free space due
to an off-by-one error. It was not reading the last
rgrp from the rindex because of a check for "<=" that
should have been "<". Therefore, fsck.gfs2 was finding
(and fixing) an error with the system statfs file.
Signed-off-by: Bob Peterson <rpeterso@xxxxxxxxxx>
commit ce56d169976488e888878eed5f1bc304cf116c43
Author: Martin Michlmayr <tbm@xxxxxxxxxx>
Date: Mon Dec 6 21:53:16 2010 +0000
Kirkwood: Add support for 6282 based QNAP devices
Add support for the QNAP NAS devices based on Marvell's 6282 Kirkwood
chip (TS-119P+, TS-219P+ and TS-419P+). The differences to the 6281
based devices are:
- Ethernet PHY address
- GPIOs used for buttons (TS-119P+/TS-219P+)
Signed-off-by: Martin Michlmayr <tbm@xxxxxxxxxx>
Acked-by: Saeed Bishara <saeed.bishara@xxxxxxxxx>
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
commit 4bba1c34e0a70d0db2506e1b68f69d7edc8afd78
Author: Ash Hughes <ashley.hughes@xxxxxxxxxxxxxxxx>
Date: Tue Nov 30 21:53:09 2010 +0000
[ARM] Orion: added Buffalo LS-CHL support
Adds support for Buffalo Linkstation Live v3 (LS-CHL) NAS drives.
Signed-off-by: Ash Hughes <ashley.hughes@xxxxxxxxxxxxxxxx>
Acked-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
commit ea3398a1ae54cd3403f3cc0f6aa498c7452c681a
Merge: 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 cf7d7e5a1980d1116ee152d25dac382b112b9c17
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Dec 7 10:47:56 2010 -0800
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ac33ac610dc613b2b1c938f8b61eef651ab72563
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Tue Dec 7 18:29:52 2010 +0000
sfc: Log start and end of ethtool self-test at INFO level
Add message at start of self-test and increase log level of message at
end of self-test, so that any other messages produced during the
test are clearly associated with it.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 18fb5fe40ce7f789b5cfc3aa81ff1e6175b0a5be
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Dec 7 12:41:58 2010 -0500
NFS: nfs_readdir_search_for_cookie() don't mark as eof if cookie not found
If we're searching for a specific cookie, and it isn't found in the page
cache, we should try an uncached_readdir(). To do so, we return EBADCOOKIE,
but we don't set desc->eof.
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 81e8d2162566379adcf4b3700f03845c62577145
Merge: ff43fa8b41fe93cc62bb571a1bfeb487a3f79901 25c9170ed64a6551beefe9315882f754e14486f4
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 08:14:28 2010 -0800
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Fix incorrect proc spurious output
commit ff43fa8b41fe93cc62bb571a1bfeb487a3f79901
Merge: c2048b0a0a6e589d9813766489f78185cbabcdc6 8b14d7b22c61f17ccb869e0047d9df6dd9f50a9f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 08:14:04 2010 -0800
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
wmi: use memcmp instead of strncmp to compare GUIDs
ACPI, hp-wmi: Fix memory leak in acpi query
msi-wmi: fix semantically incorrect use of keycode instead of scancode
msi-wmi: Add mute key support
asus-laptop: add wimax and wwan support
eeepc-wmi: fix compiler warning
ibm_rtl: _RTL_ is not available in UEFI mode
ibm_rtl: Loosen the DMI criteria to all IBM machines
drivers/platform/x86/thinkpad_acpi.c: delete double assignment
eeepc-wmi: add cpufv sysfs documentation
toshiba_acpi.c: Add key_entry for a lone FN keypress
ibm_rtl: fix printk format warning
commit c2048b0a0a6e589d9813766489f78185cbabcdc6
Merge: de47de7404e29df8de82f5822b4fde1a6ed97b54 8d7bfb4a891d606d52e1a99cf7231b4417b935dc
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 08:04:08 2010 -0800
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] css: fix rsid evaluation for 2nd crw
[S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus
commit ff2109f5f94ff75f45e0c8d2d1d56fefdf20733f
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:12 2010 +0000
Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2a7b1a00206895cfa444fd83477dca67a88a9d25
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 15:32:38 2010 +0000
ASoC: Correct WM8962 interrupt mask register read
Fix mismerge from the out of tree BSP where this support was developed.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 6b464321d276e448d478c99202c19d83f2bd25f4
Author: Jassi Brar <jassi.brar@xxxxxxxxxxx>
Date: Tue Dec 7 19:23:07 2010 +0900
ASoC: WM8580: Debug BCLK and sample size
In case of SNDRV_PCM_FORMAT_S32_LE, we need to set WM8580_AIF_LENGTH_32,
rather than WM8580_AIF_LENGTH_24.
Also, the BCLK has to be 64fs, for sample size of 20, 24 and 32 bits.
Signed-off-by: Jassi Brar <jassi.brar@xxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit de47de7404e29df8de82f5822b4fde1a6ed97b54
Author: Ian Kent <raven@xxxxxxxxxx>
Date: Tue Dec 7 13:04:00 2010 +0800
autofs4 - remove ioctl mutex (bz23142)
With the recent changes to remove the BKL a mutex was added to the
ioctl entry point for calls to the old ioctl interface. This mutex
needs to be removed because of the need for the expire ioctl to call
back to the daemon to perform a umount and receive a completion
status (via another ioctl).
This should be fine as the new ioctl interface uses much of the same
code and it has been used without a mutex for around a year without
issue, as was the original intention.
Ref: Bugzilla bug 23142
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 681e36924788aeea2717c07cc42a21c9c86d7559
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Tue Dec 7 20:56:30 2010 +0800
ASoC: Fix resource leak if soc_register_ac97_dai_link failed
Properly free the resources in the case of soc_register_ac97_dai_link failure.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 33d6eb570b1f3fe5ba93cef465c5be66535c2c9a
Author: Valentine Barshak <vbarshak@xxxxxxxxxx>
Date: Mon Dec 6 18:16:11 2010 +0300
HID: Consolidate device existence checks in hiddev_ioctl
Currently, if the device has been removed before hiddev_ioctl(),
the -EIO is returned. If it's removed while hiddev_ioctl() is in
progress, some commands are still processed fine, others
return -ENODEV. This change takes the "existancelock" before
processing ioctl commands and releases it at the end.
If the device has been removed, always returns -ENODEV.
Signed-off-by: Valentine Barshak <vbarshak@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 1a8e8fab790ea7af81b8f964fdec706ad1ec2271
Author: Valentine Barshak <vbarshak@xxxxxxxxxx>
Date: Mon Dec 6 17:51:41 2010 +0300
HID: Fix race between disconnect and hiddev_ioctl
A USB HID device can be disconnected at any time.
If this happens right before or while hiddev_ioctl is in progress,
the hiddev_ioctl tries to access invalid hiddev->hid pointer.
When the hid device is disconnected, the hiddev_disconnect()
ends up with a call to hid_device_release() which frees
hid_device, but doesn't set the hiddev->hid pointer to NULL.
If the deallocated memory region has been re-used by the kernel,
this can cause a crash or memory corruption.
Since disconnect can happen at any time, we can't initialize
struct hid_device *hid = hiddev->hid at the beginning of ioctl
and then use it.
This change checks hiddev->exist flag while holding
the existancelock and uses hid_device only if it exists.
Signed-off-by: Valentine Barshak <vbarshak@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit b38aa89600be39b3e10c5b6529aed2e66518598e
Author: Ian Munsie <imunsie@xxxxxxxxxxx>
Date: Mon Nov 29 11:53:07 2010 +1100
perf makefile: Allow strong and weak functions in LIB_OBJS
When we build perf we place all of the .o files from the library files
(util, arch/x/util, etc) into libperf.a which is then linked into perf.
The problem is that the linker will by default only consider .o files
within the .a archive if they are necessary to satisfy an unresolved
symbol. As weak functions are not unresolved, it will not consider a .o
file from the archive containing the strong versions of weak functions
unless it requires it for another reason.
This patch adds the --whole-archive flags to the linker when passing in
the libperf.a file to ensure that it will consider every .o file in the
archive, not just what it believes that it needs. The end result is that
weak functions can now be overridden by strong variants of them in the
libperf.a file.
Cc: "tom.leiming" <tom.leiming@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290991642-sup-5890@xxxxxxxxxxx>
Signed-off-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 7af4c0932437f97938eef67e553c8d211f9edf33
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sat Oct 30 15:56:54 2010 +0200
percpu: zero memory more efficiently in mm/percpu.c::pcpu_mem_alloc()
Don't do vmalloc() + memset() when vzalloc() will do.
tj: dropped unnecessary temp variable ptr.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 04910265078f08a73208beab70ed2a3cce4a919f
Author: Tomasz Grobelny <tomasz@xxxxxxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 4 13:39:13 2010 +0100
dccp qpolicy: Parameter checking of cmsg qpolicy parameters
Ensure that cmsg->cmsg_type value is valid for qpolicy
that is currently in use.
Signed-off-by: Tomasz Grobelny <tomasz@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 871a2c16c21b988688b4ab1a78eadd969765c0a3
Author: Tomasz Grobelny <tomasz@xxxxxxxxxxxxxxxxxxxxxxx>
Date: Sat Dec 4 13:38:01 2010 +0100
dccp: Policy-based packet dequeueing infrastructure
This patch adds a generic infrastructure for policy-based dequeueing of
TX packets and provides two policies:
* a simple FIFO policy (which is the default) and
* a priority based policy (set via socket options).
Both policies honour the tx_qlen sysctl for the maximum size of the write
queue (can be overridden via socket options).
The priority policy uses skb->priority internally to assign an u32 priority
identifier, using the same ranking as SO_PRIORITY. The skb->priority field
is set to 0 when the packet leaves DCCP. The priority is supplied as ancillary
data using cmsg(3), the patch also provides the requisite parsing routines.
Signed-off-by: Tomasz Grobelny <tomasz@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 7a1948768c2998f5bddb2327696cbe3161f468ed
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Tue Dec 7 10:38:40 2010 +0000
drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo
In order for bos to retire eventually, a request must be sent down the
ring. This is expected, for example, by occlusion queries for which mesa
will wait upon (whilst running glean) before issuing more batches and so
the normal activity upon the ring is suspended and we need to emit a
request to clear the idle ring.
Reported-by: Jinjin, Wang <jinjin.wang@xxxxxxxxx>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30380
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit e745a6676c76280f9721adeec79b08a0f2dfcc21
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 01:07:19 2010 +0100
ARM: 6481/1: Use shared GIC entry macros on OMAP
Common GIC entry macro for omap
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit c91a2bd70a617a638e157a7e99d4b21ee0e7b1cf
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 01:03:34 2010 +0100
ARM: 6480/1: Use shared GIC entry macros on Vexpress
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the Versatile Express subarchitecture.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5488324a6cbae617d103c42944827d82d8f5efd4
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 01:02:06 2010 +0100
ARM: 6479/1: Use shared GIC entry macros on UX500
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the UX500 subarchitecture.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 0005b349d5dc71471e1d47bd3efbf93f685620e1
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 01:00:40 2010 +0100
ARM: 6478/1: Use shared GIC entry macros on Tegra
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the Tegra subarchitecture.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Acked-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit c4d8c80f59f0611d747399a774ebef71f517a30c
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 00:58:43 2010 +0100
ARM: 6477/1: Use shared GIC entry macros on Realview
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the Realview subarchitecture.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 960351fb8e980f0aa6682f11630ff98d3a18e2c0
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 00:54:55 2010 +0100
ARM: 6476/1: Use shared GIC entry macros on CNS3XXX
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the CNS3XXX subarchitecture.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 161d1907607a5a562a152058c8daf1780ce7a00b
Author: Magnus Damm <magnus.damm@xxxxxxxxx>
Date: Tue Nov 16 00:48:07 2010 +0100
ARM: 6475/1: Introduce asm/hardware/entry-macro-gic.S
This patch is the identical GIC demux implementation
merge V3. Instead of implementing same code over and
over simply share it in entry-macro-gic.S. The shared
code is based on the realview implementation.
Each GIC demux instance still has to setup the base address
of the controller using the get_irqnr_preamble macro. The
rest of the GIC specific code can be shared.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 743411b3f3e96e8ac4cae73551a0a95392fed1ea
Author: Felipe Balbi <balbi@xxxxxx>
Date: Wed Dec 1 13:22:05 2010 +0200
usb: musb: make all glue layer export struct musb_platform_ops
preparing to a big refactor on musb code. We need
to be able to compile in all glue layers (or at
least all ARM-based ones) together and have a
working binary.
While preparing for that, we move every glue
layer to export only one symbol, which is
a struct musb_platform_ops, and make all
other functions static.
Later patches will come to allow for compiling
all glue layers together and have a working
binary.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 75b5293a5d176cd9caf6dc590da4f3458c048c3c
Merge: 10a18d7dc0d9f12483c95ffc234118e9b80edfeb ce47dc56a2241dc035160a85bc5e34283cdd622c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 7 07:51:14 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 10a18d7dc0d9f12483c95ffc234118e9b80edfeb
Merge: f984ba4eb575e4a27ed28a76d4126d2aa9233c32 cf7d7e5a1980d1116ee152d25dac382b112b9c17
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 7 07:49:48 2010 +0100
Merge commit 'v2.6.37-rc5' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3ca8abb84522f4b773678726db6ebd6fc277bc96
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Oct 21 13:56:40 2010 +0300
usb: musb: introduce struct musb_platform_ops
This will be passed to musb_core by platform glue
layer in order to make it easier to compile support
for several HW glue layers.
Later patches will come using this structure and
also moving HW glue layers to its own platform
driver; the idea is to be able to handle platform
peculiarities in a manner which doesn't affect one
another.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit cfa969e385a23e4c85f50e0ed5de25a2e18bf9d4
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Dec 6 20:45:28 2010 -0800
Revert "ehea: Use the standard logging functions"
This reverts commit 539995d18649023199986424d140f1d620372ce5.
As reported by Stephen Rothwell, this breaks the build.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cf7d7e5a1980d1116ee152d25dac382b112b9c17
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 6 20:09:04 2010 -0800
Linux 2.6.37-rc5
commit 086b17046c068ef3fa6e69c03c786b39ca617a0a
Merge: da8f2e246183ae109f87694ee3f06e8fcca2931b 226291aa4641fa13cb5dec3bcb3379faa83009e2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 6 20:08:25 2010 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2_connection_find() returns pointer to bad structure
ocfs2: char is not always signed
Ocfs2: Stop tracking a negative dentry after dentry_iput().
ocfs2: fix memory leak
fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
commit da8f2e246183ae109f87694ee3f06e8fcca2931b
Author: Olof Johansson <olof@xxxxxxxxx>
Date: Mon Dec 6 19:36:32 2010 -0600
ARM: tegra: fix regression from addruart rewrite
Commit 0ea129300982 ("arm: return both physical and virtual addresses
from addruart") took out the test for MMU on/off but didn't switch the
ldr instructions to no longer be conditionals based on said test.
Fix that.
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
Acked-by: Colin Cross <ccross@xxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 0e7d0c860a0dee49dacb7bbb248d1eba637075ad
Author: Gabor Juhos <juhosg@xxxxxxxxxxx>
Date: Mon Dec 6 17:14:47 2010 -0800
Input: add input driver for polled GPIO buttons
The existing gpio-keys driver can be usable only for GPIO lines with
interrupt support. Several devices have buttons connected to a GPIO
line which is not capable to generate interrupts. This patch adds a
new input driver using the generic GPIO layer and the input-polldev
to support such buttons.
[Ben Gardiner <bengardiner@xxxxxxxxxxxxxx: fold code to use more
of the original gpio_keys infrastructure; cleanups and other
improvements.]
Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx>
Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Tested-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:51 2010 -0800
staging: hv: Convert camel case local variables in blkvsc.c to lowercase
Convert camel case local variables in blkvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2e6484acd28bb5223942d2608387af3ec9bf56f1
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:50 2010 -0800
staging: hv: Convert camel case function names in blkvsc.c to lowercase
Convert camel case function names in blkvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f638859e3203d1ae933e7f2114cca68f1ac407db
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:49 2010 -0800
staging: hv: Convert camel case local variables in storvsc.c to lowercase
Convert camel case local variables in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 02e37db7148a5ee98a742a0ff2f7e3acc406049b
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:48 2010 -0800
staging: hv: Convert camel case function names in storvsc.c to lowercase
Convert camel case function names in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3d8cdf22b314f84cc4ae85ed650ccd37150a7562
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:47 2010 -0800
staging: hv: Convert camel case struct fields in storvsc.c to lowercase
Convert camel cased struct fields in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit eb4f3e0aa6bef825b964159923e38a0e4c027084
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:46 2010 -0800
staging: hv: Convert camel case functions in storvsc_api.h to lowercase
Convert camel case functions in storvsc_api.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8a046024a7cbbe9e4c16f4e34dda0f0dbcbc6723
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:45 2010 -0800
staging: hv: Convert camel case struct fields in storvsc_api.h to lowercase
Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d2aaba455fed75f231fe30fccfd25bcb8d8ff305
Author: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Date: Mon Dec 6 12:26:44 2010 -0800
staging: hv: Convert camel case struct fields in vstorage.h to lowercase
Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@xxxxxxxxxxxxx>
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 37db526463a5ad1c96cd803d49fddbf069bbf9b9
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:03:38 2010 +0300
Staging: Beceem: more checkpatch.pl changes to InterfaceInit.c
The only checkpatch.pl issues remaining still remaining are line length
complaints.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 07a7f68800a490bc1140de778e196f66ef4596d9
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:03:13 2010 +0300
Staging: Beceem: improve debug printk statements
These are just small changes. Some grammar and wording changes. I added
new lines to the end of all the print statements.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6b74705e15d5c87181008f1ac984df7faaad55c9
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:02:55 2010 +0300
Staging: Beceem: use after free in bcm_exit()
We can't call class_destroy() until after the driver has been deregistered.
It leads to a NULL deref on module unload.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit cd0b0ebfbe134b9c98fa8e628732b0e41b2cb48c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:02:36 2010 +0300
Staging: Beceem: remove old kernel compatibility code
This drops compatability for everything from 2.4 to 2.6.35. Now it only
works on the latest kernel.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c2a0b162dbce1534cf4e71914597419ae83a70d9
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:02:11 2010 +0300
Staging: Beceem: white space changes to InterfaceInit.c
This patch only changes:
1) spaces, tabs, and newline characters.
2) comment styles.
The compiled object file is the same before and after except for line
number changes.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2a314742d300edc2010d50a006c77ceb04c75119
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:01:41 2010 +0300
Staging: Beceem: use lower case "int" instead of "INT"
This patch changes:
INT => int
ULONG => unsigned long
VOID => void
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 85c0b1760a7c259679d188bef58866fc641deca5
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Mon Dec 6 10:01:16 2010 +0300
Staging: Beceem: add USB id for BCSM250 Mobile WiMAX
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e304151f150104412c9a304dffd6dc5c160ea336
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Mon Dec 6 22:42:48 2010 +0100
staging: brcm80211: replaced wlc_hw_info_t by struct wlc_hw_info
Part of code cleanup effort.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8538576474e162e4967532a80305d17e871f2fa5
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Sat Dec 4 16:35:43 2010 +0100
staging: brcm80211: remove macro usage for sk_buff release
PKTFREE macro calls osl_pktfree. This function has been renamed to
pkt_buf_free_skb as it comprises of functionality additional to
dev_kfree_skb(_any) function and to get rid of the OSL concept in
this driver.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Reviewed-by: Dowan Kim <dowan@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f09e02322ed36feafba6e3a6373e0bcd93730ce6
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Sat Dec 4 16:35:42 2010 +0100
staging: brcm80211: remove macro usage for sk_buff allocation
PKTGET macro calls osl_pktget. This function has been renamed to
pkt_buf_get_skb as it comprises of functionality additional to
dev_alloc_skb function and to get rid of the OSL concept in this driver.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Reviewed-by: Dowan Kim <dowan@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c6a9e1fc715763175842014a83a9ea70f7e19ace
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Sat Dec 4 08:38:02 2010 +0100
staging: brcm80211: replaced wlc_info_t by struct wlc_info.
Part of code cleanup effort. Global replace of wlc_info_t with struct wlc_info.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e63449b7171fa19d1d2404179665d5ed146e8990
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 18:00:26 2010 -0800
staging: brcm80211: Removing cruft from osl.h
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 326a67977c15715d627525deade9e859f5cd5646
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 18:00:25 2010 -0800
staging: brcm80211: migrate register ops macros to bcmutils.h
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8968af14f8e2d636fa5b4c055e240c1f359b8716
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 18:00:24 2010 -0800
staging: brcm80211: move dma specific macros from osl to dma code
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 411ee44ad30b2a8c99c3b225a3cf381ec37b000e
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 16:30:39 2010 -0800
staging: brcm80211: move fullmac-only code from osl to fullmac files
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ec7957049668b4fcf755cd8a085cfe258d77fc9b
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 16:30:38 2010 -0800
staging: brcm80211: Remove unused softmac macros
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7a9b48b3d3e0f373dc996efde56a5bff0944d8de
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 16:30:37 2010 -0800
staging: brcm80211: Move osl_pub into osl
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 98ede2ed46cef38e98c8341d410323895f60570e
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Dec 3 16:30:36 2010 -0800
staging: brcm80211: OSLREGOPS is unused, remove checks for it.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit cb9675f3282f5565cc9e3698cc847355c1194871
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 26 17:06:02 2010 +0000
arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
clk_get() returns ERR_PTR() on error, not NULL.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
[tony@xxxxxxxxxxx: updated to include err.h to compile on omap1]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 859158bfab7e72af440622fb9731bcaef4e7d6dc
Author: Sukumar Ghorai <s-ghorai@xxxxxx>
Date: Fri Nov 19 14:45:26 2010 +0000
omap: nand: remove hardware ECC as default
Commit 2c01946c6b9ebaa5a89710bc42ca224a7f52f227 (omap3 nand: cleanup
virtual address usages) wrongly enabled CONFIG_MTD_NAND_OMAP_HWECC
which breaks boards like beagle and pandora that use software ECC
for write.
Boards like beagle and pandora uses sw ecc for write (e.g. binary flushed
from u-boot) and read from kernel.
Signed-off-by: Sukumar Ghorai <s-ghorai@xxxxxx>
Acked-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>
[tony@xxxxxxxxxxx: updated comments]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit f811036476d7c8a9b594ebcdcf481bdbe497eb13
Author: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Date: Fri Nov 26 23:59:24 2010 +0000
omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
This patch complements ed919b0 "mmc: sdio: fix runtime PM anomalies by
introducing MMC_CAP_POWER_OFF_CARD" by declaring MMC_CAP_POWER_OFF_CARD
on the ZOOM's wl1271 mmc slot.
This is required in order not to break runtime PM support for the wl1271
sdio driver.
Signed-off-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Signed-off-by: Chris Ball <cjb@xxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7787d2c2f440cc7854bed3d039bf4cc59d9e7897
Merge: 60658f8a293750b59a8a844bf5c387139af9500a c9e664f1fdf34aa8cede047b206deaa8f1945af0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 6 15:51:14 2010 -0800
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: Fix memory corruption related to swap
PM / Hibernate: Use async I/O when reading compressed hibernation image
commit cd38557d78554fd4318fe448f728a8d7ff1cbabb
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Nov 15 23:53:11 2010 +0000
sfc: Use TX push whenever adding descriptors to an empty queue
Whenever we add DMA descriptors to a TX ring and update the ring
pointer, the TX DMA engine must first read the new DMA descriptors and
then start reading packet data. However, all released Solarflare 10G
controllers have a 'TX push' feature that allows us to reduce latency
by writing the first new DMA descriptor along with the pointer update.
This is only useful when the queue is empty. The hardware should
ignore the pushed descriptor if the queue is not empty, but this check
is buggy, so we must do it in software.
In order to tell whether a TX queue is empty, we need to compare the
previous transmission count (write_count) and completion count
(read_count). However, if we do that every time we update the ring
pointer then read_count may ping-pong between the caches of two CPUs
running the transmission and completion paths for the queue.
Therefore, we split the check for an empty queue between the
completion path and the transmission path:
- Add an empty_read_count field representing a point at which the
completion path saw the TX queue as empty.
- Add an old_write_count field for use on the completion path.
- On the completion path, whenever read_count reaches or passes
old_write_count the TX queue may be empty. We then read
write_count, set empty_read_count if read_count == write_count,
and update old_write_count.
- On the transmission path, we read empty_read_count. If it's set, we
compare it with the value of write_count before the current set of
descriptors was added. If they match, the queue really is empty and
we can use TX push.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit e506147271229d6c53b42c6a9897db67b5cfdb6d
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 6 22:58:41 2010 +0000
sfc: Remove locking from implementation of efx_writeo_paged()
It is not necessary to serialise writes to the paged 128-bit
registers. However, if we don't then we must always write the last
dword separately, not as part of a qword write.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 1a29cc40115c011895143c5f8278dee49423d5df
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 6 22:55:33 2010 +0000
sfc: Add compile-time checks for correctness of paged register writes
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 494bdf1b0fd58688d055f1b66c34b0844dcfc1fa
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 6 22:55:18 2010 +0000
sfc: Remove redundant memory barriers between MMIOs
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 9f2f6cd07a09bc0af1f2950189e426569561d1e6
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 6 22:55:00 2010 +0000
sfc: Expand/correct comments on collector behaviour and function usage
Document exactly which registers and functions have special behaviour,
and why races on writes to descriptor pointers are safe.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit 51c56f40ef41ca780ff001d59727eda03fa39374
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Wed Nov 10 18:46:40 2010 +0000
sfc: Use ACCESS_ONCE when copying efx_tx_queue::read_count
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit ab28c12a8e6fea875b6757052e211772f62fa771
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Mon Dec 6 22:53:15 2010 +0000
sfc: Reorder struct efx_nic to separate fields by volatility
Place the regularly updated fields (locks, MAC stats, etc.) on a
separate cache-line from fields which are mostly constant. This
should reduce cache misses for access to the latter on the data path.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
commit c9e664f1fdf34aa8cede047b206deaa8f1945af0
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Fri Dec 3 22:57:45 2010 +0100
PM / Hibernate: Fix memory corruption related to swap
There is a problem that swap pages allocated before the creation of
a hibernation image can be released and used for storing the contents
of different memory pages while the image is being saved. Since the
kernel stored in the image doesn't know of that, it causes memory
corruption to occur after resume from hibernation, especially on
systems with relatively small RAM that need to swap often.
This issue can be addressed by keeping the GFP_IOFS bits clear
in gfp_allowed_mask during the entire hibernation, including the
saving of the image, until the system is finally turned off or
the hibernation is aborted. Unfortunately, for this purpose
it's necessary to rework the way in which the hibernate and
suspend code manipulates gfp_allowed_mask.
This change is based on an earlier patch from Hugh Dickins.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Reported-by: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Hugh Dickins <hughd@xxxxxxxxxx>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 60658f8a293750b59a8a844bf5c387139af9500a
Merge: 771f8bc71c31c6bd103cdec283012253f352ab1c f444a57ca10fa7c199f1daf1cebd1fd329004992
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 6 14:49:51 2010 -0800
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6524/1: GIC irq desciptor bug fix
ARM: 6523/1: iop: ensure sched_clock() is notrace
ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers
ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
ARM: 6504/1: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2.
ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
ARM: 6502/1: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S
ARM: 6501/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S
ARM: 6500/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S
ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S
ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL
ARM: 6497/1: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL
ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interrupts
ARM: cns3xxx: Fix build with CONFIG_PCI=y
commit 884639996814585ef7079daa9e03a1eb562e235c
Author: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
Date: Mon Nov 22 15:31:03 2010 -0500
cifs: remove Local_System_Name
...this string is zeroed out and nothing ever changes it.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 9f339caf8454f0c21983111350ede93983db4340
Author: Bojan Smojver <bojan@xxxxxxxxxxxxx>
Date: Thu Nov 25 23:41:39 2010 +0100
PM / Hibernate: Use async I/O when reading compressed hibernation image
This is a fix for reading LZO compressed image using async I/O.
Essentially, instead of having just one page into which we keep
reading blocks from swap, we allocate enough of them to cover the
largest compressed size and then let block I/O pick them all up. Once
we have them all (and here we wait), we decompress them, as usual.
Obviously, the very first block we still pick up synchronously,
because we need to know the size of the lot before we pick up the
rest.
Also fixed the copyright line, which I've forgotten before.
Signed-off-by: Bojan Smojver <bojan@xxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
commit 8b14d7b22c61f17ccb869e0047d9df6dd9f50a9f
Author: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
Date: Sun Nov 28 19:46:50 2010 -0200
wmi: use memcmp instead of strncmp to compare GUIDs
While looking for the duplicates in /sys/class/wmi/, I couldn't find
them. The code that looks for duplicates uses strncmp in a binary GUID,
which may contain zero bytes. The right function is memcmp, which is
also used in another section of wmi code.
It was finding 49142400-C6A3-40FA-BADB-8A2652834100 as a duplicate of
39142400-C6A3-40FA-BADB-8A2652834100. Since the first byte is the fourth
printed, they were found as equal by strncmp.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 40fe7d88ab3eb711b307fab1b92aa6870914c975
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 2 07:22:05 2010 +0000
net: cris/eth_v10: Use net_device_stats from struct net_device_stats
struct net_device has its own struct net_device_stats member, so use
this one instead of a private copy in struct net_local.
Note: This patch was not even compile tested.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b27d50a9ff5cf2775b7a4daf571a0cc72d013b9c
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 2 07:20:39 2010 +0000
net: emaclite: Omit private ndo_get_stats function
xemaclite_get_stats() just returns dev->stats so we can leave it out
alltogether and let dev_get_stats() do the job.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e176bbc5893bef36a0909de31dea97865660a7c9
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Thu Dec 2 07:20:05 2010 +0000
net: am79c961a: Omit private ndo_get_stats function
am79c961_getstats() just returns dev->stats so we can leave it out
alltogether and let dev_get_stats() do the job.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9f91170773d852e65e4fc36e1f8173ce614f62e1
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 13:24:05 2010 +0000
ixgbe: fix enum type mismatch on disable laser
Fixes a recent bug on the patch (c6ecf39a10ceec3e97096e2a8d3eadcecd593422)
that disabled the laser on ifconfig down. Compilers were seeing a enum
mismatch.
Signed-off-by Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a7f5a5fcd9f13afd3471a0de8c1fdaa8f989497c
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 13:23:30 2010 +0000
ixgbe: fix for link failure on SFP+ DA cables
This patch helps prevent FW/SW semaphore collision from leading
to link establishment failure. The collision might mess up the
PHY registers so we reset the PHY. However there are SFI/KR areas
in the PHY that are not reset with a Reset_AN so we need to change
LMS to reset it. Also wait until AN state machine is AN_GOOD
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b8eb3a1046f68a5b8f284830d971c62688cd606b
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Wed Dec 1 20:54:53 2010 +0000
ixgbe: fix possible NULL pointer deference in shutdown path
After freeing the rings we were not zeroing out the ring count values.
This patch now clears these counts correctly.
Reported-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8917a3c0b7d1557548f50bfe3f0e18e0354e38f6
Author: David Shwatrz <dshwatrz@xxxxxxxxx>
Date: Thu Dec 2 09:01:55 2010 +0000
Fix a typo in datagram.c and sctp/socket.c.
Hi,
This patch fixes a typo in net/core/datagram.c and in net/sctp/socket.c
Regards,
David Shwartz
Signed-off-by: David Shwartz <dshwatrz@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 22de94de7de78b8de2fb1f2df5aa85b5556cfcfd
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Dec 3 15:41:48 2010 +0100
iwlwifi: jiffies based tx queues watchdog
This patch replace monitor/recover timer by watchdog based on time
stamp. New code allow to discover hangs more precisely.
Timeout values are currently doubled monitoring period values of
previous timer. This have to be tuned based of firmware timing
capabilities.
Tested on 3945, 4965, 5300, 6300.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit abc471dc31be15f9fee5ec77f25d31b927d334b9
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Dec 3 15:41:47 2010 +0100
iwl3945: prevent too frequent firmware resets
Similarly like on iwlagn, initialize reset duration on iwl3945 to prevent
too frequent firmware resets.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 29cbe68c516a48a9a88b3226878570c6cbd83c02
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri Dec 3 09:20:44 2010 +0100
cfg80211/mac80211: add mesh join/leave commands
Instead of tying mesh activity to interface up,
add join and leave commands for mesh. Since we
must be backward compatible, let cfg80211 handle
joining a mesh if a mesh ID was pre-configured
when the device goes up.
Note that this therefore must modify mac80211 as
well since mac80211 needs to lose the logic to
start the mesh on interface up.
We now allow querying mesh parameters before the
mesh is connected, which simply returns defaults.
Setting them (internally renamed to "update") is
only allowed while connected. Specify them with
the new mesh join command instead where needed.
In mac80211, beaconing must now also follow the
mesh enabled/not enabled state, which is done
by testing the mesh ID.
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bd90fdcc5fbd99a2a778999610420cf793bd1be2
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri Dec 3 09:20:43 2010 +0100
nl80211: refactor mesh parameter parsing
I'm going to need this in a new place later.
Tested-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f9e10ce4cf86945eb5efcab31284c971877ed012
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri Dec 3 09:20:42 2010 +0100
cfg80211: require add_virtual_intf to return new dev
cfg80211 used to do all its bookkeeping in
the notifier, but some new stuff will have
to use local variables so make the callback
return the netdev pointer.
Tested-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 09b174702601079c3a04806754be30ffbd70db4d
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri Dec 3 09:20:41 2010 +0100
mac80211: move mesh filter adjusting
Logically, the filter adjusting belongs with
starting/stopping mesh, not interface up/down,
so move it there.
Tested-by: Javier Cardona <javier@xxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 45904f21655cf4f0ae7d0fab5906fe51bf56ecf4
Author: Javier Cardona <javier@xxxxxxxxxxx>
Date: Fri Dec 3 09:20:40 2010 +0100
nl80211/mac80211: define and allow configuring mesh element TTL
The TTL in path selection information elements is different from
the mesh ttl used in mesh data frames. Version 7.03 of the 11s
draft calls this ttl 'Element TTL'.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b9e61f11f47035e3b4545b51fb547fef48eb3096
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Fri Dec 3 06:12:39 2010 +0200
ath5k: Include tx ack reporting on hw flags
* Since we report tx acks to the protocol stack, add the needed
flag to hw_flags. This way we'll also use the new AP probing mechanism.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f0e134a53ad95ba7a393b299ae56c9bdcaed8aec
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Fri Dec 3 06:09:38 2010 +0200
ath5k: Fix reporting of RX dma stop failure
* Correctly report failure to stop RX DMA
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 344b54b971bc5578281264fb6896e13b4120352b
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Fri Dec 3 06:07:13 2010 +0200
ath5k: Disable ANI during reset
* Stop ANI durring reset to prevent false PHY error reports
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 19252ecb672d3f35959c576d1d26b9aca350f5bf
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Fri Dec 3 06:05:19 2010 +0200
ath5k: Always free tx buffers before reset
* Always free tx buffers before reset, since we also empty hw queues.
If we don't and a queue gets stuck, we'll never decrease txq_len and sw
will keep thinking the queue is still stuck even after reset.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2d5311e4e8272fd398fc1cf278f12fd6dee4074b
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 1 20:46:24 2010 +0000
filter: add a security check at install time
We added some security checks in commit 57fe93b374a6
(filter: make sure filters dont read uninitialized memory) to close a
potential leak of kernel information to user.
This added a potential extra cost at run time, while we can perform a
check of the filter itself, to make sure a malicious user doesnt try to
abuse us.
This patch adds a check_loads() function, whole unique purpose is to
make this check, allocating a temporary array of mask. We scan the
filter and propagate a bitmask information, telling us if a load M(K) is
allowed because a previous store M(K) is guaranteed. (So that
sk_run_filter() can possibly not read unitialized memory)
Note: this can uncover application bug, denying a filter attach,
previously allowed.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Cc: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Wed Dec 1 20:07:31 2010 +0000
net: arp: use assignment
Only when dont_send is 0, arp_filter() is consulted, so we can simply
assign the return value of arp_filter() to dont_send instead.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6464281161e46254ac39505ad41d21dbe7d1738f
Author: Sathya Perla <sathya.perla@xxxxxxxxxx>
Date: Wed Dec 1 01:04:17 2010 +0000
be2net: Handle out of buffer completions for lancer
If Lancer chip does not have posted RX buffers, it posts an RX completion entry
with the same frag_index as the last valid completion. The Error bit is also
set. In BE, a flush completion is indicated with a zero value for num_rcvd in
the completion.
Such completions don't carry any data and are not processed.
This patch refactors code to handle both cases with the same code.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@xxxxxxxxxx>
Signed-off-by: Sathya Perla <sathya.perla@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 359a972fae84242efa26b86bf09c3ac3784405ba
Author: Sathya Perla <sathya.perla@xxxxxxxxxx>
Date: Wed Dec 1 01:03:36 2010 +0000
be2net: FW init cmd fix for lancer
Lancer can use the same pattern as BE to indicate a driver load
to the FW.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@xxxxxxxxxx>
Signed-off-by: Sathya Perla <sathya.perla@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 63657b9c319588cd35ed869e19cc6255dbef0d20
Author: Sathya Perla <sathya.perla@xxxxxxxxxx>
Date: Wed Dec 1 01:02:28 2010 +0000
be2net: Fix be_dev_family_check() return value check
Signed-off-by: Sathya Perla <sathya.perla@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c56b4d90123b77e29a91b9b96bb791f929139d8e
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Wed Dec 1 02:52:57 2010 +0000
af_packet: remove pgv.flags
As we can check if an address is vmalloc address with is_vmalloc_addr(),
we remove pgv.flags. Then we may get more pg_vecs.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0af55bb58f8fa7865004ac48d16affe125ac1b7f
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Wed Dec 1 02:52:20 2010 +0000
af_packet: use vmalloc_to_page() instead for the addresss returned by vmalloc()
The following commit causes the pgv->buffer may point to the memory
returned by vmalloc(). And we can't use virt_to_page() for the vmalloc
address.
This patch introduces a new inline function pgv_to_page(), which calls
vmalloc_to_page() for the vmalloc address, and virt_to_page() for the
__get_free_pages address.
We used to increase page pointer to get the next page at the next page
address, after Neil's patch, it is wrong, as the physical address may
be not continuous. This patch also fixes this issue.
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f7fce74e387e0563e5a165704664aa5ee8b2f48b
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 1 06:03:06 2010 +0000
net: kill an RCU warning in inet_fill_link_af()
commits 9f0f7272 (ipv4: AF_INET link address family) and cf7afbfeb8c
(rtnl: make link af-specific updates atomic) used incorrect
__in_dev_get_rcu() in RTNL protected contexts, triggering PROVE_RCU
warnings.
Switch to __in_dev_get_rtnl(), wich is more appropriate, since we hold
RTNL.
Based on a report and initial patch from Amerigo Wang.
Reported-by: Amerigo Wang <amwang@xxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Reviewed-by: WANG Cong <amwang@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 06a9701f4b3e3381dea96fee1cc8a3bb41b0a1f1
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Dec 1 01:37:42 2010 +0000
__in_dev_get_rtnl() can use rtnl_dereference()
If caller holds RTNL, we dont need a memory barrier
(smp_read_barrier_depends) included in rcu_dereference().
Just use rtnl_dereference() to properly document the assertions.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit da2033c282264bfba4e339b7cb3df62adb5c5fc8
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 30 21:45:56 2010 +0000
filter: add SKF_AD_RXHASH and SKF_AD_CPU
Add SKF_AD_RXHASH and SKF_AD_CPU to filter ancillary mechanism,
to be able to build advanced filters.
This can help spreading packets on several sockets with a fast
selection, after RPS dispatch to N cpus for example, or to catch a
percentage of flows in one queue.
tcpdump -s 500 "cpu = 1" :
[0] ld CPU
[1] jeq #1 jt 2 jf 3
[2] ret #500
[3] ret #0
# take 12.5 % of flows (average)
tcpdump -s 1000 "rxhash & 7 = 2" :
[0] ld RXHASH
[1] and #7
[2] jeq #2 jt 3 jf 4
[3] ret #1000
[4] ret #0
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Rui <wirelesser@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 539995d18649023199986424d140f1d620372ce5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 30 08:18:44 2010 +0000
ehea: Use the standard logging functions
Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.
Uncompiled/untested.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Breno Leitao<leitao@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7903264402546f45f9bac8ad2bfdb00d00eb124a
Author: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Date: Tue Nov 30 06:38:00 2010 +0000
net: Fix too optimistic NETIF_F_HW_CSUM features
NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but
some drivers miss the difference. Fix this and also fix UFO dependency
on checksumming offload as it makes the same mistake in assumptions.
Signed-off-by: MichaÅ? MirosÅ?aw <mirq-linux@xxxxxxxxxxxx>
Acked-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 900d495a189dc3ff5952b98a77d18e3018f8286c
Author: Alexey Orishko <alexey.orishko@xxxxxxxxx>
Date: Mon Nov 29 23:23:28 2010 +0000
USB CDC NCM host driver
The patch provides USB CDC NCM host driver support in the Linux Kernel.
Changes:
drivers/net/usb/cdc_ncm.c:
- initial submission of the CDC NCM host driver;
- verified on Intel 32/64 bit, Intel Atom, ST-Ericsson U8500 (ARM)
- throughput measured over 100 Mbits duplex;
- driver supports 16-bit NTB format only, but it is more than enough for
transfers up to 64K;
- driver can handle up to 32 datagrams in received NTB;
- timer is used to collect several packets in Tx direction
drivers/net/usb/Kconfig:
- a new entry to compile CDC NCM host driver
drivers/net/usb/Makefile:
- a new entry to compile CDC NCM host driver
Signed-off-by: Alexey Orishko <alexey.orishko@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 073285fd392f6dc901da7c698d46e1e2a7e26436
Author: Alexey Orishko <alexey.orishko@xxxxxxxxx>
Date: Mon Nov 29 23:23:27 2010 +0000
usbnet: changes for upcoming cdc_ncm driver
Changes:
include/linux/usb/usbnet.h:
- a new flag to indicate driver's capability to accumulate IP packets in Tx
direction and extract several packets from single skb in Rx direction.
drivers/net/usb/usbnet.c:
- the procedure of counting packets in usbnet was updated due to the
accumulating of IP packets in the driver
- no short packets are sent if indicated by the flag in driver_info
structure
Signed-off-by: Alexey Orishko <alexey.orishko@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d84938c9be85f4738a350ef44210789fef915cb7
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Fri Dec 3 06:03:00 2010 +0200
ath5k: Always write tx powertable on hw
* By skipping tx power table calibration we also skip setting
tx power table on hw. Make sure we always write tx power table
on hw since it gets cleared on reset.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 04ac3c0ee2c773c321ec472d892635a20556f34d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 21:01:08 2010 +0100
mac80211: speed up AP probing using nullfunc frames
If the nullfunc frame used to probe the AP was not acked, there is no point
in waiting for the probe timeout, so advance to the next try (or disconnect)
immediately.
If we do reach the probe timeout without having received a tx status, the
connection is probably really bad and worth disconnecting.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 75706d0e9d19601534446982b70102bb9327169b
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 21:01:07 2010 +0100
mac80211: remove a redundant check
ieee80211_is_nullfunc() implies ieee80211_is_data()
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit af5568843594fb71055debe36e521fa8072fcecc
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 2 19:50:37 2010 +0900
lib: Improve EWMA efficiency by using bitshifts
Using bitshifts instead of division and multiplication should improve
performance. That requires weight and factor to be powers of two, but i think
this is something we can live with.
Thanks to Peter Zijlstra for the improved formula!
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
--
v2: use log2.h functions
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5dcc03fe29537edd7819f5b121bf3d779693f37b
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 2 19:12:31 2010 +0900
ath5k: Use EWMA factor of 1024 instead of 1000
This prepares the only place which uses the EWMA library so far for the
performance improved implementation coming up, which requires factor and
weight to be a power of two.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9a10a870e09f1fd50fd024d55232b4b72cf4e387
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Dec 1 09:37:55 2010 -0800
MAINTAINERS: Add ATH GENERIC UTILITIES
This file pattern is not currently shown as maintained
by atheros. Perhaps it should be?
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c1ce5a74d113f221d40625bd3ad83df2db2695b7
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Wed Dec 1 16:34:45 2010 +0100
mac80211: Update last_tx_rate only for data frames
The last_tx_rate field was also updated for non-data frames that are
often sent with a lower rate (for example management frames at 1 Mbps).
This is confusing when the data rate is actually much higher.
Hence, only update the last_tx_rate field with tx rate information
gathered from last data frames.
If the rate control algorithm filled in txrc.reported_rate we don't need
to verify this information.
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5f79ed3b1aa7af260c82ba714b90907070aeca7a
Merge: 09f921f83faa49cdea25abfb98c439c01526b89d 9f28ebc381ca00af0f9033a29776775068344b06
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 6 15:52:27 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit f435d9eea01309aa7b6c1f134569a7b5957918ae
Merge: 5ee493767352314893520ac40aec5bb07d0147e0 09f921f83faa49cdea25abfb98c439c01526b89d
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Dec 6 15:35:34 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 79df1baeec29022e4181f2964187b88661ef5517
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 6 12:52:08 2010 -0500
cifs: fix use of CONFIG_CIFS_ACL
Some of the code under CONFIG_CIFS_ACL is dependent upon code under
CONFIG_CIFS_EXPERIMENTAL, but the Kconfig options don't reflect that
dependency. Move more of the ACL code out from under
CONFIG_CIFS_EXPERIMENTAL and under CONFIG_CIFS_ACL.
Also move find_readable_file out from other any sort of Kconfig
option and make it a function normally compiled in.
Reported-and-Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 991cfffa7c19aa648546aff666595af896e568ba
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Dec 3 11:51:37 2010 +0800
x86, earlyprintk: Move mrst early console to platform/ and fix a typo
Move the code to arch/x86/platform/mrst/. Also fix a typo to use
the correct config option: ONFIG_EARLY_PRINTK_MRST
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Cc: alan@xxxxxxxxxxxxxxx
LKML-Reference: <1291348298-21263-1-git-send-email-feng.tang@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 5ee493767352314893520ac40aec5bb07d0147e0
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Mon Dec 6 08:28:54 2010 +0000
tg3: Update version to 3.116
This patch updates the tg3 version to 3.116.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a386b9011a4687470e6168e2f2a08c468f25f72f
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Mon Dec 6 08:28:53 2010 +0000
tg3: Relax EEE thresholds
The hardware defaults to fairly aggressive EEE thresholds. While there
appear to be no ill effects, this patch relaxes them, just as a
precaution.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a6b68dab169e2a51e59f43504f1279cbc2afcde8
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Mon Dec 6 08:28:52 2010 +0000
tg3: Minor EEE code tweaks
The first hunk of this patch makes sure that the driver checks for the
appropriate preconditions before checking if EEE negotiation succeeded.
More specifically the link needs to be full duplex for EEE to be
enabled.
The second and third hunks of this patch fix a bug where the eee
advertisement register would be programmed with extra bits set.
The fourth hunk of this patch makes sure the EEE capability flag is not
set for 5718 A0 devices and that the device is not a serdes device.
None of these modifications are strictly necessary. The driver /
hardware still does the right thing. They are submitted primarily for
correctness.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 699c019385fcb13498a5a3a8bd368f04f1d4a223
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Mon Dec 6 08:28:51 2010 +0000
tg3: Fix 57765 EEE support
EEE support in the 57765 internal phy will not enable after a phy reset
unless it sees that EEE is supported in the MAC. This patch moves the
code that programs the CPMU EEE registers to a place before the phy
reset.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3110f5f5545a645c50ef66b1f705d08dfd1df404
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Mon Dec 6 08:28:50 2010 +0000
tg3: Move EEE definitions into mdio.h
In commit 52b02d04c801fff51ca49ad033210846d1713253 entitled "tg3: Add
EEE support", Ben Hutchings had commented that the EEE advertisement
register will be in a standard location. This patch moves that
definition into mdio.h and changes the code to use it.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8fc2f9956127d2b85280c07e69aeb08b9bd85150
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Mon Dec 6 08:28:49 2010 +0000
tg3: Raise the jumbo frame BD flag threshold
The current transmit routines set the jumbo frame BD flag too
aggressively. This can reduce performance for common cases. This patch
raises the jumbo flag threshold to 1518, up from 1500.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 183f732c3f3f307d5673e17b69de6894e1dd2918
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Mon Dec 6 15:56:17 2010 +0200
Bluetooth: Fix initial RFCOMM DLC security level
Due to commit 63ce0900 connections initiated through TTYs created with
"rfcomm bind ..." would have security level BT_SECURITY_SDP instead of
BT_SECURITY_LOW. This would cause instant connection failure between any
two SSP capable devices due to the L2CAP connect request to RFCOMM being
sent before authentication has been performed. This patch fixes the
regression by always initializing the DLC security level to
BT_SECURITY_LOW.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Acked-by: Luiz Augusto von Dentz <luiz.dentz-von@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 1cd275f609ba46c8cae3ee77e499c54a0d13a983
Author: Sage Weil <sage@xxxxxxxxxxxx>
Date: Mon Dec 6 09:45:22 2010 -0800
ceph: fix ioctl magic
The ioctl magic was inadvertently changed in 571dba52.
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit df6bd743b6f06b066c1c3ba7f2853a6e8d61468c
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date: Mon Jun 14 02:26:15 2010 -0300
Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state
If such event happens we shall reply with a Command Reject, because we are
not expecting any configure request.
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
commit 46bcf14f44d8f31ecfdc8b6708ec15a3b33316d9
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Dec 6 09:29:43 2010 -0800
filter: fix sk_filter rcu handling
Pavel Emelyanov tried to fix a race between sk_filter_(de|at)tach and
sk_clone() in commit 47e958eac280c263397
Problem is we can have several clones sharing a common sk_filter, and
these clones might want to sk_filter_attach() their own filters at the
same time, and can overwrite old_filter->rcu, corrupting RCU queues.
We can not use filter->rcu without being sure no other thread could do
the same thing.
Switch code to a more conventional ref-counting technique : Do the
atomic decrement immediately and queue one rcu call back when last
reference is released.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 18483b81ee7e70ee68d4b18be618be5cfcc0b290
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Dec 6 15:13:38 2010 -0200
perf record: Fix eternal wait for stillborn child
When execvp fails to find the specified command on the path we won't get
SIGCHLD, so send a SIGUSR1 and exit right away.
Current situation would require a SIGINT performed by the user and would
produce meaningless summary.
Now:
[acme@emilia linux]$ ./foo
-bash: ./foo: No such file or directory
[acme@emilia linux]$ perf record ./foo
./foo: No such file or directory
[acme@emilia linux]$
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit f984ba4eb575e4a27ed28a76d4126d2aa9233c32
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:54:34 2010 +0900
kprobes: Use text_poke_smp_batch for unoptimizing
Use text_poke_smp_batch() on unoptimization path for reducing
the number of stop_machine() issues. If the number of
unoptimizing probes is more than MAX_OPTIMIZE_PROBES(=256),
kprobes unoptimizes first MAX_OPTIMIZE_PROBES probes and kicks
optimizer for remaining probes.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
LKML-Reference: <20101203095434.2961.22657.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cd7ebe2298ff1c3112232878678ce5fe6be8a15b
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:54:28 2010 +0900
kprobes: Use text_poke_smp_batch for optimizing
Use text_poke_smp_batch() in optimization path for reducing
the number of stop_machine() issues. If the number of optimizing
probes is more than MAX_OPTIMIZE_PROBES(=256), kprobes optimizes
first MAX_OPTIMIZE_PROBES probes and kicks optimizer for
remaining probes.
Changes in v5:
- Use kick_kprobe_optimizer() instead of directly calling
schedule_delayed_work().
- Rescheduling optimizer outside of kprobe mutex lock.
Changes in v2:
- Allocate code buffer and parameters in arch_init_kprobes()
instead of using static arraies.
- Merge previous max optimization limit patch into this patch.
So, this patch introduces upper limit of optimization at
once.
Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
LKML-Reference: <20101203095428.2961.8994.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7deb18dcf0478940ac979de002db1ed8ba6531dc
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:54:22 2010 +0900
x86: Introduce text_poke_smp_batch() for batch-code modifying
Introduce text_poke_smp_batch(). This function modifies several
text areas with one stop_machine() on SMP. Because calling
stop_machine() is heavy task, it is better to aggregate
text_poke requests.
( Note: I've talked with Rusty about this interface, and
he would not like to expand stop_machine() interface, since
it is not for generic use. )
Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: Jan Beulich <jbeulich@xxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <20101203095422.2961.51217.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0490cd1f9d99569d3bd64e17adc88db06a5007be
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:54:16 2010 +0900
kprobes: Reuse unused kprobe
Reuse unused (waiting for unoptimizing and no user handler)
kprobe on given address instead of returning -EBUSY for
registering a new kprobe.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <20101203095416.2961.39080.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6274de4984a630b45c6934b3ee62e5692c745328
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:54:09 2010 +0900
kprobes: Support delayed unoptimizing
Unoptimization occurs when a probe is unregistered or disabled,
and is heavy because it recovers instructions by using
stop_machine(). This patch delays unoptimization operations and
unoptimize several probes at once by using
text_poke_smp_batch(). This can avoid unexpected system slowdown
coming from stop_machine().
Changes in v5:
- Split this patch into several cleanup patches and this patch.
- Fix some text_mutex lock miss.
- Use bool instead of int for behavior flags.
- Add additional comment for (un)optimizing path.
Changes in v2:
- Use dynamic allocated buffers and params.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <20101203095409.2961.82733.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 61f4e13ffd85c037a942c5b7fd13f2b0c3162862
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:54:03 2010 +0900
kprobes: Separate kprobe optimizing code from optimizer
Separate kprobe optimizing code from optimizer, this
will make easy to introducing unoptimizing code in
optimizer.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <20101203095403.2961.91201.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6f0f1dd71953d4243c11e490dd49ef24ebaf6c0b
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:53:57 2010 +0900
kprobes: Cleanup disabling and unregistering path
Merge disabling kprobe to unregistering kprobe function
and add comments for disabing/unregistring process.
Current unregistering code disables(disarms) kprobes after
checking target kprobe status. This patch changes it to
disabling kprobe first after that it changing the kprobe's
state. This allows to share probe disabling code between
disable_kprobe() and unregister_kprobe().
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <20101203095356.2961.30152.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6d8e40a85ef72a0514ebd00748eb18cab432b200
Author: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Date: Fri Dec 3 18:53:50 2010 +0900
kprobes: Rename old_p to more appropriate name
Rename irrelevant uses of "old_p" to more appropriate names.
Originally, "old_p" just meant "the old kprobe on given address"
but current code uses that name as "just another kprobe" or
something like that. This patch renames those pointer names
to more appropriate one for maintainability.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: 2nddept-manager@xxxxxxxxxxxxxxxxx
LKML-Reference: <20101203095350.2961.48110.stgit@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f444a57ca10fa7c199f1daf1cebd1fd329004992
Merge: 87507500b7fc3620e467abb617a3452f0cccc72d 44266416f786514ec43a0d15ad951c34566b99c9
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Dec 6 15:39:23 2010 +0000
Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx
commit e4d2ebcab11b308b5b59073578efd33eccd55d46
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Dec 3 11:51:38 2010 +0800
x86, apbt: Setup affinity for apb timers acting as per-cpu timer
Commit a5ef2e70 "x86: Sanitize apb timer interrupt handling" forgot
the affinity setup when cleaning up the code, this patch just
adds the forgotten part
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Cc: Jacob Pan <jacob.jun.pan@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <1291348298-21263-2-git-send-email-feng.tang@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 5ec6960f6f0c7be9cc6e5506fdf0070add3b6e08
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Mon Nov 22 06:28:48 2010 -0800
ce4100: Add errata fixes for UART on CE4100
This patch enables the UART on the CE4100. The UART has a couple of
issues that need to be worked around. First the UART is mostly PC
compatible except that it is clocked eight times faster than a
standard PC so the default configuration provided in
arch/x86/include/asm/serial.h needs to be overridden. Second the TX
interrupt may not be set correctly all the time. Lastly accessing the
UART via I/O space for early_prink() hangs the chip when the IOAPIC is
enabled.
A custom mem_serial_in() is provided to work around the TX interrupt
issue. The configuration issues are dealt with in the call back
registered with the 8250 driver via serial8250_set_isa_configurator()
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
LKML-Reference: <1290436128-17958-1-git-send-email-dirk.brandewie@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit ce47dc56a2241dc035160a85bc5e34283cdd622c
Author: Chris Samuel <chris@xxxxxxxxxxx>
Date: Sat Nov 13 13:35:06 2010 +1100
perf tools: Catch a few uncheck calloc/malloc's
There were a few stray calloc()'s and malloc()'s which were not having
their return values checked for success.
As the calling code either already coped with failure or didn't actually
care we just return -ENOMEM at that point.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Chris Samuel <chris@xxxxxxxxxxx>
LKML-Reference: <4CDDF95A.1050400@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 965bb6beaf70862d3846e330ea7a14996d82c499
Author: Stephane Eranian <eranian@xxxxxxxxxx>
Date: Fri Dec 3 17:52:01 2010 +0200
perf script: Fix compiler warning in builtin_script.c:is_top_script()
Fix annoying compiler warning in the is_top_script() function.
The issue was that a const char * was cast into a char * to call
ends_with(). We fix the users of ends_with() instead. Some are passing a
char *, but it is okay to cast the return value of ends_with() to char *
(because we understand what ends_with() does).
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxx>
LKML-Reference: <4cf92096.17edd80a.1540.5d60@xxxxxxxxxxxxx>
Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit cbf41645f35224798cb61641766e6a16e141ffe4
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Sun Dec 5 14:32:55 2010 +0100
perf session: Sort all events if ordered_samples=true
Now that we have timestamps on FORK, EXIT, COMM, MMAP events we can
sort everything in time order. This fixes the following observed
problem:
mmap(file1) -> pagefault() -> munmap(file1)
mmap(file2) -> pagefault() -> munmap(file2)
Resulted in decoding both pagefaults in file2 because the file1 map
was already replaced by the file2 map when the map address was
identical.
With all events sorted we decode both pagefaults correctly.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <alpine.LFD.2.00.1012051220450.2653@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit e4e18d568b0e833c75c1f7833e1690cdde8f4d76
Author: Akihiro Nagai <akihiro.nagai.hw@xxxxxxxxxxx>
Date: Fri Dec 3 12:58:53 2010 +0900
perf options: add OPT_CALLBACK_DEFAULT_NOOPT
Add new macro OPT_CALLBACK_DEFAULT_NOOPT for parse_options.
It enables to pass the default value (opt->defval) to the callback function
processing options require no argument.
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <20101203035853.7827.17502.stgit@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Akihiro Nagai <akihiro.nagai.hw@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 1437a30aae865d83c7d96e3401f503a73fffe14d
Author: Ian Munsie <imunsie@xxxxxxxxxxx>
Date: Mon Dec 6 13:37:04 2010 +1100
perf hist: Better displaying of unresolved DSOs and symbols
In the event that a DSO has not been identified, just print out [unknown]
instead of the instruction pointer as we previously were doing, which is pretty
meaningless for a shared object (at least to the users perspective).
The IP we print out is fairly meaningless in general anyway - it's just one
(the first) of the many addresses that were lumped together as unidentified,
and could span many shared objects and symbols. In reality if we see this
[unknown] output then the report -D output is going to be more useful anyway as
we can see all the different address that it represents.
If we are printing the symbols we are still going to see this IP in that column
anyway since they shouldn't resolve either.
This patch also changes the symbol address printouts so that they print out 0x
before the address, are left aligned, and changes the %L format string (which
relies on a glibc bug) to %ll.
Before:
74.11% :3259 4a6c [k] 4a6c
After:
74.11% :3259 [unknown] [k] 0x4a6c
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <1291603026-11785-2-git-send-email-imunsie@xxxxxxxxxxx>
Signed-off-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Fri Nov 26 17:50:20 2010 +0100
x86: io_apic: Split setup_ioapic_ids_from_mpc()
Sodaville needs to setup the IO_APIC ids as the boot loader leaves
them uninitialized. Split out the setter function so it can be called
unconditionally from the sodaville board code.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <20101126165020.GA26361@xxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Dec 6 16:48:03 2010 +0800
ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
As the comments of snd_soc_instantiate_cards() said,
snd_soc_instantiate_cards() must be called with client_mutex.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit ed8cc471d75365f8590c76f580def899d58028c0
Author: Uk Kim <w0806.kim@xxxxxxxxxxx>
Date: Sun Dec 5 17:26:07 2010 +0900
ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
SPKOUTL_BOOST start from third bit, SPKOUTLR_BOOST start from 0 bit.
Signed-off-by: Uk Kim <w0806.kim@xxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 3fcc0afbb9c93f3599ba03273e59915670b6c2c2
Author: Uk Kim <w0806.kim@xxxxxxxxxxx>
Date: Sun Dec 5 17:32:16 2010 +0900
ASoC: Fix off by one error in WM8994 EQ register bank size
Signed-off-by: Uk Kim <w0806.kim@xxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 4a55c18e2023096c8684fae5fa1cfa96a03172ff
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Mon Nov 29 17:06:53 2010 +0000
ARM: hw_breakpoint: fix warnings generated by sparse
sparse doesn't like per-cpu accesses such as:
static DEFINE_PER_CPU(struct perf_event *, foo[MAXLEN]);
struct perf_event **bar = __get_cpu_var(foo);
and shouts quite loudly about it:
| warning: incorrect type in assignment (different modifiers)
| expected struct perf_event **slots
| got struct perf_event *[noderef] *<noident>
This patch adds casts to these sorts of assignments in hw_breakpoint.c
in order to silence the warnings.
Reported-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit ce9b1b09520789223f72a9fefd5f0e329f8d89d0
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Thu Nov 25 12:59:31 2010 +0000
ARM: ptrace: fix style issue with hw_breakpoint interface
This patch fixes a trivial style issue in ptrace.c.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 3ce70b2e24cd35cc9f2df8cf5205b8ab4e6178e1
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Wed Dec 1 17:05:24 2010 +0000
ARM: hw_breakpoint: disallow per-cpu breakpoints without overflow handler
Single-stepping a breakpoint requires us to disable it temporarily so that
we don't get stuck in a recursive debug trap. With per-cpu breakpoints this
presents a problem where an interrupt can be taken before the single-step has
completed and a new task is eventually scheduled. This new task will not
hit the breakpoint because it will have been disabled during the previous
handling code.
This patch disallows per-cpu breakpoints on ARM when an overflow handler
is not present. A similar effect can be created by placing breakpoints on
a shell and then running applications there.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 9ebb3cbcc39d4e61ae6751167086acfb5c201e6f
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Wed Dec 1 14:12:13 2010 +0000
ARM: hw_breakpoint: unify single-stepping code for watchpoints and breakpoints
The single-stepping code is currently different depending on whether
we are stepping over a breakpoint or a watchpoint. There is no good
reason for this, so let's sort it out.
This patch adds functions for enabling/disabling single-step for
a particular hw_breakpoint and integrates this with the exception
handling code.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 93a04a3416da12647c47840ebe2bb812fcb801d0
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Mon Nov 29 16:56:01 2010 +0000
ARM: hw_breakpoint: do not allocate new breakpoints with preemption disabled
The watchpoint single-stepping code calls register_user_hw_breakpoint to
register a mismatch breakpoint for stepping over the watchpoint. This is
performed with preemption disabled, which is unsafe as we may end up scheduling
whilst in_atomic(). Furthermore, using the perf API is rather overkill since
we are already in the hw-breakpoint backend and only require access to reserved
breakpoints anyway.
This patch reworks the watchpoint stepping code so that we don't require
another perf_event for the mismatch breakpoint. Instead, we hold a separate
arch_hw_breakpoint_ctrl struct inside the watchpoint which is used exclusively
for stepping. We can check whether or not stepping is enabled when installing
or uninstalling the watchpoint and operate on the breakpoint accordingly.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 0017ff42ac37ff6aeb87d0b006c5d32b9a39f5fc
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sun Nov 28 15:09:36 2010 +0000
ARM: hw_breakpoint: don't advertise reserved breakpoints
To permit handling of watchpoint exceptions without signalling a
debugger, it is necessary to reserve breakpoint registers for in-kernel
use only.
This patch ensures that we record and subtract the number of reserved
breakpoints from the number of usable breakpoint registers that we
advertise to userspace via the ptrace API.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 7e20269647169e7ea08a62bdc4979a3ba32e615c
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sun Nov 28 14:57:24 2010 +0000
ARM: hw_breakpoint: disable preemption during debug exception handling
On ARM, debug exceptions occur in the form of data or prefetch aborts.
One difference is that debug exceptions require access to per-cpu banked
registers and data structures which are not saved in the low-level exception
code. For kernels built with CONFIG_PREEMPT, there is an unlikely scenario
that the debug handler ends up running on a different CPU from the one
that originally signalled the event, resulting in random data being read
from the wrong registers.
This patch adds a debug_entry macro to the low-level exception handling
code which checks whether the taken exception is a debug exception. If
it is, the preempt count for the faulting process is incremented. After
the debug handler has finished, the count is decremented.
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 6ee33c2712fcdff2568d9bbadb25c8e5a7c36212
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Thu Nov 25 12:01:54 2010 +0000
ARM: hw_breakpoint: correct and simplify alignment fixup code
The current hw_breakpoint code tries to fix up the alignment of
breakpoints so that we can make use of sparse byte-address-select
bits in the control register and give the illusion that we can
set breakpoints on unaligned addresses.
Although this works on v6 cores, v7 forbids this behaviour, instead
requiring breakpoints to be set on aligned addresses and have contiguous
byte-address-select ranges depending on the instruction set in use.
For ARM the only supported size is 4 bytes, whilst Thumb-2 also permits
2 byte breakpoints (watchpoints can be of 1, 2, 4 or 8 bytes long).
This patch simplifies the alignment fixup code so that we require
addresses to be aligned to the size of the corresponding breakpoint.
This allows us to handle the common case of breaking on a half-word
aligned Thumb-2 instruction and also allows us to set byte watchpoints
on arbitrary addresses.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 7d99331e4793b52d488e911876ef11d843c6c8c9
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Wed Nov 24 17:45:49 2010 +0000
ARM: hw_breakpoint: reset control registers in hotplug path
The ARMv7 debug architecture doesn't make any guarantees about the
contents of debug control registers following a debug logic reset.
This patch ensures that we reset the control registers when a cpu
comes ONLINE (for example, with hotplug) so that when we enable
monitor mode while inserting a breakpoint we won't exhibit random
behaviour.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit ac88e07122fc0eb5cbad403be97ef02c317a06b7
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Wed Nov 24 16:51:17 2010 +0000
ARM: hw_breakpoint: ensure OS lock is clear before writing to debug registers
ARMv7 architects a system for saving and restoring the debug registers
across low-power modes. At the heart of this system is a lock register
which, when set, forbids writes to the debug registers. While locked,
writes to debug registers via the co-processor interface will result
in undefined instruction traps. Linux currently doesn't make use of
this feature because we update the debug registers on context switch
anyway, however the status of the lock is IMPLEMENTATION DEFINED on
reset.
This patch ensures that the lock is cleared during boot so that we
can write to the debug registers safely.
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 87507500b7fc3620e467abb617a3452f0cccc72d
Author: Chao Xie <xiechao.linux@xxxxxxxxx>
Date: Mon Dec 6 07:01:10 2010 +0100
ARM: 6524/1: GIC irq desciptor bug fix
gic_set_cpu will directly use irq_desc[]. If CONFIG_SPARSE_IRQ is
enabled, there is no irq_desc[]. So we need use irq_to_desc(irq) to
get the descriptor for irq.
Signed-off-by: Chao Xie <chao.xie@xxxxxxxxxxx>
Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit dd5a089edfa51a74692604b4b427953d8e16bc35
Author: Daniel T Chen <crimsun@xxxxxxxxxx>
Date: Sun Dec 5 08:43:14 2010 -0500
ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable capture on internal mic
BugLink: https://launchpad.net/bugs/685161
The reporter of the bug states that he must use position_fix=1 to enable
capture for the internal microphone, so set it for his machine's PCI
SSID. Verified using 2.6.35 and the 2010-12-04 alsa-driver build.
Reported-and-tested-by: Ralph Wabel <rwabel@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 0e44e059588e1d91f3a1974d2ce3348864d1d799
Merge: 96886c4361f1ae3f6c775d7c9295e2d557101d0f e8a7e48bb248a1196484d3f8afa53bded2b24e71
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Mon Dec 6 09:36:17 2010 +0100
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 771f8bc71c31c6bd103cdec283012253f352ab1c
Merge: 31c67c755363c7e7821221e72f8594ab8995764d 37d57443d5d810c6ef49e93586b046e7d4774818
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 5 16:45:02 2010 -0800
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix a crash during slabinfo -v
commit 31c67c755363c7e7821221e72f8594ab8995764d
Merge: 47ad504c56235c7c7c0020e631651420a55c74e7 307991055b0ce65d53dc1eb501c456c10eb36360
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 5 16:41:13 2010 -0800
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
initramfs: Really fix build break on symbol-prefixed archs
[media] Fix Kconfig errors due to two visible menus
i2c/algos: convert Kconfig to use the menu's `visible' keyword
media/video: convert Kconfig to use the menu's `visible' keyword
Revert "i2c: Fix Kconfig dependencies"
kconfig: regen parser
kconfig: add an option to determine a menu's visibility
commit 47ad504c56235c7c7c0020e631651420a55c74e7
Merge: 7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 5 16:40:31 2010 -0800
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: Fix GSC PS/2 driver name for keyboard and mouse
parisc: KittyHawk LCD fix
parisc: convert the rest of the irq handlers to simple/percpu
parisc: fix dino/gsc interrupts
parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn
commit 7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5
Author: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Date: Sun Dec 5 15:51:21 2010 -0800
Revert "vfs: show unreachable paths in getcwd and proc"
Because it caused a chroot ttyname regression in 2.6.36.
As of 2.6.36 ttyname does not work in a chroot. It has already been
reported that screen breaks, and for me this breaks an automated
distribution testsuite, that I need to preserve the ability to run the
existing binaries on for several more years. glibc 2.11.3 which has a
fix for this is not an option.
The root cause of this breakage is:
commit 8df9d1a4142311c084ffeeacb67cd34d190eff74
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Aug 10 11:41:41 2010 +0200
vfs: show unreachable paths in getcwd and proc
Prepend "(unreachable)" to path strings if the path is not reachable
from the current root.
Two places updated are
- the return string from getcwd()
- and symlinks under /proc/$PID.
Other uses of d_path() are left unchanged (we know that some old
software crashes if /proc/mounts is changed).
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
So remove the nice sounding, but ultimately ill advised change to how
/proc/fd symlinks work.
Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 4a50bfe365a977f634311504484342fbfffe855c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Dec 5 23:06:22 2010 +0000
ARM: Ensure experimental options are so marked
It is kernel-wide policy that options depending on EXPERIMENTAL should
also have '(EXPERIMENTAL)' in their option text, and options with
'(EXPERIMENTAL)' depend on EXPERIMENTAL.
Ensure that all ARM options comply with this.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 2a1292fd4cf1558b4a60781227d503c9111d9075
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun Dec 5 19:21:18 2010 +0000
drm/i915/lvds: Always restore panel-fitter when enabling the LVDS
Linus Torvalds pointed out that our code was unbalanced when powering on
the panel with respect to the power off sequence in that we were failing
to restore the panel-fitter. The consequence of this would be that
across a simple DPMS off/on for a non-native mode, without an intervening
modeset, the panel fitter would remain disabled and the output would shift
on the panel.
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 6fd0d56e3bc1abfb237b8824261b613e21e77bc8
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun Dec 5 20:42:33 2010 +0000
drm/i915/ringbuffer: Only print an error on the second attempt to reset head
There's not much we can do here but hope for the best. However the first
failure happens quite frequently and if often remedied by the second
attempt to reset HEAD. So only print the error if that attempt also
fails.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=19802
Reported-by: Thomas Meyer <thomas@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit bbf0c6b3620b3872929ef7d3c392ce436889110f
Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
Date: Sun Dec 5 11:30:40 2010 +0100
drm/i915: announce to userspace that the bsd ring is coherent
Otherwise we can't really fix the abi-braindeadness of forcing
libva to manually wait for rendering when switching rings. Which
in turn makes implementing hw semaphores a pointless exercise
(at least for ironlake).
[Also added the relaxed fencing param to explain the jump in
numbering - relaxed fencing is in -next.]
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 136711be41ec97f7f1a9c3a5e8535eb7da5fea59
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Sat Dec 4 16:13:06 2010 +0100
agp/intel: Fix wrong kunmap in i830_cleanup()
Add a missing NULL check and fix the wrong address passed to kunmap()
in i830_cleanup().
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
[danvet: added cc stable]
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 3d09fbcd26851ffb2c40cec411b8e56db02520d1
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Wed Dec 1 07:40:16 2010 +0100
ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM
When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small
boot loader and may be burned to rom or flash.
This is the board-specific portion of this patch-set.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Acked-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 9a4af112bd252be801a433fc3bef793b7b487c3c
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Wed Dec 1 07:45:00 2010 +0100
ARM: 6515/1: Add zboot support for SuperH Mobile ARM
When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small
boot loader and may be burned to rom or flash.
This is the non-board-specific framework portion of this patch-set.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Acked-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 0385ebc0c9b16fc2d8262c082843165313f7b1e4
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 4 17:45:55 2010 +0000
ARM: move high-usage mostly read variables in setup.c to __read_mostly
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit daf8741675562197d4fb4c4e9d773f53494203a5
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sat Dec 4 17:08:32 2010 +0000
ARM: implement support for read-mostly sections
As our SMP implementation uses MESI protocols. Grouping together data
which is mostly only read together means that we avoid unnecessary
cache line bouncing when this code shares a cache line with other data.
In other words, cache lines associated with read-mostly data are
expected to spend most of their time in shared state.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 0b05da7200dd56a5364c4d9cf5441715c1d706ed
Author: Hans Ulli Kroll <ulli.kroll@xxxxxxxxxxxxxx>
Date: Thu Dec 2 12:32:15 2010 +0100
ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI
Today more boards with arm cpu have selectable pci bus.
This patch makes this more scalable and remove line continuations in
Kconfig
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Hans Ulli Kroll <ulli.kroll@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 9c90a61c7e4286aa5a38b314a2d8f5a1e70b5135
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Thu Dec 2 10:25:28 2010 -0200
perf tools: Ask for ID PERF_SAMPLE_ info on all PERF_RECORD_ events
So that we can use -T == --timestamp, asking for PERF_SAMPLE_TIME:
$ perf record -aT
$ perf report -D | grep PERF_RECORD_
<SNIP>
3 5951915425 0x47530 [0x58]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff8138c1a2 period: 215979 cpu:3
3 5952026879 0x47588 [0x90]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff810cb480 period: 215979 cpu:3
3 5952059959 0x47618 [0x38]: PERF_RECORD_FORK(6853:6853):(16811:16811)
3 5952138878 0x47650 [0x78]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff811bac35 period: 431478 cpu:3
3 5952375068 0x476c8 [0x30]: PERF_RECORD_COMM: find:6853
3 5952395923 0x476f8 [0x50]: PERF_RECORD_MMAP 6853/6853: [0x400000(0x25000) @ 0]: /usr/bin/find
3 5952413756 0x47748 [0xa0]: PERF_RECORD_SAMPLE(IP, 1): 6853/6853: 0xffffffff810d080f period: 859332 cpu:3
3 5952419837 0x477e8 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44600000(0x21d000) @ 0]: /lib64/ld-2.5.so
3 5952437929 0x47840 [0x48]: PERF_RECORD_MMAP 6853/6853: [0x7fff7e1c9000(0x1000) @ 0x7fff7e1c9000]: [vdso]
3 5952570127 0x47888 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f46200000(0x218000) @ 0]: /lib64/libselinux.so.1
3 5952623637 0x478e0 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44a00000(0x356000) @ 0]: /lib64/libc-2.5.so
3 5952675720 0x47938 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44e00000(0x204000) @ 0]: /lib64/libdl-2.5.so
3 5952710080 0x47990 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f45a00000(0x246000) @ 0]: /lib64/libsepol.so.1
3 5952847802 0x479e8 [0x58]: PERF_RECORD_SAMPLE(IP, 1): 6853/6853: 0xffffffff813897f0 period: 1142536 cpu:3
<SNIP>
First column is the cpu and the second the timestamp.
That way we can investigate problems in the event stream.
If the new perf binary is run on an older kernel, it will disable this feature
automatically.
Tested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <1291318772-30880-5-git-send-email-acme@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 640c03ce837fe8d4b56342aba376ea0da3960459
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Thu Dec 2 14:10:21 2010 -0200
perf session: Parse sample earlier
At perf_session__process_event, so that we reduce the number of lines in eache
tool sample processing routine that now receives a sample_data pointer already
parsed.
This will also be useful in the next patch, where we'll allow sample the
identity fields in MMAP, FORK, EXIT, etc, when it will be possible to see (cpu,
timestamp) just after before every event.
Also validate callchains in perf_session__process_event, i.e. as early as
possible, and keep a counter of the number of events discarded due to invalid
callchains, warning the user about it if it happens.
There is an assumption that was kept that all events have the same sample_type,
that will be dealt with in the future, when this preexisting limitation will be
removed.
Tested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <1291318772-30880-4-git-send-email-acme@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit c980d1091810df13f21aabbce545fd98f545bbf7
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Sat Dec 4 23:02:20 2010 -0200
perf events: Make sample_type identity fields available in all PERF_RECORD_ events
If perf_event_attr.sample_id_all is set it will add the PERF_SAMPLE_ identity
info:
TID, TIME, ID, CPU, STREAM_ID
As a trailer, so that older perf tools can process new files, just ignoring the
extra payload.
With this its possible to do further analysis on problems in the event stream,
like detecting reordering of MMAP and FORK events, etc.
V2: Fixup header size in comm, mmap and task processing, as we have to take into
account different sample_types for each matching event, noticed by Thomas Gleixner.
Thomas also noticed a problem in v2 where if we didn't had space in the buffer we
wouldn't restore the header size.
Tested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 6844c09d849aeb00e8ddfe9525e8567a531c22d0
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Fri Dec 3 16:36:35 2010 -0200
perf events: Separate the routines handling the PERF_SAMPLE_ identity fields
Those will be made available in sample like events like MMAP, EXEC, etc in a
followup patch. So precalculate the extra id header space and have a separate
routine to fill them up.
V2: Thomas noticed that the id header needs to be precalculated at
inherit_events too:
LKML-Reference: <alpine.LFD.2.00.1012031245220.2653@xxxxxxxxxxxxxxxxxxxxxxx>
Tested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <1291318772-30880-2-git-send-email-acme@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 614b6780eb0c393d2fb49ff62d61f29b877bd07e
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Fri Dec 3 16:24:32 2010 -0200
perf events: Fix event inherit fallout of precalculated headers
The precalculated header size is not updated when an event is inherited. That
results in bogus sample entries for all child events. Bug introduced in c320c7b.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <alpine.LFD.2.00.1012031245220.2653@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit cf2f9c59807f173b1c6a537fde7c83c8da876e56
Author: Dan Williams <dan.j.williams@xxxxxxxxx>
Date: Sat Dec 4 14:53:32 2010 -0800
intel_mid_dma: fix section mismatch warnings
Rename intel_mid_dma_pci to intel_mid_dma_pci_driver to pick up the
applied annotations of that suffix.
Reported-by: <major_Lee@xxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit d2f5c276ea4b7b7e1b953926bac9d0b148fcce4e
Author: Anatolij Gustschin <agust@xxxxxxx>
Date: Mon Nov 22 18:35:18 2010 +0100
dmaengine: imx-sdma: fix bug in buffer descriptor initialization
Currently while submitting scatterlists with more than one SG
entry the DMA buffer address from the first SG entry is inserted
into all initialized DMA buffer descriptors. This is due to the
typo in the for_each_sg() loop where the scatterlist pointer is
used for obtaining the DMA buffer address and _not_ the SG list
iterator.
As a result all received data will be written only into the first
DMA buffer while reading. While writing the data from the first
DMA buffer is send to the device multiple times. This caused
the filesystem destruction on the MMC card when using DMA in
mxcmmc driver.
Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit a584bff5efae8c1d026e3a930e3d13a90264fafc
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 12 13:37:54 2010 -0800
drivers/dma/ppc4xx: Use printf extension %pR for struct resource
Using %pR standardizes the struct resource output.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit bca364d30d63825f36a03dcacf390943d4c2cb74
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sat Nov 6 17:01:37 2010 -0400
drivers/dma/ioat: Use the ccflag-y instead of EXTRA_CFLAGS
Changed Makefile to use <modules>-y instead of <modules>-objs. Following
(documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9
Author: Guy Martin <gmsoft@xxxxxxxxxxxx>
Date: Tue Nov 2 15:23:08 2010 +0000
parisc: Fix GSC PS/2 driver name for keyboard and mouse
Fix kernel warnings caused by the driver name of GSC PS/2 containing '/'.
The following warnings are observed on a K410 system :
[ 10.700000] name 'GSC PS/2 keyboard'
[ 10.732000] ------------[ cut here ]------------
[ 10.772000] WARNING: at fs/proc/generic.c:323
[ 10.828000] Modules linked in:
[ 10.916000]
[ 10.916000] YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI
[ 10.936000] PSW: 00000000000001000000000000001111 Not tainted
[ 10.992000] r00-03 0004000f 104fe3e0 10201ea0 00000000
[ 11.060000] r04-07 4fc405c8 00000006 4fc405c8 4fc40694
[ 11.124000] r08-11 4fc40708 10438aa0 00000001 1043bfc8
[ 11.184000] r12-15 104ff2a0 104ff2a0 4fc38634 104ff2a0
[ 11.248000] r16-19 f0001570 10479af0 f000006c 1044fe50
[ 11.308000] r20-23 00000000 00000028 104cd858 00000000
[ 11.372000] r24-27 ffffffff 0000000e 1044fe10 1043bbe0
[ 11.436000] r28-31 0000002b 00000078 4fc40800 0000000d
[ 11.496000] sr00-03 00000000 00000000 00000000 00000000
[ 11.560000] sr04-07 00000000 00000000 00000000 00000000
[ 11.624000]
[ 11.688000] IASQ: 00000000 00000000 IAOQ: 10201ea0 10201ea4
[ 11.704000] IIR: 03ffe01f ISR: 00000000 IOR: 0000000d
[ 11.772000] CPU: 0 CR30: 4fc40000 CR31: f01043b0
[ 11.836000] ORIG_R28: 4fc40940
[ 11.904000] IAOQ[0]: __xlate_proc_name+0x90/0xd0
[ 11.940000] IAOQ[1]: __xlate_proc_name+0x94/0xd0
[ 11.996000] RP(r2): __xlate_proc_name+0x90/0xd0
[ 12.052000] Backtrace:
[ 12.108000] [<10257790>] vsnprintf+0x290/0x4f4
[ 12.136000]
[ 12.188000] ---[ end trace 91bf6ece17e322dd ]---
[ 12.208000] serio: GSC PS/2 keyboard port at 0x0001c000 irq 19 @ 10:12:7
[ 12.264000] name 'GSC PS/2 mouse'
[ 12.344000] ------------[ cut here ]------------
[ 12.384000] WARNING: at fs/proc/generic.c:323
[ 12.436000] Modules linked in:
[ 12.524000]
[ 12.528000] YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI
[ 12.544000] PSW: 00000000000001000000000000001111 Tainted: G W
[ 12.600000] r00-03 0004000f 104fe3e0 10201ea0 00000000
[ 12.680000] r04-07 4fc405c8 00000006 4fc405c8 4fc40694
[ 12.740000] r08-11 4fc40708 10438aa0 00000001 1043bfc8
[ 12.804000] r12-15 104ff2a0 104ff2a0 4fc38634 104ff2a0
[ 12.868000] r16-19 f0001570 10479af0 f000006c 1044fe50
[ 12.928000] r20-23 00000000 00000025 104cd858 00000000
[ 12.992000] r24-27 ffffffff 0000000e 1044fe10 1043bbe0
[ 13.056000] r28-31 00000028 00000078 4fc40800 0000000d
[ 13.116000] sr00-03 00000000 00000000 00000000 00000000
[ 13.180000] sr04-07 00000000 00000000 00000000 00000000
[ 13.244000]
[ 13.308000] IASQ: 00000000 00000000 IAOQ: 10201ea0 10201ea4
[ 13.324000] IIR: 03ffe01f ISR: 00000000 IOR: 0000000d
[ 13.392000] CPU: 0 CR30: 4fc40000 CR31: f01043b0
[ 13.456000] ORIG_R28: 4fc40940
[ 13.524000] IAOQ[0]: __xlate_proc_name+0x90/0xd0
[ 13.560000] IAOQ[1]: __xlate_proc_name+0x94/0xd0
[ 13.616000] RP(r2): __xlate_proc_name+0x90/0xd0
[ 13.672000] Backtrace:
[ 13.728000] [<10257790>] vsnprintf+0x290/0x4f4
[ 13.756000]
[ 13.808000] ---[ end trace 91bf6ece17e322de ]---
[ 13.828000] serio: GSC PS/2 mouse port at 0x00020100 irq 19 @ 10:12:8
Signed-off-by: Guy Martin <gmsoft@xxxxxxxxxxxx>
Acked-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxx>
commit 79a04296231171157031d0bd8cd4038317e13cf2
Author: Guy Martin <gmsoft@xxxxxxxxxxxx>
Date: Sat Nov 6 16:24:29 2010 +0000
parisc: KittyHawk LCD fix
K class aka KittyHawk don't have LED support on their LCD. Installing
HP-UX confirmed this. The current led_wq fills the LCD with black
characters each time it runs.
The patch prevents the led_wq workqueue and its proc entry to be
created for KittyHawk machines.
It also increase min_cmd_delay as currently, one character out of two
is lost when a string is sent to the LCD.
Signed-off-by: Guy Martin <gmsoft@xxxxxxxxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxx>
commit 51890613f2bfa70453a5cc22c91c63946dd311cd
Author: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 02:01:05 2010 +0000
parisc: convert the rest of the irq handlers to simple/percpu
The generic conversion eliminates the spurious no_ack and no_end
routines, converts all the cascaded handlers to handle_simple_irq() and
makes iosapic use a modified handle_percpu_irq() to become the same as
the CPU irq's. This isn't an essential change, but it eliminates the
mask/unmask overhead of handle_level_irq().
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
Tested-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxx>
commit d16cd297d288e48482c3c261db434a2e13bd9f20
Author: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 23:36:47 2010 +0000
parisc: fix dino/gsc interrupts
The essential problem we're currently having is that dino (and gsc) is a
cascaded CPU interrupt. Under the old __do_IRQ() handler, our CPU
interrupts basically did an ack followed by an end. In the new scheme,
we replaced them with level handlers which do a mask, an ack and then an
unmask (but no end). Instead, with the renaming of end to eoi, we
actually want to call the percpu flow handlers, because they actually
have all the characteristics we want.
This patch does the conversion and gets my C360 booting again.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxx>
commit 49078f7d108f132582e5af46304c317b55f83948
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sat Dec 4 07:45:57 2010 +0000
drm/i915: Factor in pixel-repeat in FDI M/N calculation
Fixes the modesetting on the secondary panel of the Libretto W100 and
presumably many more Ironlake laptops with SDVO LVDS displays.
Reported-and-tested-by: Matthew Willoughby <mattfredwill@xxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit a5542a0f9aca5588a0afd0489c26d858405bfecb
Author: Rabin Vincent <rabin@xxxxxx>
Date: Sat Dec 4 06:20:52 2010 +0100
ARM: 6523/1: iop: ensure sched_clock() is notrace
Include sched.h to ensure sched_clock() has the notrace
annotation, and mark any functions it calls as notrace
too.
Include sched.h to ensure sched_clock() has the notrace
annotation, and mark any functions it calls as notrace
too.
Acked-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b9f515e3e3861abbaa093359f7c6f31283695228
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:38:08 2010 +0100
ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
This patch fixes a compilation issue when compiling PCMCIA SA1100
support as a module with PCMCIA_DEBUG enabled. The symbol
soc_pcmcia_debug was not beeing exported.
ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.
This patch fixes a compilation issue when compiling PCMCIA SA1100
support as a module with PCMCIA_DEBUG enabled. The symbol
soc_pcmcia_debug was not beeing exported.
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ed60453fa8f8fc3d034dfdf10371a99cc6905626
Author: Rabin Vincent <rabin@xxxxxx>
Date: Tue Nov 30 17:36:48 2010 +0100
ARM: 6511/1: ftrace: add ARM support for C version of recordmcount
Depending on the compiler version, ARM GCC calls the mcount function
either __gnu_mcount_nc or mcount.
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cd3478f2bd8f2cec19f9247a8a9cd711cbe37683
Author: Rabin Vincent <rabin@xxxxxx>
Date: Tue Nov 30 17:33:53 2010 +0100
ARM: 6509/1: ftrace: ignore any ftrace.o in C version of recordmcount
arch/arm/kernel/ftrace.c references mcount like kernel/tracing/ftrace.c,
so change the exclusion filter to match any ftrace.o.
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 961ec6daa7b14f376c30d447a830fa4783a2112c
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Thu Dec 2 18:01:49 2010 +0100
ARM: 6521/1: perf: use raw_spinlock_t for pmu_lock
For kernels built with PREEMPT_RT, critical sections protected
by standard spinlocks are preemptible. This is not acceptable
on perf as (a) we may be scheduled onto a different CPU whilst
reading/writing banked PMU registers and (b) the latency when
reading the PMU registers becomes unpredictable.
This patch upgrades the pmu_lock spinlock to a raw_spinlock
instead.
Reported-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4d6b7a779be34e1df296abc1dc555134a8cf34af
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Tue Nov 30 18:15:53 2010 +0100
ARM: 6512/1: perf: fix warnings generated by sparse
Russell reported a number of warnings coming from sparse when
checking the ARM perf_event.c files:
| perf_event.c seems to also have problems too:
|
| CHECK arch/arm/kernel/perf_event.c
| arch/arm/kernel/perf_event.c:37:1: warning: symbol 'pmu_lock' was not declared. Should it be static?
| arch/arm/kernel/perf_event.c:70:1: warning: symbol 'cpu_hw_events' was not declared. Should it be static?
| arch/arm/kernel/perf_event.c:1006:1: warning: symbol 'armv6pmu_enable_event' was not declared. Should it be static?
| arch/arm/kernel/perf_event.c:1113:1: warning: symbol 'armv6pmu_stop' was not declared. Should it be static?
| arch/arm/kernel/perf_event.c:1956:6: warning: symbol 'armv7pmu_enable_event' was not declared. Should it be static?
| arch/arm/kernel/perf_event.c:3072:14: warning: incorrect type in argument 1 (different address spaces)
| arch/arm/kernel/perf_event.c:3072:14: expected void const volatile [noderef] <asn:1>*<noident>
| arch/arm/kernel/perf_event.c:3072:14: got struct frame_tail *tail
| arch/arm/kernel/perf_event.c:3074:49: warning: incorrect type in argument 2 (different address spaces)
| arch/arm/kernel/perf_event.c:3074:49: expected void const [noderef] <asn:1>*from
| arch/arm/kernel/perf_event.c:3074:49: got struct frame_tail *tail
This patch resolves these issues so we can live in silence
again.
Reported-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b23065313297e750edd57ab6edfd36224826724e
Author: Per Fransson <per.xx.fransson@xxxxxxxxxxxxxx>
Date: Fri Dec 3 10:53:38 2010 +0100
ARM: 6522/1: kexec: Add call to non-crashing cores through IPI
When kexec is used to start a crash kernel the other cores
are notified. These non-crashing cores will save their state
in the crash notes and then do nothing.
Signed-off-by: Per Fransson <per.xx.fransson@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 55afd264cdd5d5848753e90884ed596e11bce0ff
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Wed Dec 1 18:12:43 2010 +0100
ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers
The existing code invokes the syscall with rubbish in r7,
due to what looks like an incorrect literal load idiom.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cd849ae9cd291117c0f7e0e8d531ab62a906e308
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Wed Dec 1 18:05:14 2010 +0100
ARM: 6518/1: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
* Fix kexec build failure with CONFIG_THUMB2_KERNEL.
* Avoids deprecated/forbidden sp and pc usage in for ARMv7
onwards, retaining compatibility with older architecture
versions.
* The pc value saved to newregs is now aligned on a predictable
instruction boundary.
(stmia { ... pc } or str pc has implementation-defined results
in most versions of the ARM architecutre, and is prohibited
(unpredictable) in Thumb-2.)
* Switch to named inline asm arguments (else I get readily
confused ...)
The resulting code should be compatible with all architecture
versions >= v3, with or without CONFIG_THUMB2_KERNEL.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Tested-by: Mika Westerberg <mika.westerberg@xxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 0946b8c5c5982088a26da7ad99e8bcf57f972fb5
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Wed Dec 1 18:05:13 2010 +0100
ARM: 6517/1: kexec: Add missing memory clobber to inline asm in crash_setup_regs()
Currently, the inline asm is passed &newregs->ARM_r0 as in input,
when modifying multiple fields of newregs.
It's plausible to assume that GCC will assume newregs->ARM_r0 is
modified when passed the address, but unfortunately this assumption
is incorrect.
Also, GCC has no way to guess that the other ARM_r* fields are
modified without the addition of a "memory" clobber.
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ef61d4e6d88da80dc2b417cf8ad3c77aa94f0c8f
Author: Manoj Iyer <manoj.iyer@xxxxxxxxxxxxx>
Date: Fri Dec 3 18:43:55 2010 -0600
ALSA: hda - Enable jack sense for Thinkpad Edge 13
Added a quirk to cxt5066_cfg_tbl to enable jack sense for ThinkPad Edge 13.
Reference: http://launchpad.net/bugs/685015
Signed-off-by: Manoj Iyer <manoj.iyer@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 37d57443d5d810c6ef49e93586b046e7d4774818
Author: Tero Roponen <tero.roponen@xxxxxxxxx>
Date: Wed Dec 1 20:04:20 2010 +0200
slub: Fix a crash during slabinfo -v
Commit f7cb1933621bce66a77f690776a16fe3ebbc4d58 ("SLUB: Pass active
and inactive redzone flags instead of boolean to debug functions")
missed two instances of check_object(). This caused a lot of warnings
during 'slabinfo -v' finally leading to a crash:
BUG ext4_xattr: Freepointer corrupt
...
BUG buffer_head: Freepointer corrupt
...
BUG ext4_alloc_context: Freepointer corrupt
...
...
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: [<ffffffff810a291f>] file_sb_list_del+0x1c/0x35
PGD 79d78067 PUD 79e67067 PMD 0
Oops: 0002 [#1] SMP
last sysfs file: /sys/kernel/slab/:t-0000192/validate
This patch fixes the problem by converting the two missed instances.
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tero Roponen <tero.roponen@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 8165984acf825917437debae519209073c32a5a7
Author: Tero Roponen <tero.roponen@xxxxxxxxx>
Date: Wed Dec 1 20:04:20 2010 +0200
slub: Fix a crash during slabinfo -v
Commit f7cb1933621bce66a77f690776a16fe3ebbc4d58 ("SLUB: Pass active
and inactive redzone flags instead of boolean to debug functions")
missed two instances of check_object(). This caused a lot of warnings
during 'slabinfo -v' finally leading to a crash:
BUG ext4_xattr: Freepointer corrupt
...
BUG buffer_head: Freepointer corrupt
...
BUG ext4_alloc_context: Freepointer corrupt
...
...
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: [<ffffffff810a291f>] file_sb_list_del+0x1c/0x35
PGD 79d78067 PUD 79e67067 PMD 0
Oops: 0002 [#1] SMP
last sysfs file: /sys/kernel/slab/:t-0000192/validate
This patch fixes the problem by converting the two missed instances.
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Tero Roponen <tero.roponen@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 22ed1113a9adda6e193c329119a384362da01289
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sat Dec 4 01:01:29 2010 +0000
drm/i915: Death to the unnecessary 64bit divide
Use the hardware DDA to calculate the ratio with as much accuracy as is
possible.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 3d44661ad1f6336345a9f7765afef6d0aeac543e
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Wed Dec 1 21:38:31 2010 +0100
staging: brcm80211: added firmware validation
Fix for https://bugzilla.kernel.org/show_bug.cgi?id=21872
New function wl_check_firmwares() checks validity of all firmware images
loaded from user space.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4
Merge: 367576b813ed66a000e66ec18f7082bbc84c05d7 e3e9887ee9de36d8e2bef972ad74a42abd7a44c4
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Fri Dec 3 12:12:29 2010 -0800
Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 into work
* 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects.
usb: ehci-sh: Add missing ehci helpers.
usb: ehci-sh: Fix up fault in shutdown path.
sh: Add EHCI support for SH7786.
usb: ehci-hcd: Add support for SuperH EHCI.
usb: ohci-sh: Set IRQ as shared.
commit 367576b813ed66a000e66ec18f7082bbc84c05d7
Merge: 16350a7258a3158807f3fafe33f1bb22b8ddd127 0607f8622953541e95030ab011258d9f1f381357
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Fri Dec 3 12:10:06 2010 -0800
Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next
* 'for-next' of git://gitorious.org/usb/usb:
usb: musb: gadget: prevent a NULL pointer dereference
usb: musb: add names for IRQs in structure resource
usb: musb: remove board_data parameter from musb_platform_init()
commit 16350a7258a3158807f3fafe33f1bb22b8ddd127
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Thu Dec 2 05:52:22 2010 +0900
uwb: fix compiler warning on i1480_est_id_table
Annotate i1480_est_id_table as '__used' to fix following warning:
CC drivers/uwb/i1480/i1480-est.o
drivers/uwb/i1480/i1480-est.c:94: warning: â??i1480_est_id_tableâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: David Vrabel <david.vrabel@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fc33b0eb38ccbd3080a4885e8f742a72a085261d
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Thu Dec 2 05:52:21 2010 +0900
uwb: fix compiler warning on whcrc_id_table
Annotate whcrc_id_table as '__used' to fix following warning:
CC drivers/uwb/whc-rc.o
drivers/uwb/whc-rc.c:452: warning: â??whcrc_id_tableâ?? defined but not used
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: David Vrabel <david.vrabel@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit df4fedeaa623f6af0b72c0089000b5ea5540ed22
Author: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Date: Wed Dec 1 11:53:00 2010 +0100
usb: g_audio: Fix crash at driver removal
If g_audio fails to open the sound control device, it crashes at removal:
Insertion:
[ 4143.836536] g_audio gadget: unable to open sound control device file: /dev/snd/controlC0
[ 4143.836543] g_audio gadget: we need at least one control device
[ 4143.836551] g_audio gadget: Linux USB Audio Gadget, version: Dec 18, 2008
[ 4143.836558] g_audio gadget: g_audio ready
Removal:
[ 4146.802643] BUG: unable to handle kernel paging request at 00023018
[ 4146.802655] IP: [<c10af9f5>] filp_close+0xa/0x5b
[ 4146.802674] *pdpt = 0000000015426001 *pde = 0000000000000000
[ 4146.802684] Oops: 0000 [#1] PREEMPT SMP
[ 4146.802692] last sysfs file: /sys/power/state
[ 4146.802701] Modules linked in: g_audio(-) ioh_udc fuse asix usbnet [last unloaded: g_audio]
[ 4146.802719]
[ 4146.802728] Pid: 1394, comm: rmmod Not tainted 2.6.33.5-26.1-ivi #1 To be filled by O.E.M./To be filled by O.E.M.
[ 4146.802738] EIP: 0060:[<c10af9f5>] EFLAGS: 00010206 CPU: 0
[ 4146.802746] EIP is at filp_close+0xa/0x5b
[ 4146.802753] EAX: 00023000 EBX: 00023000 ECX: 00000046 EDX: df842680
[ 4146.802760] ESI: e071cd4c EDI: df842680 EBP: ddbbbef0 ESP: ddbbbee4
[ 4146.802768] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[ 4146.802776] Process rmmod (pid: 1394, ti=ddbba000 task=dd95a4f0 task.ti=ddbba000)
[ 4146.802782] Stack:
[ 4146.802787] d540c280 e071cd4c df2bc000 ddbbbefc e071b82c df11e440 ddbbbf04 e071c622
[ 4146.802804] <0> ddbbbf28 e071c47f 00000008 e071cd74 df11e464 df2bc01c df2bc000 e071ce68
[ 4146.802822] <0> 00000880 ddbbbf38 e07fd1b8 e071cef0 00000000 ddbbbf40 e071b9f4 ddbbbf48
[ 4146.802842] Call Trace:
[ 4146.802857] [<e071b82c>] ? gaudio_cleanup+0x87/0xe0 [g_audio]
[ 4146.802869] [<e071c622>] ? audio_unbind+0x8/0xc [g_audio]
[ 4146.802881] [<e071c47f>] ? composite_unbind+0x8d/0xcb [g_audio]
[ 4146.802895] [<e07fd1b8>] ? usb_gadget_unregister_driver+0x7b/0xc0 [ioh_udc]
[ 4146.802908] [<e071b9f4>] ? usb_composite_unregister+0x15/0x17 [g_audio]
[ 4146.802920] [<e071c633>] ? cleanup+0xd/0xf [g_audio]
[ 4146.802932] [<c105a938>] ? sys_delete_module+0x185/0x1dd
[ 4146.802944] [<c101c3ea>] ? do_page_fault+0x248/0x276
[ 4146.802956] [<c10027d0>] ? sysenter_do_call+0x12/0x26
[ 4146.802962] Code: 12 5f 3a 00 8b 43 04 8b 40 0c 0f b3 30 3b 73 44 73 03 89 73 44 89 f8 e8 f1 61 3a 00 5b 5e 5f 5d c3 55 89 e5 57 89 d7 56 53 89 c3 <8b> 40 18 85 c0 75 0f 68 32 15 5e c1 31 f6 e8 52 39 3a 00 5a eb
[ 4146.803058] EIP: [<c10af9f5>] filp_close+0xa/0x5b SS:ESP 0068:ddbbbee4
[ 4146.803071] CR2: 0000000000023018
[ 4146.803112] ---[ end trace 0989a7e023da0434 ]---
This patch makes sure not to assign the_card if gaudio_open_snd_dev fails,
since the parent function will deallocate the card.
Also make sure all filp's in gaudio_open_snd_dev is assigned NULL upon error
and gaudio_close_snd_dev only cleanups when the filp's are non-NULL.
Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b62c99b17c2c513eaf6b77a76907a13a1beb86d3
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Dec 3 14:20:51 2010 +0000
staging/vme_user: add missing calls to vme_master_free calls in .remove
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4740a0846069f6d4cbba9e328a9d92e6dd76110d
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Dec 3 13:44:15 2010 +0000
staging/vme/vme_user: use __dev{init, exit} for .probe and .remove
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
[martyn.welch@xxxxxx: Fixed checkpatch line length warnings]
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1daa38d379932bde0d2036c2e10ced3e8842b74f
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Dec 3 09:05:08 2010 +0000
staging/vme_user: fix usage of the slave resources after they've been freed
buf_unalloc() frees the memory buffers allocated with vme_alloc_consistent.
The associated VME resource is needed in both vme_alloc_consistent and
vme_free_consistent; however the slave VME resources are being freed before
the calls to vme_free_consistent are made, which means the buffers
are never returned.
Fix this by freeing the VME resources only after the consistent buffers have
been returned.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 11e8896474495dec7ce19a542f67def847ec208f
Merge: 8338fded137681bc3c1e99a69ac937a4fb016fe4 512b109ec9620d037d6d2f6bd1bae9ce34dd6779
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 11:30:57 2010 -0800
Merge branch '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
* '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
xen: unplug the emulated devices at resume time
xen: fix save/restore for PV on HVM guests with pirq remapping
xen: resume the pv console for hvm guests too
xen: fix MSI setup and teardown for PV on HVM guests
xen: use PHYSDEVOP_get_free_pirq to implement find_unbound_pirq
commit ca44ac386181ba710a9ab6db900d6c1e5451b366
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Mon Nov 29 22:48:46 2010 +0000
net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared
skb head being allocated by kmalloc(), it might be larger than what
actually requested because of discrete kmem caches sizes. Before
reallocating a new skb head, check if the current one has the needed
extra size.
Do this check only if skb head is not shared.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2e18edf75d586d9044c1f1e6b1bc8e7c26c4149f
Author: Ben Dooks <ben-linux@xxxxxxxxx>
Date: Fri Dec 3 18:00:06 2010 +0000
ARM: mini2440: Fix Kconfig to allow kernel to build
The MACH_MINI2440 entry requires the backlight LED driver, but this
subsystem has not been enabled and the select of LEDS_TRIGGER_BACKLIGHT
alone is insufficient to enable the necessary bits of the LED driver.
Add NEW_LEDS, LEDS_CLASS and LEDS_TRIGGER to the select to allow the
kernel to link.
This fixes the following error:
drivers/built-in.o: In function `led_trigger_set':
/home/ben/linux.git/drivers/leds/led-triggers.c:116: undefined reference to `led_brightness_set'
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
commit 8338fded137681bc3c1e99a69ac937a4fb016fe4
Merge: 9cd6315357eccb768d9062cb43e3dc741e922020 29dcbc5c25d6d8140337e96bf503c8475092c586 805e3f495057aa5307ad4e3d6dc7073d4733c691
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 10:08:52 2010 -0800
Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen: allocate irq descs on any NUMA node
xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memory
xen: use default_idle
xen: clean up "extra" memory handling some more
* 'upstream/bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen: x86/32: perform initial startup on initial_page_table
xen: don't bother to stop other cpus on shutdown/reboot
commit 47f1c6c9ffdec0c0e5a2c2709bd63c7380b325c4
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 15:37:31 2010 +0000
drm/i915: Clean conflicting modesetting registers upon init
If we leave the registers in a conflicting state then when we attempt
to teardown the active mode, we will not disable the pipes and planes
in the correct order -- leaving a plane reading from a disabled pipe and
possibly leading to undefined behaviour.
Reported-and-tested-by: Andy Whitcroft <apw@xxxxxxxxxxxxx>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32078
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 289700dbc40c78741f17e2304ed4ac0db3c3afd3
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 03:32:58 2010 +0000
ixgbe: add support for new format of PBA numbers
The new PBA format is stored as a string. This patch allows the
driver to support both the old and new format.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dbffcb210f45239ea530e0a71470e48abefe4210
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 03:32:34 2010 +0000
ixgbe: add support for 82599 FCoE SKU
Add both NIC and backplane support for FCoE enabled devices IDs.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0b077feac00a8b7b0afbab3274b2e74b749bc917
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 03:32:13 2010 +0000
ixgbe: add WOL support for SFP+ subdevice
This patch will add wake on LAN support to the dev/sub_dev 10FB 11A9. This
will also include ixgbe ethtool support for this device.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c6ecf39a10ceec3e97096e2a8d3eadcecd593422
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Fri Dec 3 03:31:51 2010 +0000
ixgbe: fix link behavior for SFP+ when driver is brought down
We have had several requests to have ifconfig down command disable
the SFP+ laser and thus make link go down. Likewise on ifconfig up
the laser would be enabled and link would come up. This patch enables
that behavior.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4d849b8113b0cf7b6ebfa9ee4c47bd514ea49d3
Author: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Date: Thu Dec 2 20:42:08 2010 +0000
qlcnic: Updated driver version to 5.0.13
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 40839129f77903cbbb7f232e2e2ab08dfe4a4f8d
Author: Sritej Velaga <sritej.velaga@xxxxxxxxxx>
Date: Thu Dec 2 20:41:56 2010 +0000
qlcnic: LICENSE file for qlcnic
Signed-off-by: Sritej Velaga <sritej.velaga@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 091056b2ad04df09a3cb78a4c4ea098709b98eb3
Author: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Date: Thu Dec 2 20:41:43 2010 +0000
qlcnic: validate eswitch config values for PF
Currently driver set default eswitch configuration values for PF function,
instead of validating values sent by application.
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 97319a270da37a5eab14a770f1417d8229245270
Author: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Date: Thu Dec 2 20:41:23 2010 +0000
qlcnic: Disable loopback support
Loopback mode can not be supported in CNA mode. Removing it until FW is fixed.
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9cd6315357eccb768d9062cb43e3dc741e922020
Merge: 88063dd69b124721e18a59535d4f35266fcb867f 2ff38c9fbaa86264ad819117ab137361067ab5f1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 09:20:41 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
ALSA: hda: Use "alienware" model quirk for another SSID
ASoC: WM8731: Fix incorrect mask for bypass path disable
s6105-ipcam: fix compilation
s6000-pcm: fix compilation
s6000-i2s: fix compilation
ASoC: Fix missing spin_unlock_irqrestore
ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
ASoC: Add missing dev_set_drvdata in p1022_ds_probe
ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe
ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready
ASoC: Fix compile error for nuc900-pcm.c
ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove
ASoC: Fix compile error for nuc900-ac97.c
ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
commit 88063dd69b124721e18a59535d4f35266fcb867f
Merge: df9d38ebda762e54ed0b142c2c47b2f57a145ab2 7ac760c2f78ddd8e1bd633767b01becfbbf96720
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 09:20:21 2010 -0800
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6:
UBI: fix corrupted PEB detection for NOR flash
commit df9d38ebda762e54ed0b142c2c47b2f57a145ab2
Merge: 47337ad65f823358609865c5dff77404744bc38e a9fc749224bfb69686322643678f89e00303ee21
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 09:19:54 2010 -0800
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: se/7724: Remove FSI/B of GPIO init code
sh: se/7724: Update clock framework of FSI clock to non-legacy
sh: Assume new page cache pages have dirty dcache lines.
sh: boards: mach-se: use IS_ERR() instead of NULL check
sh: Add div6_reparent_clks to clock framework for FSI
dma: shdma: add a MODULE_ALIAS() to allow module autoloading
commit 47337ad65f823358609865c5dff77404744bc38e
Merge: a9df42e1175d30545ffa1e17a3df1b39c107d33a 16cdd4336fdca9b50f991b591005b5f6416f82c4
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 3 09:19:31 2010 -0800
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
lxfb: Maintain video processor palette through suspend/resume
video: da8xx: Register IRQ as last thing in driver probing.
framebuffer: fix fbcmap.c kernel-doc warning
commit a9df42e1175d30545ffa1e17a3df1b39c107d33a
Author: David Howells <dhowells@xxxxxxxxxx>
Date: Fri Dec 3 15:59:50 2010 +0000
MN10300: Implement asm/syscall.h
Implement asm/syscall.h for the MN10300 arch.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 7e300bc8e6736d41e7b92978f415572ac60fd59b
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:48:28 2010 +0000
sfc: Store MAC address from NVRAM in net_device::perm_addr
For some reason we failed to make this change when perm_addr was
introduced.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 02ebc26865c2755720d2ede90a5ab27c45741823
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:48:20 2010 +0000
sfc: Use current MAC address, not NVRAM MAC address, for WoL filter
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4f3907e9a600a46d8c946469ce6636080310d12e
Author: Steve Hodgson <shodgson@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:48:14 2010 +0000
sfc: When waking a stopped tx_queue, only lock that tx_queue
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 78d4189d6b000898db2d9a9d745468f1322cbc71
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:56 2010 +0000
sfc: Update kernel-doc to match earlier move of Toeplitz hash key
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cef68bde74f083d83c18ce870ed834e82ee0ae5a
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:51 2010 +0000
sfc: Move xmac_poll_required into struct falcon_nic_data
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 40641ed93cd53561f7d53b5fd5ed656b35f3aabd
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:45 2010 +0000
sfc: Move Falcon global event handling to falcon.c
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4833f02a2972b7da4c8a15e1e329db0f984a75d9
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:35 2010 +0000
sfc: Move mdio_lock to struct falcon_nic_data
We only have direct access to MDIO on Falcon, so move this out of
struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4de92180258ac661bbce0f0065c9c81633ac862b
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:29 2010 +0000
sfc: Move SPI state to struct falcon_nic_data
We only have direct access to SPI on Falcon, so move all this state
out of struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 90b7a4ee610bf1d14120f5e0618ae2a3568394a5
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:17 2010 +0000
sfc: Remove unnecessary inclusion of various private header files
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6a8872c54d177abd900a0cf165b76ecb4803f052
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:10 2010 +0000
sfc: Expose Falcon BootROM config through MTD, not ethtool
The ethtool EEPROM interface is really meant for exposing chip
configuration, not BootROM configuration.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6c88b0b6dc886e49c0e6ee21d677c2e380bde688
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:47:01 2010 +0000
sfc: Remove broken automatic fallback for invalid Falcon chip/board config
If the Falcon board config is invalid, we cannot proceed - we do not
have a valid board type to pass to falcon_probe_board(), and if we
kluge that to work with an unknown board then other initialisation
code will crash.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 18e3ee2cf96adf072deeb291eed670f2c23bb2fc
Author: Steve Hodgson <shodgson@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:55 2010 +0000
sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue
The mcfw *never* sends CMDDONE when rebooting. Changing this so that it always
sends CMDDONE *before* REBOOT is easy on Siena, but it's not obvious that we
could guarantee to be able to implement this on future hardware.
Given this, I'm less convinced that the protocol should be changed.
To reiterate the failure mode: The driver sees this:
issue command
receive REBOOT event
Was that reboot event sent before the command was issued, or in
response to the command? If the former then there will be a subsequent
CMDDONE event, if the latter, then there will be no CMDDONE event.
Options to resolve this are:
1. REBOOT always completes an outstanding mcdi request, and we set
the credits count to ignore a subsequent CMDDONE event with
mismatching seqno.
2. REBOOT never completes an outstanding mcdi request. If there is
no CMDDONE event then we rely on the mcdi timeout code to complete
the outstanding request, incurring a 10s delay.
I'd argue that (2) is tidier, but that incurring a 10s delay is a little
needless. Let's go with (1).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3157183a90fdbd686f939d2f032b675f7e9983d6
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:37 2010 +0000
sfc: Clear RXIN_SEL when soft-resetting QT2025C
When we enable PMA/PMD loopback this automatically sets RXIN_SEL
(inverse polarity for RXIN). We need to clear that bit during the
soft-reset sequence, as it is not done automatically.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit adc1d234116c22247e3886fb6e9bef450a0110f2
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:31 2010 +0000
sfc: Read-to-clear LM87 alarm/interrupt status at start of day
We do not want to shut down the board based on a fault that has
already been cleared.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 71839f7d162f973f5931d30d1376a2dc5c0bed5a
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:24 2010 +0000
sfc: Distinguish critical and non-critical over-temperature conditions
Set both the 'maximum' and critical temperature limits for LM87
hardware monitors on Falcon boards. Do not shut down a port until the
critical temperature is reached, but warn as soon as the 'maximum'
temperature is reached.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4484cd7dedecf59aee0775c6658f95bdee65f277
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:14 2010 +0000
sfc: Fix condition for no-op in set_phy_flash_cfg()
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f18ca364617d5e1fdd7300e025473496e397db4b
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Thu Dec 2 13:46:09 2010 +0000
sfc: Reduce log level for MCDI error response in efx_mcdi_rpc()
Some errors are expected, e.g. when sending new commands to an MC
running old firmware. Only the caller of efx_mcdi_rpc() can decide
what is a real error. Therefore log the error responses with
netif_dbg().
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 287050d390264402e11bea8b811859e42e8faa29
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Thu Dec 2 16:46:18 2010 -0500
tracing: Add TRACE_EVENT_CONDITIONAL()
There are instances in the kernel that we only want to trace
a tracepoint when a certain condition is set. But we do not
want to test for that condition in the core kernel.
If we test for that condition before calling the tracepoin, then
we will be performing that test even when tracing is not enabled.
This is 99.99% of the time.
We currently can just filter out on that condition, but that happens
after we write to the trace buffer. We just wasted time writing to
the ring buffer for an event we never cared about.
This patch adds:
TRACE_EVENT_CONDITION() and DEFINE_EVENT_CONDITION()
These have a new TP_CONDITION() argument that comes right after
the TP_ARGS(). This condition can use the parameters of TP_ARGS()
in the TRACE_EVENT() to determine if the tracepoint should be traced
or not. The TP_CONDITION() will be placed in a if (cond) trace;
For example, for the tracepoint sched_wakeup, it is useless to
trace a wakeup event where the caller never actually wakes
anything up (where success == 0). So adding:
TP_CONDITION(success),
which uses the "success" parameter of the wakeup tracepoint
will have it only trace when we have successfully woken up a
task.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit 7ac760c2f78ddd8e1bd633767b01becfbbf96720
Author: Artem Bityutskiy <Artem.Bityutskiy@xxxxxxxxx>
Date: Thu Dec 2 06:34:01 2010 +0200
UBI: fix corrupted PEB detection for NOR flash
My new shiny code for corrupted PEB detection has NOR specific bug.
We tread PEB as corrupted and preserve it, if
1. EC header is OK.
2. VID header is corrupted.
3. data area is not "all 0xFFs"
In case of NOR we have 'nor_erase_prepare()' quirk, which invalidates
the headers before erasing the PEB. And we invalidate first the VID
header, and then the EC header. So if a power cut happens after we have
invalidated the VID header, but before we have invalidated the EC
header, we end up with a PEB which satisfies the above 3 conditions,
and the scanning code will treat it as corrupted, and will print
scary warnings, wrongly.
This patch fixes the issue by firt invalidating the EC header, then
invalidating the VID header. In case of power cut inbetween, we still
just lose the EC header, and UBI can deal with this situation gracefully.
Thanks to Anatolij Gustschin <agust@xxxxxxx> for tracking this down.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@xxxxxxxxx>
Reported-by: Anatolij Gustschin <agust@xxxxxxx>
Tested-by: Anatolij Gustschin <agust@xxxxxxx>
commit 3a253445e327d0295bbe51bcbec5f44f86b54a8c
Author: John Baboval <john.baboval@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 11:21:31 2010 -0500
ALSA: hda - Fix ThinkPad T410[s] docking station line-out
On the docking station for the Lenovo T410 and T410s, the line-out
doesn't work. The trouble seems to be that it generates a plug event,
but then doesn't report that the jack is connected. So automute mutes
the jack when you plug something into it. The following patch (next
message) fixes it.
Signed-off-by: John Baboval <john.baboval at virtualcomputer.com>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit a1087ef6abedf0bfd60e5e3fddf33192cb2c1325
Author: Julia Lawall <julia@xxxxxxx>
Date: Wed Nov 24 15:54:18 2010 +0100
scripts/coccinelle: update for compatability with Coccinelle 0.2.4
For doubleinit.cocci, Coccinelle 0.2.4 requires a comma after ... in a
field list. Coccinelle also now behaves gracefully when a definition is
provided for a virtual that doesn't exist, so there is no need for the
semantic patch code to check for this case.
Updated the documentation to reflect the fact that the best results will
now be obtained with Coccinelle version 0.2.4 or later.
Signed-off-by: Julia Lawall <julia@xxxxxxx>
commit 77c4d5cdb81d25a45fbdfb84dd3348121219a072
Author: Daniel T Chen <crimsun@xxxxxxxxxx>
Date: Thu Dec 2 22:45:45 2010 -0500
ALSA: hda: Use model=lg quirk for LG P1 Express to enable playback and capture
BugLink: https://launchpad.net/bugs/595482
The original reporter states that audible playback from the internal
speaker is inaudible despite the hardware being properly detected. To
work around this symptom, he uses the model=lg quirk to properly enable
both playback, capture, and jack sense. Another user corroborates this
workaround on separate hardware. Add this PCI SSID to the quirk table
to enable it for further LG P1 Expresses.
Reported-and-tested-by: Philip Peitsch <philip.peitsch@xxxxxxxxx>
Tested-by: nikhov
Cc: <stable@xxxxxxxxxx> [2.6.32+]
Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 96886c4361f1ae3f6c775d7c9295e2d557101d0f
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Fri Nov 26 15:20:52 2010 +0100
iMX51: introduce IMX_GPIO_NR
Currently, to define a GPIO number, we're using something like :
#define EFIKAMX_PCBID0 (2*32 + 16)
to define GPIO 3 16.
This is not really readable and it's error prone imho (note the 3 vs 2).
So, I'm introducing a new macro to define this in a better way. Now, the
code sample become :
#define EFIKAMX_PCBID0 IMX_GPIO_NR(3, 16)
v2:
- move to gpio.h
- add parens & spaces
- switch to IMX_GPIO_NR instead of MX51_GPIO_NR
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Cc: Amit Kucheria <amit.kucheria@xxxxxxxxxx>
Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Cc: Eric Bénard <eric@xxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit b99545cb59dc0a55507100a1335f4fd0ed521032
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Fri Nov 26 12:25:59 2010 -0200
ARM: mx5: dynamically allocate imx2-wdt devices
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit d94ed1287e11f91e4f4096838179984b0206be5e
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date: Fri Nov 26 12:25:58 2010 -0200
ARM: mx5: introduce SOC_IMX51
Introduce SOC_IMX51 to keep consistency with the other i.MX devices
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit abebbb468050ad63caed55fdb7a6bfce732e9a7f
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 26 20:05:55 2010 +0300
arm: dma: check clk_get() result
clk_get() may return ERR_PTR(), if so propagate return code as
imx_dma_init() return code.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Fri Nov 26 15:27:53 2010 +0100
mx5: Fix efikamx build
Commit 124bf94a "ARM: imx: fix name for functions adding sdhci-esdhc-imx devices"
changed some devices and Kconfig entry and didn't change every places
it should have. It's breaking efikamx build. I've fixed 3ds Kconfig
entry as I believe it's broken there too.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 4c6c32b3f856346158161a8c9824b4dd2bff0893
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Nov 29 08:58:14 2010 +0100
ARM: mx25: fix offset for usb host controller
In commit 2c20b9f (ARM: mx25: dynamically allocate mxc-ehci devices) I
changed the offset to the value specified in the reference manual
intending to test this change on hardware. This slipped through and now
prooved to be wrong. So fix it and add a comment about the
documentation being wrong.
Reported-by: Jaume Ribot <jaume@xxxxxxxxxxxxxxx>
Cc: Michael Trimarchi <trimarchi@xxxxxxxxxxxxxxxx>
Cc: Shawn Guo <shawn.gsc@xxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 29bb6afcb077bd153c7738e73840dde808132fb5
Author: Eric Bénard <eric@xxxxxxxxxx>
Date: Sat Nov 27 09:15:38 2010 +0100
plat-mxc/ehci.c: fix compile breakage
commits 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 and
9e1dde33876ba83ad586c336647fff133d0f5472 renamed some defines
but didn't fix all the places where these defines are used
leading to a compile failure for USB on i.MX31, 35 and 27.
Signed-off-by: Eric Bénard <eric@xxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 4e5cf41eeb254b7e50666496ac5697188b31320b
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Thu Nov 4 15:50:38 2010 +0100
ARM i.MX SDMA: Add ROM script addresses to platform_data
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 5b28aa319bba96987316425a1131813d87cbab35
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Wed Oct 6 15:41:15 2010 +0200
dmaengine i.MX SDMA: Allow to run without firmware
The SDMA firmware consists of a ROM part and a RAM part.
The ROM part is always present in the SDMA engine and
is sufficient for many cases.
This patch allows to pass in platform data containing
the script addresses in ROM, so loading a firmware is
optional now.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Acked-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 87e51107323a84e26a5004337217fc954e8d9545
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sat Nov 6 17:01:36 2010 -0400
drivers/dma/: Use the ccflag-y instead of EXTRA_CFLAGS
Use the ccflag-y flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 51a1efe2e84493439db32c07471e835c752a7923
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Tue Nov 2 09:52:17 2010 +0800
dma: intel_mid_dma: fix double free on mid_setup_dma error path
We should not call kfree(dma) in mid_setup_dma error path because
the memory is allocated in intel_mid_dma_probe and will be freed
in intel_mid_dma_probe error path if mid_setup_dma return error.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit cbeae41888bddb2d8c23db281de5f38f4be6a9bb
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Tue Nov 2 09:12:57 2010 +0800
dma: imx-dma: fix imxdma_probe error path
otherwise, i will be -1 inside the latest iteration of the while loop.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
commit 0df7095205cbf6ea1cdfe6254e0d6a3b823caa3b
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Thu Dec 2 19:16:56 2010 +0000
ARM: SMP: remove IRQ-disabling for smp_cross_call()
As we've now removed the spinlock and bitmask, we have nothing left
which requires interrupts to be disabled when sending an IPI. All
current IPI-sending implementations use the GIC, which also does not
require interrupts disabled when calling gic_raise_softirq().
Remove the now unnecessary IRQ disable.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 24480d980e9063b3ebd0dfdf2f396c305956c356
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 09:54:18 2010 +0000
ARM: SMP: avoid using bitmasks and locks for IPIs, use hardware instead
Avoid using bitmasks and locks in the percpu area for IPIs, and instead
use individual software generated interrupts to identify the reason for
the IPI. This avoids the problems of having spinlocks in the percpu
area.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit ad3b6993b9c5482e8a2ec5aed181538c921fdcbd
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 09:42:08 2010 +0000
ARM: SMP: pass an ipi number to smp_cross_call()
This allows us to use smp_cross_call() to trigger a number of different
software generated interrupts, rather than combining them all on one
SGI. Recover the SGI number via do_IPI.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d92e04713c6323e09a0d0fdfa0d7cbcedb175e49
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 15 09:36:18 2010 +0000
ARM: remove obsolete smp_cross_call_done()
smp_cross_call_done() was removed long ago (see 78d236c - remove useless
smp_cross_call_done()). Remove those which have been subsequently
merged.
Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit f6d84f4a7df8057247a3f1723169586af3882436
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Fri Dec 3 07:22:31 2010 +0000
ARM: mach-shmobile: AG5 clock framework improvements
This patch improves the state of the AG5 clock
framework support. The main clock parent is
automatically detected, but most of the clocks
are not used by any driver or subsystem at this
point. More work is needed for support of multi
media hardware such as FSI and/or LCDC/MIPI-DSI.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a9fc749224bfb69686322643678f89e00303ee21
Merge: fa3c9f3de2504bb09f8ad512f89837751a3eb741 c44352c5357210172b3c30df61e0bc603ffc700e
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 3 14:42:29 2010 +0900
Merge branch 'sh/urgent' into sh-fixes-for-linus
commit c44352c5357210172b3c30df61e0bc603ffc700e
Author: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@xxxxxxxxxxx>
Date: Fri Dec 3 05:37:54 2010 +0000
sh: se/7724: Remove FSI/B of GPIO init code
se7724 board does not have FSI/B.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e17ca5cf3c5b2a769bcde2c37cf0d96f08c8cb17
Author: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@xxxxxxxxxxx>
Date: Fri Dec 3 05:37:53 2010 +0000
sh: se/7724: Update clock framework of FSI clock to non-legacy
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ebb27386ffd2fcd0fad141e0eee97b8070f94ee2
Merge: 6d20e8406f0942228a73000663c2b33f488103ea 59e57c622c3502346e8f930421ebc482d639520c
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Fri Dec 3 03:52:43 2010 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 59e57c622c3502346e8f930421ebc482d639520c
Merge: 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177 83ed79c561da20019cb24944f535530d73b2d615
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 17:40:04 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: length resolution should be reported units/mm
HID: add support for F430 Force Feedback Wheel
HID: egalax: Use kzalloc
HID: Remove KERN_DEBUG from dbg_hid use
Manually fixed trivial conflict in drivers/hid/hid-input.c (due to
removal of KERN_DEBUG from dbg_hid use clashing with new keycode
interface switch)
commit 9f5ead76d402f591ab810e71eae59ec28bf39eb9
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 10:55:46 2010 +0000
omap: PM debug: fix wake-on-timer debugfs dependency
Wakeup-on-timer code does not have/need debugfs dependency. Move
the function out of debugfs ifdef.
Fixes compile error when CONFIG_DEBUG_FS is disabled but PM debug is
enabled.
Reported-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 5403187f83c12c6f4c03547e0cc05bac0310be7b
Author: Aaro Koskinen <Aaro.Koskinen@xxxxxxxxx>
Date: Thu Dec 2 15:51:24 2010 +0000
arm: mach-omap2: rx51: clean up dummy onenand init
When OneNAND support is disabled, the platform code defines NULL
board_onenand_data and empty init function for us. By utilizing this we
can avoid cluttering board files with dummy definitions/wrappers.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit a1a92e6fccadbba1846a081f21d0c12a10addd56
Author: Aaro Koskinen <Aaro.Koskinen@xxxxxxxxx>
Date: Thu Dec 2 15:51:23 2010 +0000
arm: mach-omap2: n8x0: clean up dummy onenand init
When OneNAND support is disabled, the platform code defines NULL
board_onenand_data and empty init function for us. By utilizing this we
can avoid cluttering board files with dummy definitions/wrappers.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d
Author: Aaro Koskinen <Aaro.Koskinen@xxxxxxxxx>
Date: Thu Dec 2 13:25:40 2010 +0000
arm: mach-omap2: remove NULL board_mux from board files
If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header
file instead of forcing every single board to define it.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
[tony@xxxxxxxxxxx: updated for combined board-zoom files]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 08ec0c58fb8a05d3191d5cb6f5d6f81adb419798
Author: John Stultz <johnstul@xxxxxxxxxx>
Date: Tue Jul 27 17:00:00 2010 -0700
x86: Improve TSC calibration using a delayed workqueue
Boot to boot the TSC calibration may vary by quite a large amount.
While normal variance of 50-100ppm can easily be seen, the quick
calibration code only requires 500ppm accuracy, which is the limit
of what NTP can correct for.
This can cause problems for systems being used as NTP servers, as
every time they reboot it can take hours for them to calculate the
new drift error caused by the calibration.
The classic trade-off here is calibration accuracy vs slow boot times,
as during the calibration nothing else can run.
This patch uses a delayed workqueue to calibrate the TSC over the
period of a second. This allows very accurate calibration (in my
tests only varying by 1khz or 0.4ppm boot to boot). Additionally this
refined calibration step does not block the boot process, and only
delays the TSC clocksoure registration by a few seconds in early boot.
If the refined calibration strays 1% from the early boot calibration
value, the system will fall back to already calculated early boot
calibration.
Credit to Andi Kleen who suggested using a timer quite awhile back,
but I dismissed it thinking the timer calibration would be done after
the clocksource was registered (which would break things). Forgive
me for my short-sightedness.
This patch has worked very well in my testing, but TSC hardware is
quite varied so it would probably be good to get some extended
testing, possibly pushing inclusion out to 2.6.39.
Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>
LKML-Reference: <1289003985-29060-1-git-send-email-johnstul@xxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Ingo Molnar <mingo@xxxxxxx>
CC: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
CC: Clark Williams <williams@xxxxxxxxxx>
CC: Andi Kleen <andi@xxxxxxxxxxxxxx>
commit b0f969009f647cd473c5e559aeec9c4229d12f87
Merge: 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 d3b8f889a220aed825accc28eb64ce283a0d51ac
Author: John Stultz <john.stultz@xxxxxxxxxx>
Date: Thu Dec 2 16:47:52 2010 -0800
Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
Conflicts:
Documentation/kernel-parameters.txt
commit 87de5ac782761a3ebf806e434e8c9cc205a87274
Author: John Stultz <john.stultz@xxxxxxxxxx>
Date: Mon Sep 20 17:42:46 2010 -0700
timers: Introduce timerlist infrastructure.
The timerlist infrastructure is a thin layer over the rbtree
code that implements a simple list of timers sorted by an
expires value, and a getnext function that provides a pointer
to the earliest timer.
This infrastructure allows drivers and other kernel infrastructure
to easily implement timers without duplicating code.
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
LKML Reference: <1290136329-18291-2-git-send-email-john.stultz@xxxxxxxxxx>
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Richard Cochran <richardcochran@xxxxxxxxx>
commit 29dcbc5c25d6d8140337e96bf503c8475092c586
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date: Thu Dec 2 16:14:27 2010 -0800
xen: allocate irq descs on any NUMA node
Allocate irq descs on any NUMA node (we don't care) rather than
specifically node 0, which may not exist.
(At the moment NUMA is meaningless within a domain, so any info
the kernel has is just from an SRAT table we haven't suppressed/disabled.)
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
commit 2a4c92fa24e1853d0e21f9e6e45859b832240f94
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date: Thu Dec 2 15:30:06 2010 -0800
xen: prevent crashes with non-HIGHMEM 32-bit kernels with largeish memory
If this is a non-HIGHMEM 32-bit kernel, then the page structures only go
up to the limit of addressable memory, even if more memory is physically
present. Don't try to add that extra memory to the balloon.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
commit 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177
Author: Nelson Elhage <nelhage@xxxxxxxxxxx>
Date: Thu Dec 2 14:31:21 2010 -0800
do_exit(): make sure that we run with get_fs() == USER_DS
If a user manages to trigger an oops with fs set to KERNEL_DS, fs is not
otherwise reset before do_exit(). do_exit may later (via mm_release in
fork.c) do a put_user to a user-controlled address, potentially allowing
a user to leverage an oops into a controlled write into kernel memory.
This is only triggerable in the presence of another bug, but this
potentially turns a lot of DoS bugs into privilege escalations, so it's
worth fixing. I have proof-of-concept code which uses this bug along
with CVE-2010-3849 to write a zero to an arbitrary kernel address, so
I've tested that this is not theoretical.
A more logical place to put this fix might be when we know an oops has
occurred, before we call do_exit(), but that would involve changing
every architecture, in multiple places.
Let's just stick it in do_exit instead.
[akpm@xxxxxxxxxxxxxxxxxxxx: update code comment]
Signed-off-by: Nelson Elhage <nelhage@xxxxxxxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit a0b0f58cdd32ab363a600a294ddaa90f0c32de8c
Author: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Date: Thu Dec 2 14:31:20 2010 -0800
ksm: annotate ksm_thread_mutex is no deadlock source
commit 62b61f611e ("ksm: memory hotremove migration only") caused the
following new lockdep warning.
=======================================================
[ INFO: possible circular locking dependency detected ]
-------------------------------------------------------
bash/1621 is trying to acquire lock:
((memory_chain).rwsem){.+.+.+}, at: [<ffffffff81079339>]
__blocking_notifier_call_chain+0x69/0xc0
but task is already holding lock:
(ksm_thread_mutex){+.+.+.}, at: [<ffffffff8113a3aa>]
ksm_memory_callback+0x3a/0xc0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (ksm_thread_mutex){+.+.+.}:
[<ffffffff8108b70a>] lock_acquire+0xaa/0x140
[<ffffffff81505d74>] __mutex_lock_common+0x44/0x3f0
[<ffffffff81506228>] mutex_lock_nested+0x48/0x60
[<ffffffff8113a3aa>] ksm_memory_callback+0x3a/0xc0
[<ffffffff8150c21c>] notifier_call_chain+0x8c/0xe0
[<ffffffff8107934e>] __blocking_notifier_call_chain+0x7e/0xc0
[<ffffffff810793a6>] blocking_notifier_call_chain+0x16/0x20
[<ffffffff813afbfb>] memory_notify+0x1b/0x20
[<ffffffff81141b7c>] remove_memory+0x1cc/0x5f0
[<ffffffff813af53d>] memory_block_change_state+0xfd/0x1a0
[<ffffffff813afd62>] store_mem_state+0xe2/0xf0
[<ffffffff813a0bb0>] sysdev_store+0x20/0x30
[<ffffffff811bc116>] sysfs_write_file+0xe6/0x170
[<ffffffff8114f398>] vfs_write+0xc8/0x190
[<ffffffff8114fc14>] sys_write+0x54/0x90
[<ffffffff810028b2>] system_call_fastpath+0x16/0x1b
-> #0 ((memory_chain).rwsem){.+.+.+}:
[<ffffffff8108b5ba>] __lock_acquire+0x155a/0x1600
[<ffffffff8108b70a>] lock_acquire+0xaa/0x140
[<ffffffff81506601>] down_read+0x51/0xa0
[<ffffffff81079339>] __blocking_notifier_call_chain+0x69/0xc0
[<ffffffff810793a6>] blocking_notifier_call_chain+0x16/0x20
[<ffffffff813afbfb>] memory_notify+0x1b/0x20
[<ffffffff81141f1e>] remove_memory+0x56e/0x5f0
[<ffffffff813af53d>] memory_block_change_state+0xfd/0x1a0
[<ffffffff813afd62>] store_mem_state+0xe2/0xf0
[<ffffffff813a0bb0>] sysdev_store+0x20/0x30
[<ffffffff811bc116>] sysfs_write_file+0xe6/0x170
[<ffffffff8114f398>] vfs_write+0xc8/0x190
[<ffffffff8114fc14>] sys_write+0x54/0x90
[<ffffffff810028b2>] system_call_fastpath+0x16/0x1b
But it's a false positive. Both memory_chain.rwsem and ksm_thread_mutex
have an outer lock (mem_hotplug_mutex). So they cannot deadlock.
Thus, This patch annotate ksm_thread_mutex is not deadlock source.
[akpm@xxxxxxxxxxxxxxxxxxxx: update comment, from Hugh]
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Acked-by: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 20d6c96b5f1cad5c5da4641945ec17a1d9a1afc8
Author: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Date: Thu Dec 2 14:31:19 2010 -0800
mem-hotplug: introduce {un}lock_memory_hotplug()
Presently hwpoison is using lock_system_sleep() to prevent a race with
memory hotplug. However lock_system_sleep() is a no-op if
CONFIG_HIBERNATION=n. Therefore we need a new lock.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Suggested-by: Hugh Dickins <hughd@xxxxxxxxxx>
Acked-by: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 4fe65cab844e6d3d7d310e66a501d5e7242ecb54
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 14:31:19 2010 -0800
Documentation/filesystems/vfs.txt: fix ->repeasepage() description
->releasepage() does not remove the page from the mapping.
Acked-by: Neil Brown <neilb@xxxxxxx>
Cc: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 64141da587241301ce8638cc945f8b67853156ec
Author: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Thu Dec 2 14:31:18 2010 -0800
vmalloc: eagerly clear ptes on vunmap
On stock 2.6.37-rc4, running:
# mount lilith:/export /mnt/lilith
# find /mnt/lilith/ -type f -print0 | xargs -0 file
crashes the machine fairly quickly under Xen. Often it results in oops
messages, but the couple of times I tried just now, it just hung quietly
and made Xen print some rude messages:
(XEN) mm.c:2389:d80 Bad type (saw 7400000000000001 != exp
3000000000000000) for mfn 1d7058 (pfn 18fa7)
(XEN) mm.c:964:d80 Attempt to create linear p.t. with write perms
(XEN) mm.c:2389:d80 Bad type (saw 7400000000000010 != exp
1000000000000000) for mfn 1d2e04 (pfn 1d1fb)
(XEN) mm.c:2965:d80 Error while pinning mfn 1d2e04
Which means the domain tried to map a pagetable page RW, which would
allow it to map arbitrary memory, so Xen stopped it. This is because
vm_unmap_ram() left some pages mapped in the vmalloc area after NFS had
finished with them, and those pages got recycled as pagetable pages
while still having these RW aliases.
Removing those mappings immediately removes the Xen-visible aliases, and
so it has no problem with those pages being reused as pagetable pages.
Deferring the TLB flush doesn't upset Xen because it can flush the TLB
itself as needed to maintain its invariants.
When unmapping a region in the vmalloc space, clear the ptes
immediately. There's no point in deferring this because there's no
amortization benefit.
The TLBs are left dirty, and they are flushed lazily to amortize the
cost of the IPIs.
This specific motivation for this patch is an oops-causing regression
since 2.6.36 when using NFS under Xen, triggered by the NFS client's use
of vm_map_ram() introduced in 56e4ebf877b60 ("NFS: readdir with vmapped
pages") . XFS also uses vm_map_ram() and could cause similar problems.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxxxx>
Cc: Bryan Schumaker <bjschuma@xxxxxxxxxx>
Cc: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: Alex Elder <aelder@xxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 853ff88324a248a9f5da6e110850223db353ec07
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date: Thu Dec 2 14:31:17 2010 -0800
cs5535-gpio: apply CS5536 errata workaround for GPIOs
The AMD Geode CS5536 Companion Device Silicon Revision B1 Specification
Update mentions the follow as issue #36:
"Atomic write transactions to the atomic GPIO High Bank Feature Bit
registers should only affect the bits selected [...]"
"after Suspend, an atomic write transaction [...] will clear all
non-selected bits of the accessed register."
In other words, writing to the high bank for a single GPIO bit will
clear every other GPIO bit (but only sometimes after a suspend).
The workaround described is obvious and simple; do a read-modify-write.
This patch does that, and documents why we're doing it.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 238af8751f64a75f8b638193353b1c31ea32e738
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Dec 2 14:31:16 2010 -0800
reiserfs: don't acquire lock recursively in reiserfs_acl_chmod
reiserfs_acl_chmod() can be called by reiserfs_set_attr() and then take
the reiserfs lock a second time. Thereafter it may call journal_begin()
that definitely requires the lock not to be nested in order to release
it before taking the journal mutex because the reiserfs lock depends on
the journal mutex already.
So, aviod nesting the lock in reiserfs_acl_chmod().
Reported-by: Pawel Zawora <pzawora@xxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Tested-by: Pawel Zawora <pzawora@xxxxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Cc: <stable@xxxxxxxxxx> [2.6.32.x+]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 0bae35e14b68f5e7075bc96e5ea608b42bdf8f59
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Dec 2 14:31:14 2010 -0800
leds: fix up dependencies
It's not useful to build LED triggers when there's no LEDs that can be
triggered by them. Therefore, fix up the dependencies so that this
cannot happen, and fix a few users that select triggers to depend on
LEDS_CLASS as well (there is also one user that also selects LEDS_CLASS,
which is OK).
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Tested-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Arnd Hannemann <arnd@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit e172662d113ceb22db727a979bb35b9c02f703b5
Author: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Date: Thu Dec 2 14:31:13 2010 -0800
vmstat: fix dirty threshold ordering
The nr_dirty_[background_]threshold fields are misplaced before the
numa_* fields, and users will read strange values.
This is the right order. Before patch, nr_dirty_background_threshold
will read as 0 (the value from numa_miss).
numa_hit 128501
numa_miss 0
numa_foreign 0
numa_interleave 7388
numa_local 128501
numa_other 0
nr_dirty_threshold 144291
nr_dirty_background_threshold 72145
Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Michael Rubin <mrubin@xxxxxxxxxx>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Reviewed-by: Minchan Kim <minchan.kim@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 55cfaa3cbdd29c4919ecb5fb8965c310f357e48c
Author: Zeng Zhaoming <zengzm.kernel@xxxxxxxxx>
Date: Thu Dec 2 14:31:13 2010 -0800
mm/mempolicy.c: add rcu read lock to protect pid structure
find_task_by_vpid() should be protected by rcu_read_lock(), to prevent
free_pid() reclaiming pid.
Signed-off-by: Zeng Zhaoming <zengzm.kernel@xxxxxxxxx>
Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 1f64d69c7ad2e48e697493e45590679f7a69b7b2
Author: Dean Nelson <dnelson@xxxxxxxxxx>
Date: Thu Dec 2 14:31:12 2010 -0800
mm/hugetlb.c: avoid double unlock_page() in hugetlb_fault()
Have hugetlb_fault() call unlock_page(page) only if it had previously
called lock_page(page).
Setting CONFIG_DEBUG_VM=y and then running the libhugetlbfs test suite,
resulted in the tripping of VM_BUG_ON(!PageLocked(page)) in
unlock_page() having been called by hugetlb_fault() when page ==
pagecache_page. This patch remedied the problem.
Signed-off-by: Dean Nelson <dnelson@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a
Author: Eric Anholt <eric@xxxxxxxxxx>
Date: Thu Nov 18 09:32:59 2010 +0800
drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI.
This workaround only applies to Ironlake.
Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 220cad3cbf553f893432919b458da36489373fc6
Author: Eric Anholt <eric@xxxxxxxxxx>
Date: Thu Nov 18 09:32:58 2010 +0800
drm/i915: Always set the DP transcoder config to 8BPC.
The pipe is always set to 8BPC, but here we were leaving whatever
previous bits were set by the BIOS in place.
Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
Tested-by: Keith Packard <keithp@xxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit b924dcf0038b8f83e65b44f679ad480d44f85aa6
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:01:03 2010 +0000
tipc: Delete tipc_ownidentity()
Moves the content of the native API routine tipc_ownidentity() into the
sole routine that calls it, since it can no longer be called in isolation.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 12bae479ee414f45ad8fe93530f5b6ea241bde3f
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:01:02 2010 +0000
tipc: Eliminate obsolete native API forwarding routines
Moves the content of each native API message forwarding routine
into the sole routine that calls it, since the forwarding routines
no longer be called in isolation. Also removes code in each routine
that altered the outgoing message's importance level since this is
now no longer possible.
The previous function mapping (parent function, and child API) was
as follows:
tipc_send2name
\--tipc_forward2name
tipc_send2port
\--tipc_forward2port
tipc_send_buf2port
\--tipc_forward_buf2port
After this commit, the children don't exist and their functionality
is completely in the respective parent.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 471450f7ec24ccd9ac24e6f05cd9358d40c09d03
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:01:01 2010 +0000
tipc: Eliminate an unused symbolic constant in link code
Removes a symbol that is not referenced anywhere by TIPC's link code.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 52fe7b725e0a1360d36c720ee87ab1e559df69db
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:01:00 2010 +0000
tipc: Eliminate useless initialization when creating subscriber
Removes initialization of a local variable that is always assigned
a different value before it is referenced.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 38f232eae20cefed2e2379d77c54babb0de6d024
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:59 2010 +0000
tipc: Remove unused domain argument from multicast send routine
Eliminates an unused argument from tipc_multicast(), now that this
routine can no longer be called by kernel-based applications.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a5c2af9922a94a875c5f4b2dcd357a1c399b7ea6
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:58 2010 +0000
tipc: Remove support for TIPC mode change callback
Eliminates support for the callback routine invoked when TIPC
changes its mode of operation from inactive to standalone or from
standalone to networked. This callback was part of TIPC's obsolete
native API and is not used by TIPC internally.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 528c771e87c3fa661bc6983b5bf0ba464d9f7c3a
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:57 2010 +0000
tipc: Delete useless function prototypes
Removes several function declarations that aren't used anywhere,
either because they reference routines that no longer exist or
because all users of the function reference it after it has already
been defined.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 28cc937eac00805e8b9c6e7ed7d590567378187f
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:56 2010 +0000
tipc: Eliminate useless return value when disabling a bearer
Modifies bearer_disable() to return void since it always indicates
success anyway.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8d71919d7afc4ade0d9de09e1d50fbf9168c368d
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:55 2010 +0000
tipc: Delete unused configuration service structure definition
Removes a structure definition that is no longer used by TIPC's
configuration service.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c80262829769419e19527f972672e8df0480235a
Author: Allan Stephens <allan.stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:54 2010 +0000
tipc: Remove obsolete inclusions of header files
Gets rid of #include statements that are no longer required as a
result of the merging of obsolete native API header file content
into other TIPC include files.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d265fef6ddf9042195aae551e1fde211c2a1588b
Author: Allan Stephens <allan.stephens@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:00:53 2010 +0000
tipc: Remove obsolete native API files and exports
As part of the removal of TIPC's native API support it is no longer
necessary for TIPC to export symbols for routines that can be called
by kernel-based applications, nor for it to have header files that
kernel-based applications can include to access the declarations for
those routines. This commit eliminates the exporting of symbols by
TIPC and migrates the contents of each obsolete native API include
file into its corresponding non-native API equivalent.
The code which was migrated in this commit was migrated intact, in
that there are no technical changes combined with the relocation.
Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dca9b2404a6d6579828da2425c051462701efd3f
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Wed Dec 1 18:05:17 2010 +0000
net: kill unused macros from head file
These macros have been defined for several years since v2.6.12-rc2ï¼?tracing by gitï¼?,
but never be used. So remove them.
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b672083ed36a49c323737b7c7e1d5264a7c193af
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Wed Dec 1 18:05:12 2010 +0000
ipv6: use ND_REACHABLE_TIME and ND_RETRANS_TIMER instead of magic number
ND_REACHABLE_TIME and ND_RETRANS_TIMER have defined
since v2.6.12-rc2, but never been used.
So use them instead of magic number.
This patch also changes original code style to read comfortably .
Thank YOSHIFUJI Hideaki for pointing it out.
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 97b1ce25e8fc27f74703537ec09d4996c7a6e38a
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Wed Dec 1 18:04:50 2010 +0000
tcp: use TCP_BASE_MSS to set basic mss value
TCP_BASE_MSS is defined, but not used.
commit 5d424d5a introduce this macro, so use
it to initial sysctl_tcp_base_mss.
commit 5d424d5a674f782d0659a3b66d951f412901faee
Author: John Heffner <jheffner@xxxxxxx>
Date: Mon Mar 20 17:53:41 2006 -0800
[TCP]: MTU probing
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a9527a3b621e507c85b639c183c3aa22afd4eb61
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Wed Dec 1 18:04:43 2010 +0000
net: snmp: fix the wrong ICMP_MIB_MAX value
__ICMP_MIB_MAX is equal to the total number of icmp mib,
So no need to add 1. This wastes 4/8 bytes memory.
Change it to be same as ICMP6_MIB_MAX, TCP_MIB_MAX, UDP_MIB_MAX.
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e7dfc8dbdf9a7fa1ef04c63100a71f4102b82ed3
Author: Alexander V. Lukyanov <lav@xxxxxxxx>
Date: Tue Nov 30 03:57:39 2010 +0000
tulip: fix hang in dmfe driver on sending of big packet
This patch fixes hang in dmfe driver on attempt of sending a big packet.
Without this patch the code stops the queue and never wakes it again.
Signed-off-by: Alexander V. Lukyanov <lav@xxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fe27d4b012273640e033be80f143bdc54daa8e16
Merge: ad9c2b048b605fbc8d50526e330b88abdd631ab2 676dac4b1bee0469d6932f698aeb77e8489f5861
Author: James Morris <jmorris@xxxxxxxxx>
Date: Fri Dec 3 08:21:01 2010 +1100
Merge branch 'smack-next-master' into next
commit f8e9616108c7003e6499c162459258f11c9dc85e
Author: Vlad Lungu <vlad.lungu@xxxxxxxxxxxxx>
Date: Mon Nov 29 22:52:52 2010 +0000
stmmac: priv->lock can be used uninitialized
To reproduce: if connman (http://connman.net/) is started,
inserting the stmmac module triggers a "BUG: spinlock bad magic on CPU#0".
Registering the device in stmmac_probe() sends a notification to connman
which brings the interface up before the lock is initialized.
Signed-off-by: Vlad Lungu <vlad.lungu@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 415103f9932d45f7927f4b17e3a9a13834cdb9a1
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Thu Dec 2 16:13:40 2010 -0500
SELinux: do not compute transition labels on mountpoint labeled filesystems
selinux_inode_init_security computes transitions sids even for filesystems
that use mount point labeling. It shouldn't do that. It should just use
the mount point label always and no matter what.
This causes 2 problems. 1) it makes file creation slower than it needs to be
since we calculate the transition sid and 2) it allows files to be created
with a different label than the mount point!
# id -Z
staff_u:sysadm_r:sysadm_t:s0-s0:c0.c1023
# sesearch --type --class file --source sysadm_t --target tmp_t
Found 1 semantic te rules:
type_transition sysadm_t tmp_t : file user_tmp_t;
# mount -o loop,context="system_u:object_r:tmp_t:s0" /tmp/fs /mnt/tmp
# ls -lZ /mnt/tmp
drwx------. root root system_u:object_r:tmp_t:s0 lost+found
# touch /mnt/tmp/file1
# ls -lZ /mnt/tmp
-rw-r--r--. root root staff_u:object_r:user_tmp_t:s0 file1
drwx------. root root system_u:object_r:tmp_t:s0 lost+found
Whoops, we have a mount point labeled filesystem tmp_t with a user_tmp_t
labeled file!
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Reviewed-by: Reviewed-by: James Morris <jmorris@xxxxxxxxx>
commit 2989042ca86b94bf4ffa9486921bb300ad44225f
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Mon Nov 29 18:19:52 2010 +0000
can: EG20T PCH: Delete unnecessary spin_lock
Delete unnecessary spin_lock for accessing Message Object.
Since all message objects are divided into tx/rx area completely,
spin_lock processing is unnecessary.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d68f6837c4972b0433e41f8bee4b2b8205610f31
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Mon Nov 29 18:16:15 2010 +0000
can: EG20T PCH: Enumerate LEC macros
For easy to readable, LEC #define macros are replaced to enums.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 15ffc8fddf72712cc45d51c64bd500760ec63c80
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Mon Nov 29 18:15:02 2010 +0000
can: EG20T PCH: Change Message Object Index
For easy to readable, add Message Object index like below.
PCH_RX_OBJ_START
PCH_RX_OBJ_END
PCH_TX_OBJ_START
PCH_TX_OBJ_END
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8339a7ed562719e040ca783bf59fa2d614d10ac9
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Mon Nov 29 18:11:52 2010 +0000
can: EG20T PCH: Separate Interface Register(IF1/IF2)
CAN register of Intel PCH EG20T has 2 sets of interface register.
To reduce whole of code size, separate interface register.
As a result, the number of function also can be reduced.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 94c35de9a918665d9354efe2bafc29ba4b37497a
Merge: 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b 251d380034c6c34efe75ffb89d863558ba68ec6a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 12:59:11 2010 -0800
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (27 commits)
Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
staging: easycap needs smp_lock.h, fixes build error
Staging: batman-adv: ensure that eth_type_trans gets linear memory
Staging: batman-adv: Don't remove interface with spinlock held
staging: brcm80211: updated maintainers contact information
staging: fix winbond build, needs delay.h
Staging: line6: fix up my fixup for some sysfs attribute permissions
Staging: zram: fix up my fixup for some sysfs attribute permissions
Staging: udlfb: fix up my fixup for some sysfs attribute permissions
Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
Staging: frontier: fix up my fixup for some sysfs attribute permissions
Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
staging: spectra: fix build error
Staging: intel_sst: fix memory leak
Staging: rtl8712: signedness bug in init
staging: rtl8187se: Change panic to warn when RF switch turned off
staging: comedi: fix memory leak
Staging: quickstart: free after input_unregister_device()
Staging: speakup: free after input_unregister_device()
...
commit 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b
Merge: eed5ee1a3ab3020168cd67fdde2500452b0628c9 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 12:58:36 2010 -0800
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
uio: Change mail address of Hans J. Koch
driver core: prune docs about device_interface
driver core: the development tree has switched to git
commit eed5ee1a3ab3020168cd67fdde2500452b0628c9
Merge: 435a5aebf609624bdf7c5a9a7705c260d0076195 a5880a9e5bb40fbae55de60051d69a29091053c3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 12:58:16 2010 -0800
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: mfd: adjust the baud rate setting
TTY: open/hangup race fixup
TTY: don't allow reopen when ldisc is changing
NET: wan/x25, fix ldisc->open retval
TTY: ldisc, fix open flag handling
serial8250: Mark console as CON_ANYTIME
commit 435a5aebf609624bdf7c5a9a7705c260d0076195
Merge: 2e5c26de1d9a8e824b6c098ee393edac1b6050f9 b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 12:57:35 2010 -0800
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: fix autosuspend bug in usb-serial
USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
USB: yurex: add .llseek fop to file_operations
USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
usb: musb: do not use dma for control transfers
usb: musb: gadget: fix compilation warning
usb: musb: clear RXCSR_AUTOCLEAR before PIO read
usb: musb: unmap dma buffer when switching to PIO
xhci: Don't let the USB core disable SuperSpeed ports.
xhci: Setup array of USB 2.0 and USB 3.0 ports.
xhci: Fix reset-device and configure-endpoint commands
commit 09f921f83faa49cdea25abfb98c439c01526b89d
Merge: 4cebb34caa5122216a1e2451eae9e0fc47ec2589 d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 2 15:46:37 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
commit d5c21fc6155549e7f92fdeb039227f2b8e597e98
Author: Matthias Brugger <matthias.bgg@xxxxxxxxx>
Date: Thu Dec 2 14:13:04 2010 +0100
staging: adis16255 delete driver
This patch deletes the adis16255 driver from staging as a similar
implementation exists inside the iio subsystem.
Signed-off-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d1f521c16a4d7e46bbb9c6968076f80be995e0ed
Author: Peter Huewe <peterhuewe@xxxxxx>
Date: Thu Dec 2 00:43:34 2010 +0100
staging/sep: Fix printk format warning
This patch fixes gcc's complaints about the wrong format string for
size_t arguments:
"format '%x' expects type 'unsigned int', but argument has type
'size_t'"
Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dda16b23e32cf2351aa03590f43cc8a2873dc6a9
Author: Peter Huewe <peterhuewe@xxxxxx>
Date: Thu Dec 2 00:43:33 2010 +0100
staging/sep: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit eb6b420da13fee2edc30b7bde67c0c8993c4c30d
Author: Peter Huewe <peterhuewe@xxxxxx>
Date: Thu Dec 2 00:43:32 2010 +0100
staging/sep: Fix sparse warning 'do-while statement is not a compound statement'
This patch fixes the warning generated by sparse: 'do-while statement is
not a compound statement' by adding the necessary brackets around the do
block
Signed-off-by: Peter Huewe <peterhuewe@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ff29ee8f9301c38f28d4d22fe49373d3b996956e
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Thu Dec 2 15:44:52 2010 +0100
staging: brcm80211: remove redundant CHIPREV macro
The CHIPREV macro simply expands to the macro argument so it is
redundant and as such removed.
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dfa26436109d06f233a0ad735731cfb2d0c6ab5a
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Thu Dec 2 15:44:51 2010 +0100
staging: brcm80211: remove redundant CHIPID macro
The CHIPID macro simply expands to the macro argument so it is
redundant and as such removed.
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 92246bcbd7730eaaec0c29a2adc1cb4b4451ed9e
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Thu Dec 2 15:44:50 2010 +0100
staging: brcm80211: remove redundant CHIPTYPE macro
The CHIPTYPE macro simply expands to the macro argument so it is
redundant and as such removed.
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c523ea78ec9a33586fa7a73859de7c462097cdfc
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Wed Dec 1 15:36:39 2010 -0800
staging: brcm80211: absorb linux_osl.h into osl.h
Move code from linux_osl.h into osl.h and delete linux_osl.h, which
created a bunch of checkpatch errors...
I fixed most but volatile warnings will have to be dealt with later.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit df880a42dc4086ba7ff16f6ccb255e78fc0dc374
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Wed Dec 1 15:36:38 2010 -0800
staging: brcm80211: Remove unused code from osl.h
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4cebb34caa5122216a1e2451eae9e0fc47ec2589
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:21 2010 +0100
ath5k: Fix reset and interrupts for AHB type of devices.
On WiSoc we cannot access mac register before it is resetted.
It will crash hardware otherwise.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a0b907ee2a71052fefdf6151764095f3f97b3275
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:16 2010 +0100
ath5k: Add AHB bus support.
AHB specific functions are now in ahb.c file. AHB bus is
compiled in when CONFIG_ATHEROS_AR231X is set in kernel.
All other platforms will use PCI bus.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c31b5c9c806b1fbdc9e98885d897664a0d482989
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:11 2010 +0100
ath5k: Add initial registers values for radio RF2317 chip.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e7aecd327d80b2f156b54769013aaccb2a20645a
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:06 2010 +0100
ath5k: Add a function to read chipset's MAC revision
Add bus dependent revision read function which is used to
determine chipset's MAC before hardware is initialized.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8efa5d7d6ad307ae2d220def37ca89594062c40d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:06 2010 +0100
ath5k: Check if pci pdev struct is initialized in common functions.
To be able to support other busses than PCI check if pci device
structure is initialized.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4aa5d783c9e1c72e4950ff34f388077ccecac74a
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:01 2010 +0100
ath5k: Use generic eeprom read from common ath_bus_opts struct.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e5b046d86fac609f636d127a38de94a175c7e83b
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:27:01 2010 +0100
ath5k: Move PCI bus functions to separate file.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 132b1c3ee38ea6fa0501004fd0f19acb554e5a44
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:26:56 2010 +0100
ath5k: Introduce ath5k_init_softc function as in ath9k
Split pci initialization into hardware specific
functions and softc structure initialization.
Make function naming similar to ones ath9k.
Introduce ath_bus_opts in ath5k for later
AHB bus integration.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aeae4ac9090462ea38387dcdbac4f01b944af6a4
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Dec 2 10:26:51 2010 +0100
ath5k: Use Generic DMA for later support of AHB bus.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c30ae138aa0570665725166679bdf4207041c8df
Merge: 78b8595691c34478a51d1c2bcbbb0f6ec8a28247 be21871f24b0fcd8d0d09c8090385c9cec80efa3
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 2 15:17:46 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
commit 78b8595691c34478a51d1c2bcbbb0f6ec8a28247
Author: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Date: Thu Dec 2 14:45:07 2010 +0200
wireless: ray_cs: use '%pm' format option to print MAC
Signed-off-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: linux-wireless@xxxxxxxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 547025d5d4d1056fb4b5a0c9c3c0d5c2fe22c082
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Thu Dec 2 16:23:12 2010 +0900
cfg80211: Add documentation for antenna ops
The last patch with the same title was for mac80211 ops, accidentally.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c1927d7a8fab07171d08f7a3a8b7e5fe87bb70d4
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:35 2010 +0100
mac80211: publish SMPS docs
Create a new chapter about SMPS in the
driver API part of the mac80211 book and
populate it with the existing docs.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f6b8bef3634a5c9ea326b3ab0c9615fdac5f18ab
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:34 2010 +0100
mac80211: document station handling
Add some existing documentation about station
handling to a new chapter about advanced APIs.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit eebbb348df5a8c239a6300188907dec7e427bf70
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:33 2010 +0100
mac80211: publish interface iteration docs
Publish the documentation for the interface
iteration functions in the right section of
the book.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e16c01030b8794992590ff9b1b1e4b1b89e0cad3
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:32 2010 +0100
mac80211: document aggregation
Include the aggregation documentation in the
docbook, split up by public and internal docs.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cf6cb7ab59e0b37afe6e76b2e444479bf86bf933
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:31 2010 +0100
mac80211: publish some rate control docs
Add an API chapter to the rate control part of
the mac80211 book and populate it with some
existing documentation.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 625208138550562fd3bc731f53f43cb66a3be70a
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:30 2010 +0100
mac80211: publish some misc docs
There isn't a clear TX documentation yet, so
put these into the misc section for now.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7bcfda13fea4a8770deaf4b22093dc2708760128
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:29 2010 +0100
mac80211: publish docs for _ni functions
Put them along with their "regular" versions for
now, we should write more docs in the future.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d7ae30f073a179a9cebd663e7502843ddf4ba672
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:28 2010 +0100
mac80211: document workqueue
Create a new chapter for the mac80211 workqueue
that contains the documentation written for it.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2e54a7a20cf7c02ee17c56488fedb8cd3d2c2f35
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Dec 1 09:43:27 2010 +0100
cfg80211: include CQM packet loss docs
Just include them in the list of functions,
there aren't any more detailed docs (yet).
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6a0141175b6026e13652339e607a35f4b6687f27
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date: Wed Dec 1 12:30:09 2010 +0530
ath9k_htc: Remove unused structures
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b2767363192d5937e0f61f05b1b6b881da9ee55a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 30 13:42:08 2010 -0800
wireless: Remove unnecessary casts of usb_get_intfdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e7797bf2c0297098056a95b6b03ea5a9a3285e36
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Nov 30 22:33:16 2010 +0100
b43: N-PHY: fix code path on PHY init
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 76b002bd6dfdd66c58669cbdfa5cd92084b6936e
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Nov 30 22:33:15 2010 +0100
b43: N-PHY: use defines for RSSI types
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 99f6c2ef1e968c0dbdfa8c5b8f2869129b860d88
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Tue Nov 30 22:33:14 2010 +0100
b43: N-PHY: fix RSSI selection
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 44b23b488d44e56d467764ecb661830e5b02b308
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 30 12:19:11 2010 -0800
ath9k: hif_usb: Reduce indent 1 column
Invert test and return early.
Move variable declarations to local scope.
Don't initialize variables to 0 unnecessarily.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit eb272441fc14ad126abfa46de8a9c58bda8added
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Mon Nov 29 14:13:22 2010 -0800
ath9k: Move debugfs under ieee80211/[phyname]/ath9k/
This fixes debugfs problems when a phy is renamed,
and is able to remove a bit of code that is no longer
needed.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit db3949c4506a21633469d71f2915cf660eea0a35
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 2 11:52:07 2010 -0800
tcp: Implement ipv6 ->get_peer() and ->tw_get_peer().
Now ipv6 timewait recycling is fully implemented and
enabled.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 493f377d6dd56f4e98b198d637fe714ab124681b
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 2 12:14:29 2010 -0800
tcp: Add timewait recycling bits to ipv6 connect code.
This will also improve handling of ipv6 tcp socket request
backlog when syncookies are not enabled. When backlog
becomes very deep, last quarter of backlog is limited to
validated destinations. Previously only ipv4 implemented
this logic, but now ipv6 does too.
Now we are only one step away from enabling timewait
recycling for ipv6, and that step is simply filling in
the implementation of tcp_v6_get_peer() and
tcp_v6_tw_get_peer().
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bafbb8df076de1e3b63914473a403fba96b88f3c
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 12:12:46 2010 -0800
Staging: hv: remove vmbus_on_event_dpc()
Just call VmbusOnEvents() as that's all the function did, so we can
remove it.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2e5c26de1d9a8e824b6c098ee393edac1b6050f9
Merge: 75318ec3277d1fc46ecc129d7ef880b269fd9ee0 4fc3680894ff5739e7474b6633e962bfbdf0d3d8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 12:11:31 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: it8712f_wdt: add note to Kconfig
watchdog: gef_wdt: include fs.h
watchdog: bcm63xx_wdt: improve platform part.
watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH
commit cef6dbfa8ef6b8c474e020a24758aa848a2632fa
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 12:11:25 2010 -0800
Staging: hv: make some vmbus_drv functions static
Now that vmbus_drv.c is merged with vmbus.c, some of the newly global
functions can now be marked static.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 75318ec3277d1fc46ecc129d7ef880b269fd9ee0
Merge: 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c 7adce751ce79bcb6d0a591e6b94d76631c9a232c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 12:10:56 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB: Fix information leak in marshalling code
IB/pack: Remove some unused code added by the IBoE patches
IB/mlx4: Fix IBoE link state
IB/mlx4: Fix IBoE reported link rate
mlx4_core: Workaround firmware bug in query dev cap
IB/mlx4: Fix memory ordering of VLAN insertion control bits
MAINTAINERS: Update NetEffect entry
commit 6d26e38fa2085ab3ba37a52e34caf46f8e049544
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 12:08:08 2010 -0800
Staging: hv: merge VmbusInitialize into vmbus_bus_init
No need to have two functions for this.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0bdb250c69251499f53a4ac6f9dae117da490696
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 12:04:59 2010 -0800
Staging: hv: remove gDriver variable
It's only set and never used anymore, so remove it.
Gotta love static variables with a "global" hungarian notatation on the
name...
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6c884555f23d0c73f7e71ce977ee4dd882532c0f
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 12:04:00 2010 -0800
Staging: hv: call VmbusInitialize directly from vmbus_bus_init()
No need to pass a function pointer to a function in the same file.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 36199a992aba4f3ea1bc0430f04655e99010a65d
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 11:59:22 2010 -0800
Staging: hv: remove vmbus.c
Merge the functions into vmbus_drv.c as there's no need to have them
separate anymore. It will also make unwinding some of the function and
pointer mess easier, as well as making functions static in the future.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Sun Nov 28 12:59:45 2010 +0100
b43: N-PHY: fix RSSI calibration
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8c1d5a7a2230a162af709fa118f051e0d18ff427
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Sun Nov 28 12:59:44 2010 +0100
b43: N-PHY: initialize perical variable, add missing call to CCA reset
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 161d540c8ef31e5adbced3248873024476e2c26f
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Sun Nov 28 12:59:43 2010 +0100
b43: N-PHY: implement very basic TX power control management
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 40277cabfee7c8ef45055155895dcbef0f983c63
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Sun Nov 28 12:59:42 2010 +0100
b43: N-PHY: swap values for radio registers 0x3b and 0x3c
Specs were updated plus we become wl compatible.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sun Nov 28 12:22:52 2010 +0100
ssb: Add sysfs attributes to ssb devices
Make it possible to read out the attributes, till now only show on
dmesg, through sysfs.
This patch was some time in OpenWrt.
Signed-off-by: Bernhard Loos <bernhardloos@xxxxxxxxxxxxxx>
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 172c69a47675dc1ca9c7243c031d8d77701bccc0
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Sun Nov 28 10:39:35 2010 +0100
ssb: extract indexes for power tables
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Acked-by: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6d20e8406f0942228a73000663c2b33f488103ea
Author: Suresh Jayaraman <sjayaraman@xxxxxxx>
Date: Wed Dec 1 14:42:28 2010 +0530
cifs: add attribute cache timeout (actimeo) tunable
Currently, the attribute cache timeout for CIFS is hardcoded to 1 second. This
means that the client might have to issue a QPATHINFO/QFILEINFO call every 1
second to verify if something has changes, which seems too expensive. On the
other hand, if the timeout is hardcoded to a higher value, workloads that
expect strict cache coherency might see unexpected results.
Making attribute cache timeout as a tunable will allow us to make a tradeoff
between performance and cache metadata correctness depending on the
application/workload needs.
Add 'actimeo' tunable that can be used to tune the attribute cache timeout.
The default timeout is set to 1 second. Also, display actimeo option value in
/proc/mounts.
It appears to me that 'actimeo' and the proposed (but not yet merged)
'strictcache' option cannot coexist, so care must be taken that we reset the
other option if one of them is set.
Changes since last post:
- fix option parsing and handle possible values correcly
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 1953ecfc293911311f04d8c19f04d2249a30707b
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 11:28:28 2010 -0800
Staging: hv: rename the vmbus to "hyperv"
This changes the name of the bus in sysfs from "vmbus" to "hyperv" which
is the name it should show (vmbus is way to generic).
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 2 14:10:58 2010 -0500
Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames"
This reverts commit 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0.
"As far as I can tell, either of these patches breaks multiple VIF
scenarios. I'm not sure exactly why, but I had to revert this to
get any of my interfaces to associate."
-- Ben Greear <greearb@xxxxxxxxxxxxxxx>
http://marc.info/?l=linux-wireless&m=129123368719339&w=2
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f67e07eb3decd7840b621fba37fd600adfdf99f8
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Dec 1 19:07:47 2010 +0100
ath9k_hw: fix more bitfield related endian issues
A few LNA control related flags were also specified as a bitfields, however
for some strange reason they were written in big-endian order this time.
Fix this by using flags instead.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e702ba18f25887c76d26c8a85cc1706463c62e9a
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Dec 1 19:07:46 2010 +0100
ath9k_hw: fix endian issues with CTLs on AR9003
Parsing data using bitfields is messy, because it makes endian handling
much harder. AR9002 and earlier got it right, AR9003 got it wrong.
This might lead to either using too high or too low tx power values,
depending on frequency and eeprom settings.
Fix it by getting rid of the CTL related bitfields entirely and use
masks instead.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9306990a656d9cfd8bf3586938012729c1f2ea50
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Tue Nov 30 23:24:09 2010 -0800
ath9k: Fix bug in reading input gpio state for ar9003
The register which gives input gpio state is 0x404c for ar9003,
currently 0x4048 is wrongly used. This will disable RF and make
it unusable on some of AR9003.
Cc:stable@xxxxxxxxxx
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1937721f5637b53c794124cf4fd9edad0eb315ef
Merge: 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0 be93112accb42c5586a459683d71975cc70673ca
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Thu Dec 2 14:00:51 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
commit ae4694b2d3e4c0f47c0e804a68417be57e5daf85
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 2 10:59:22 2010 -0800
ipv6: Create inet6_csk_route_req().
Brother of ipv4's inet_csk_route_req().
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 15c054251ab84895ec043e90826612c1a3d6d4f1
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 2 10:16:06 2010 -0800
ipv6: Add rt6_get_peer() helper.
To go along side ipv4's rt_get_peer().
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a69a6691d71cc24979ce29394478218307a77a84
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 09:42:18 2010 -0800
Staging: hv: remove struct vmbus_driver
It's only a wrapper for the struct hv_driver structure, so just use that
instead, as there are no other fields left in it at the moment.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 98293a279cc0ff085ead7c032c6b8cb7b6ad7e88
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 09:16:04 2010 -0800
Staging: hv: remove OnChildDeviceAdd vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c
Merge: 8fed709f343346a77888c2eef8f2d41bc637bef6 c76febef574fd86566bbdf1a73a547a439115c25
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 09:13:36 2010 -0800
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: only run xfs_error_test if error injection is active
xfs: avoid moving stale inodes in the AIL
xfs: delayed alloc blocks beyond EOF are valid after writeback
xfs: push stale, pinned buffers on trylock failures
xfs: fix failed write truncation handling.
commit 21486af0f34d03b813b023d7a2b887b329f60486
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Fri Oct 8 18:11:19 2010 +0200
spi/pxa2xx: pass of_node to spi device and set a parent device
the of_node will auto-publish devices which are added to the device
tree.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
commit 579d3bb2ac1a351bbf536480a9ab38199bbf901d
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Mon Nov 22 17:12:17 2010 -0800
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
After all TX bytes are sent, the driver spins while the SPI core is busy
and then it spins for a "short" period of time until RX bytes are
available.
On Sodavile the busy flag disappears pretty quick and after that it
takes approx ~130ms (sometimes less but not much) until there are bytes
available in the RX FIFO.
This patch removes the busy loop and modifies the RX threshould so we
get woken up once the remainings bytes arrived.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 2a8626a9e2d86d114a2d9f813a1acebf9d53dd10
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Mon Nov 22 17:12:17 2010 -0800
spi/pxa2xx: Add chipselect support for Sodaville
The SPI core on Sodaville supports chip selects. Its configuration
moved into the SSSR register at bit 0 and 1. Thus Sodaville can be hooked
up with up to 4 devices.
This patch ensures that the bits which are otherwiese reserved are only
touched on Sodaville and not on any other PXAs. Also it makes sure that
the status register does not lose the CS information while clearing the
ROR bit.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 2d6e882bada0ca7828347647c5b1091bf5f18fee
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:50:58 2010 -0800
Staging: hv: remove GetChannelOffers vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Actually, that wrapper function only ever called vmbus_request_offers()
so just call that function instead, no need for a do-nothing
intermediate step here.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c722bd3e2cb92be7afec346894faa29605436c1a
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:47:11 2010 -0800
Staging: hv: remove OnEventDpc vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4a1494fc101b05f895ef52b9d01769d382c5a6e2
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:44:48 2010 -0800
Staging: hv: remove OnMsgDpc vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 097e310329fb69c928aa44b517a547e4a17658fd
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:41:05 2010 -0800
Staging: hv: remove OnIsr vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9f28ebc381ca00af0f9033a29776775068344b06
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Fri Nov 26 13:24:19 2010 -0800
iwlagn: name change for bt_ch_announce module parameter
Change the module parameter name to bt_ch_inhibition from
bt_ch_announce to better describe the functionality
In order to allow Bluetooth to activate a smart AFH mechanism
and to maximize its available bandwidth the WiFi will request
BT Core to inhibit its activity in channels that interfere
with WiFi activity (and vice versa) if bt_ch_inhibition is enabled
Set module parameter "bt_ch_inhibition=0" will disable the channel
inhibition function
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit adb90a00371a9a06a55c7b7ed7b38152f8e960c3
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Fri Nov 26 11:09:42 2010 -0800
iwlwifi: check for STATUS_EXIT_PENDING when send RXON command
If driver is on the way down, there is no need to send
RXON to uCode, check the condition before continuous the process.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 8b3ee29626031155c7844988ebe4321c151c03a2
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Thu Nov 18 11:41:48 2010 -0800
iwlagn: remove structure name reference to gen2
Give the corresponding name for .cfg data structure
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit e7cad69cdab4d6f0caadbcdd58b54214243ba98a
Author: Grumbach, Emmanuel <emmanuel.grumbach@xxxxxxxxx>
Date: Thu Nov 18 03:47:38 2010 -0800
iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded
PCI L1 Active needs to be disabled while loading the uCode so that the bus
doesn't go to sleep. The enablement of L1 Active should be done after
the uCode has sent the ALIVE response. The enablement of L1 Active was
missing.
Enabling L1 Active allows to save power if the BIOS / bus driver allows
it.
I measured the power consumption while not associated and
idle/associated:
L1 Active disabled: 39 mA = 130mW
L1 Active enabled: 6 mA = 20 mW
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 40b97c2fe96a476f1c228345f0c6a2d135a8b226
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 17 14:17:53 2010 -0800
iwlagn: fix race condition when reprogram sta
During reprogram stations, do not send link quality command.
uCode will crash if receive link quality command for invalid station
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 9d8bd71ad4f295f80450b5089d239c3135802699
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:34:45 2010 -0800
Staging: hv: remove OnChildDeviceRemove vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2ff38c9fbaa86264ad819117ab137361067ab5f1
Merge: c949e3d685b661412bfcd93d9c5956f125c1e060 af745bd724e304cc94a88a2fb43d53baffbd63a5
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 2 17:33:53 2010 +0100
Merge branch 'fix/asoc' into for-linus
commit af745bd724e304cc94a88a2fb43d53baffbd63a5
Merge: 2062ea522bb58bb2aeee86d051b37136491ccd65 0ffd22b694b739b3dc3f80bc93726b581e8e8af5
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 2 17:31:18 2010 +0100
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
commit 9205307cd88f09e51f2c4aeba79266317a299853
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:25:17 2010 -0800
Staging: hv: remove OnChildDeviceDestroy vmbus_driver callback
No one ever calls it so get rid of it, it's pointless.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 89733aa9cca016a542dc621d147a32d6b0fcdad5
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Dec 2 08:22:41 2010 -0800
Staging: hv: remove OnChildDeviceCreate vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c949e3d685b661412bfcd93d9c5956f125c1e060
Merge: 37fa84d8e647e584bf1b71bdff0330049e34f5ef 0defe09ca70daccdc83abd9c3c24cd89ae6a1141
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 2 17:14:50 2010 +0100
Merge branch 'fix/hda' into for-linus
commit 8fed709f343346a77888c2eef8f2d41bc637bef6
Merge: 53f517a1f61ce69bf67898891d5b14ffaada0003 06c63f9396133f312c5a49c2285c2c8015e80934
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 08:06:16 2010 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: fix kernel-doc for set_consumer_device_supply
regulator: enable supply regulator only when use count is zero
regulator: twl-regulator - fix twlreg_set_mode
regulator: lock supply in regulator enable
regulator: Return proper error for regulator_register()
regulator: Ensure enough delay time for enabling regulator
regulator: Remove a redundant device_remove_file call in create_regulator
regulator: Staticise mc13783_powermisc_rmw()
regulator: regulator disable supply fix
commit 53f517a1f61ce69bf67898891d5b14ffaada0003
Merge: 04ed0978d5ca5a3460a6f1f7443f8147a183669f 9a1f8b34aa539000da17a06235e4bec254d0bfb5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 08:05:56 2010 -0800
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions
[media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
commit 04ed0978d5ca5a3460a6f1f7443f8147a183669f
Merge: 8520eeaa1235ee78d32558b6a57e02b236c9e588 dfc5606dc51381186de765243bab340c8e021868
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 08:05:22 2010 -0800
Merge branch 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: replace the rbd sysfs interface
commit 8520eeaa1235ee78d32558b6a57e02b236c9e588
Merge: fb82155d5c401a5cf2bc2f555cb807f0bed035bb ba03864872691c0bb580a7fb47388da337ef4aa2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 2 08:04:21 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: fix parsing of hostname in dfs referrals
cifs: display fsc in /proc/mounts
cifs: enable fscache iff fsc mount option is used explicitly
cifs: allow fsc mount option only if CONFIG_CIFS_FSCACHE is set
cifs: Handle extended attribute name cifs_acl to generate cifs acl blob (try #4)
cifs: Misc. cleanup in cifsacl handling [try #4]
cifs: trivial comment fix for cifs_invalidate_mapping
[CIFS] fs/cifs/Kconfig: CIFS depends on CRYPTO_HMAC
cifs: don't take extra tlink reference in initiate_cifs_search
cifs: Percolate error up to the caller during get/set acls [try #4]
cifs: fix another memleak, in cifs_root_iget
cifs: fix potential use-after-free in cifs_oplock_break_put
commit e63233f75a1a6bfa97ffb52a20cc6801a4c63fb2
Author: John Reiser <jreiser@xxxxxxxxxxxx>
Date: Mon Nov 22 19:41:44 2010 -0800
ftrace: Have recordmcount honor endianness in fn_ELF_R_INFO
It looks to me like the change which introduced "virtual functions"
forgot about cross-platform endianness.
Thank you to Arnaud for supplying before+after data files do_mounts*.o.
This fixes a MIPS build failure triggered by recordmcount.
Reported-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Tested-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Acked-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Acked-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: John Reiser <jreiser@xxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit 11de3b11e08cac26d59e88efaf4e316701883552
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Wed Dec 1 14:17:06 2010 -0500
NFS: Fix a memory leak in nfs_readdir
We need to ensure that the entries in the nfs_cache_array get cleared
when the page is removed from the page cache. To do so, we use the
freepage address_space operation.
Change nfs_readdir_clear_array to use kmap_atomic(), so that the
function can be safely called from all contexts.
Finally, modify the cache_page_release helper to call
nfs_readdir_clear_array directly, when dealing with an anonymous
page from 'uncached_readdir'.
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 6072d13c429373c5d63b69dadbbef40a9b035552
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 13:35:19 2010 -0500
Call the filesystem back whenever a page is removed from the page cache
NFS needs to be able to release objects that are stored in the page
cache once the page itself is no longer visible from the page cache.
This patch adds a callback to the address space operations that allows
filesystems to perform page cleanups once the page has been removed
from the page cache.
Original patch by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
[trondmy: cover the cases of invalidate_inode_pages2() and
truncate_inode_pages()]
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 676dac4b1bee0469d6932f698aeb77e8489f5861
Author: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Date: Thu Dec 2 06:43:39 2010 -0800
This patch adds a new security attribute to Smack called
SMACK64EXEC. It defines label that is used while task is
running.
Exception: in smack_task_wait() child task is checked
for write access to parent task using label inherited
from the task that forked it.
Fixed issues from previous submit:
- SMACK64EXEC was not read when SMACK64 was not set.
- inode security blob was not updated after setting
SMACK64EXEC
- inode security blob was not updated when removing
SMACK64EXEC
commit 512b109ec9620d037d6d2f6bd1bae9ce34dd6779
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Date: Wed Dec 1 14:51:44 2010 +0000
xen: unplug the emulated devices at resume time
Early after being resumed we need to unplug again the emulated devices.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
commit 9a069c33c53c2e72ec1b76106be73df044af0195
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Date: Wed Dec 1 14:51:44 2010 +0000
xen: fix save/restore for PV on HVM guests with pirq remapping
Re-map and re-bind all the pirqs at resume time.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
commit 6411fe69b8c4fd7811339c88c1843d562099fa2b
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Date: Wed Dec 1 14:51:44 2010 +0000
xen: resume the pv console for hvm guests too
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
commit 15664125f7cadcb6d725cb2d9b90f9715397848d
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Wed Nov 24 10:43:55 2010 +0100
scripts/tags.sh: Add magic for trace-events
Make tags find the trace-event definitions
Acked-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290591835.2072.438.camel@laptop>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit af42b8d12f8adec6711cb824549a0edac6a4ae8f
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Date: Wed Dec 1 14:51:44 2010 +0000
xen: fix MSI setup and teardown for PV on HVM guests
When remapping MSIs into pirqs for PV on HVM guests, qemu is responsible
for doing the actual mapping and unmapping.
We only give qemu the desired pirq number when we ask to do the mapping
the first time, after that we should be reading back the pirq number
from qemu every time we want to re-enable the MSI.
This fixes a bug in xen_hvm_setup_msi_irqs that manifests itself when
trying to enable the same MSI for the second time: the old MSI to pirq
mapping is still valid at this point but xen_hvm_setup_msi_irqs would
try to assign a new pirq anyway.
A simple way to reproduce this bug is to assign an MSI capable network
card to a PV on HVM guest, if the user brings down the corresponding
ethernet interface and up again, Linux would fail to enable MSIs on the
device.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
commit e5fc7345412d5e4758fcef55a74354c5cbefd61e
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Date: Wed Dec 1 14:51:44 2010 +0000
xen: use PHYSDEVOP_get_free_pirq to implement find_unbound_pirq
Use the new hypercall PHYSDEVOP_get_free_pirq to ask Xen to allocate a
pirq. Remove the unsupported PHYSDEVOP_get_nr_pirqs hypercall to get the
amount of pirq available.
This fixes find_unbound_pirq that otherwise would return a number
starting from nr_irqs that might very well be out of range in Xen.
The symptom of this bug is that when you passthrough an MSI capable pci
device to a PV on HVM guest, Linux would fail to enable MSIs on the
device.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
commit 1036dc169f4cc6e5b753b1596d285d1cc3311a23
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Mon Nov 29 12:05:53 2010 +0200
wl12xx: Remove 11j channels from the supported channels list.
Because we don't support them at this stage.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 870c367cf829466f315de785ac613dd94eff5c50
Author: Roger Quadros <roger.quadros@xxxxxxxxx>
Date: Mon Nov 29 16:24:57 2010 +0200
wl1271: Add wl1271_load_firmware() and export some functions
For the SDIO testing module we need to load the firmware but not
boot it. wl1271_load_firmware() is meant to do just the firmware loading part.
We also export some functions so they are usable in the testing module.
Signed-off-by: Roger Quadros <roger.quadros@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 43a598d5e40485fcfbebe0700077e83afd803ed5
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date: Tue Nov 30 14:58:46 2010 +0200
wl12xx: fix illegal memset if debugfs is not enabled
If we try to reset the debugfs statistics when debugfs is not configured in
the kernel, we're memset an illegal pointer, because it has never been
allocated. So check whether we have debugfs enabled by looking into the
wl->rootdir before trying to reset the fw_stats struct.
Reported-by: Joerie de Gram <j.de.gram@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit d60080ae06b98790036104f07fa897cfc151ce12
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed Nov 24 12:53:16 2010 +0200
wl1271: move wl12xx debugfs directory to under wiphy's debugfs
Use per-device debugfs path, so multiple devices won't collide.
in order to use wl->hw->wiphy->debugfsdir, we have to move the debugfs
creation from wl1271_debugfs_init() to wl1271_register_hw().
Reported-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 7cb2cea9f0f207f819db9823413fa263175b6230
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed Nov 24 12:53:15 2010 +0200
wl1271: use debugfs_remove_recursive
Documentation/filesystems/debugfs.txt:
"""
Once upon a time, debugfs users were required to remember the dentry pointer
for every debugfs file they created so that all files could be cleaned up.
We live in more civilized times now, though, and debugfs users can call:
void debugfs_remove_recursive(struct dentry *dentry);
"""
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 4fc3680894ff5739e7474b6633e962bfbdf0d3d8
Author: Wim Van Sebroeck <wim@xxxxxxxxx>
Date: Thu Dec 2 14:03:29 2010 +0000
watchdog: it8712f_wdt: add note to Kconfig
On some motherboards the it8712f watchdog does not work unless
the game port was enabled. see Bug 13140. We therefor add a note
to Kconfig.
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
commit f6e0722fc3a35ff818c86ffbc414f7592a8119cf
Author: Wolfram Sang & Martyn Welch <w.sang@xxxxxxxxxxxxxx, martyn.welch@xxxxxx>
Date: Thu Dec 2 00:11:16 2010 +0100
watchdog: gef_wdt: include fs.h
Add missing include "linux/fs.h".
This fixes compile failure.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
commit e6c3b699b2f6fcba7036c079b6f16bf9556c7f0d
Author: Wim Van Sebroeck <wim@xxxxxxxxx>
Date: Sat Oct 23 20:59:42 2010 +0000
watchdog: bcm63xx_wdt: improve platform part.
* fix devinit and devexit sections
* fix platform removal code so that the iounmap happens after the removal of the timer.
* changes the reboot_notifier by a platform shutdown method.
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
commit c54fb811745967732bc9e31d837e0c9925e12b4b
Author: Seth Heasley <seth.heasley@xxxxxxxxx>
Date: Wed Nov 17 12:15:08 2010 -0700
watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH
This patch adds an additional LPC Controller DeviceID for the Intel Patsburg PCH for TCO Watchdog.
Signed-off-by: Seth Heasley <seth.heasley@xxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
commit 43f901fbc8ba94bfa8d58155ba9378d7a13af636
Author: Thomas Chou <thomas@xxxxxxxxxxxxx>
Date: Wed Oct 6 15:13:53 2010 +0800
gen_init_cpio: remove leading `/' from file names
When we extracted the generated cpio archive using "cpio -id" command,
it complained,
cpio: Removing leading `/' from member names
var/run
cpio: Removing leading `/' from member names
var/lib
cpio: Removing leading `/' from member names
var/lib/misc
It is worse with the latest "cpio" or "pax", which tries to overwrite
the host file system with the leading '/'.
So the leading '/' of file names should be removed. This is consistent
with the initramfs come with major distributions such as Fedora or
Debian, etc.
Signed-off-by: Thomas Chou <thomas@xxxxxxxxxxxxx>
Acked-by: Mike Frysinger<vapier@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 0a18a9386c056028799938960f91be338c4ff349
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 4 10:24:16 2010 +0100
tags: put function prototypes back!
Commit 7db86dc (ctags: usability fix) removed function prototypes from
tags file claiming "It makes no real sense to include function
prototypes".
But it is useful for quickly determining which header file developer
needs to include to fix compilation.
Now if someone wants to remove forward declarations (which I agree are
baggage), write a postprocessing script.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit ff0fba0bca4182e022c0a2ac0f3e63508e86e9f1
Author: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Date: Fri Oct 22 20:10:58 2010 -0500
OMAP: mailbox: fix detection for previously supported chips
Fix the mailbox detection for OMAP3630 and 2430, also minor
cleanup on conditional ifdef's that could affect it.
Given that 2430 has an iva too, include it, as the same steps
for omap3 apply.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Acked-by: Hiroshi Doyu <hiroshi.doyu@xxxxxxxxx>
commit 5d783731c683161d5d921c2ed03a43d6d31cf418
Author: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Date: Wed Dec 1 14:15:08 2010 -0600
OMAP: mailbox: remove unreachable return
Remove unreachable return statement.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx>
Acked-by: Benoit Cousson <b-cousson@xxxxxx>
Acked-by: Hiroshi Doyu <hiroshi.doyu@xxxxxxxxx>
commit 582563074a691eb45cb22d2eca70eed8f2091c5f
Author: Kanigeri, Hari <h-kanigeri2@xxxxxx>
Date: Mon Nov 29 20:24:14 2010 +0000
OMAP: mailbox: add notification support for multiple readers
In the current mailbox driver, the mailbox internal pointer for
callback can be directly manipulated by the Users, so a second
User can easily corrupt the first user's callback pointer.
The initial effort to correct this issue can be referred here:
https://patchwork.kernel.org/patch/107520/
Along with fixing the above stated issue, this patch adds the
flexibility option to register notifications from
multiple readers to the events received on a mailbox instance.
The discussion regarding this can be referred here.
http://www.mail-archive.com/linux-omap@xxxxxxxxxxxxxxx/msg30671.html
Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx>
Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx>
Acked-by: Hiroshi Doyu <hiroshi.doyu@xxxxxxxxx>
commit a42743c26a53a2a5f2b2018a9659ab3fb604d5bc
Author: Kanigeri, Hari <h-kanigeri2@xxxxxx>
Date: Mon Nov 29 20:24:13 2010 +0000
OMAP: mailbox: send message in process context
Schedule the Tasklet to send only when mailbox fifo is full and there are
pending messages in kfifo, else send the message directly in the Process
context. This would avoid needless scheduling of Tasklet for every message
transfer
Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx>
Acked-by: Hiroshi Doyu <hiroshi.doyu@xxxxxxxxx>
commit ab66ac3007cb3e59fe80dfcf36aff243d3008cb9
Author: Kanigeri, Hari <h-kanigeri2@xxxxxx>
Date: Mon Nov 29 20:24:12 2010 +0000
OMAP: mailbox: fix checkpatch warnings
Fix the following checkpatch warnings observed in mailbox module.
WARNING: please, no space for starting a line,
excluding comments
+ fail_alloc_rxq:$
WARNING: please, no space for starting a line,
excluding comments
+ fail_alloc_txq:$
WARNING: please, no space for starting a line,
excluding comments
+ fail_request_irq:$
WARNING: line over 80 characters
+ mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size, sizeof(mbox_msg_t));
Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx>
Acked-by: Hiroshi Doyu <hiroshi.doyu@xxxxxxxxx>
commit d2295042b783c2b17d93cd5ab786bbfd4f2f5c90
Author: Fernando Guzman Lugo <x0095840@xxxxxx>
Date: Mon Nov 29 20:24:11 2010 +0000
OMAP: mailbox: change full flag per mailbox queue instead of global
The variable rq_full flag is a global variable, so if there are multiple
mailbox users there will be conflicts. Now there is a full flag per
mailbox queue.
Reported-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Signed-off-by: Fernando Guzman Lugo <x0095840@xxxxxx>
Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx>
Acked-by: Hiroshi Doyu <hiroshi.doyu@xxxxxxxxx>
commit 0ffd22b694b739b3dc3f80bc93726b581e8e8af5
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Wed Dec 1 11:01:20 2010 +0200
ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
Not all omap boards use kernel based pin multiplexing so
CONFIG_SND_OMAP_SOC_N810 should not select it by default as it can make
harm to other boards in multi-board kernels.
Therefore put CONFIG_OMAP_MUX as a dependency to N810 ASoC machine driver.
Thanks to Tony Lindgren <tony@xxxxxxxxxxx> for noticing.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit a44a11e9a049b491445bfbd93969d23c49047714
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Thu Nov 4 00:16:08 2010 -0400
kconfig: the day kconfig warns about "select"-abuse has come
CC: catalin.marinas@xxxxxxx
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 83ed79c561da20019cb24944f535530d73b2d615
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Dec 2 11:49:06 2010 +0100
HID: length resolution should be reported units/mm
Input ABI requires reporting resolution on main axes in units per
millimeter, not units per inch, so we need to convert accordingly.
Tested-by: Nikolai Kondrashov <spbnick@xxxxxxxxx>
Acked-by: Nikolai Kondrashov <spbnick@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit e4b546a3643fbfc510d5ef7db538e4d3ab00effb
Merge: b3d006c0e745bfd2dab4984ffe3279d5cf4e926a d7470b6afca85ed4388fff57fc9d89f5a3be02ff
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 2 11:20:11 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 0defe09ca70daccdc83abd9c3c24cd89ae6a1141
Author: Daniel T Chen <crimsun@xxxxxxxxxx>
Date: Wed Dec 1 19:16:07 2010 -0500
ALSA: hda: Use "alienware" model quirk for another SSID
BugLink: https://launchpad.net/bugs/683695
The original reporter states that headphone jacks do not appear to
work. Upon inspecting his codec dump, and upon further testing, it is
confirmed that the "alienware" model quirk is correct.
Reported-and-tested-by: Cody Thierauf
Cc: <stable@xxxxxxxxxx> [2.6.32+]
Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 56b9aea3b740be7665be100872a913da9bdc653b
Author: Len Brown <len.brown@xxxxxxxxx>
Date: Thu Dec 2 01:19:32 2010 -0500
intel_idle: recognize ARAT on WSM-EX
We erroneously ignored the Always Running APIC Timer on WSM-EX.
Move the check for ARAT down so that it can apply to any/all models.
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit a757ee2216211278680dd8ac869aabe7b4a9970d
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Thu Dec 2 01:57:03 2010 -0200
[media] Don't export format_by_forcc on two different drivers
Drivers should append their name on exported symbols, to avoid
conflicts with allyesconfig:
drivers/staging/built-in.o: In function `format_by_fourcc':
/home/v4l/work_trees/linus/drivers/staging/cx25821/cx25821-video.c:96: multiple definition of `format_by_fourcc'
drivers/media/built-in.o:/home/v4l/work_trees/linus/drivers/media/common/saa7146_video.c:88: first defined here
Let's rename both occurences with a small shellscript:
for i in drivers/staging/cx25821/*.[ch]; do sed s,format_by_fourcc,cx25821_format_by_fourcc,g <$i >a && mv a $i; done
for i in drivers/media/common/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done
for i in include/media/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ccb7c410ddc054b8c1ae780319bc98ae092d3854
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 1 18:09:13 2010 -0800
timewait_sock: Create and use getpeer op.
The only thing AF-specific about remembering the timestamp
for a time-wait TCP socket is getting the peer.
Abstract that behind a new timewait_sock_ops vector.
Support for real IPV6 sockets is not filled in yet, but
curiously this makes timewait recycling start to work
for v4-mapped ipv6 sockets.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4399ce402c7c837dec80bf9fb40d079b39b9265a
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 1 17:29:08 2010 -0800
inetpeer: Fix incorrect comment about inetpeer struct size.
Now with ipv6 support it is no longer less than 64 bytes.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8790ca172a1550949804a2ad59ccea310f680c9f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Dec 1 17:28:18 2010 -0800
inetpeer: Kill use of inet_peer_address_t typedef.
They are verboten these days.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7adce751ce79bcb6d0a591e6b94d76631c9a232c
Merge: 91a4d157d0c18bd18fd95f90b67cb10d11701cca 21d606090ec1aacc998276f5af34c43a88f01218 e3d33cb13202cd51378c8d61e92a96183cc0e6fd
Author: Roland Dreier <rolandd@xxxxxxxxx>
Date: Wed Dec 1 16:33:47 2010 -0800
Merge branches 'misc', 'mlx4' and 'nes' into for-next
commit 91a4d157d0c18bd18fd95f90b67cb10d11701cca
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Sun Nov 14 09:22:52 2010 +0000
IB: Fix information leak in marshalling code
ib_ucm_init_qp_attr() and ucma_init_qp_attr() pass struct ib_uverbs_qp_attr
with reserved, qp_state, {ah_attr,alt_ah_attr}{reserved,->grh.reserved}
fields uninitialized to copy_to_user(). This leads to leaking of
contents of kernel stack memory to userspace.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit f55864a4f435e47ad413be7016f38877b096bb5b
Author: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
Date: Mon Nov 29 07:20:50 2010 +0000
IB/pack: Remove some unused code added by the IBoE patches
Remove unused functions added by commit ff7f5aab354d ("IB/pack: IBoE UD
packet packing support").
Signed-off-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
commit 21d606090ec1aacc998276f5af34c43a88f01218
Author: Eli Cohen <eli@xxxxxxxxxxxxxxxxxx>
Date: Thu Nov 11 21:05:58 2010 +0000
IB/mlx4: Fix IBoE link state
Use netif_running() and netif_carrier_ok() to report link state,
exactly as is done to report Ethernet link state in sysfs.
Signed-off-by: Eli Cohen <eli@xxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 328266c561153a0c19084088d5dacd40632dc7ae
Author: Eli Cohen <eli@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 14:04:39 2010 +0000
IB/mlx4: Fix IBoE reported link rate
The link rate is the product of the link speed in the link width. For
Etherent ports the rate is 10G, so we use 1 for the width and 4 for
speed to get the correct rate.
Signed-off-by: Eli Cohen <eli@xxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 58d74bb1d9f79bb56b2ea51d2ca06a28fa0fce02
Author: Eli Cohen <eli@xxxxxxxxxxxxxxxxxx>
Date: Wed Nov 10 12:52:37 2010 +0000
mlx4_core: Workaround firmware bug in query dev cap
ConnectX firmware is supposed to report the number blue flame
registers per page as log2 of the value. However, due to a firmware
bug, it reports actual number. This patch works around this by
checking if the number of registers calculated fits within a page. If
it does not, we use 8 registers per page.
Signed-off-by: Eli Cohen <eli@xxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit dfc5606dc51381186de765243bab340c8e021868
Author: Yehuda Sadeh <yehuda@xxxxxxxxxxxxxxx>
Date: Fri Nov 19 14:51:04 2010 -0800
rbd: replace the rbd sysfs interface
The new interface creates directories per mapped image
and under each it creates a subdir per available snapshot.
This allows keeping a cleaner interface within the sysfs
guidelines. The ABI documentation was updated too.
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Yehuda Sadeh <yehuda@xxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit be21871f24b0fcd8d0d09c8090385c9cec80efa3
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Dec 1 16:58:26 2010 +0200
Bluetooth: clean up legal text
Remove extra spaces from legal text so that legal stuff looks
the same for all bluetooth code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 70f23020e6d89155504b5b39f22505f4aec6fa6f
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Dec 1 16:58:25 2010 +0200
Bluetooth: clean up hci code
Do not use assignment in IF condition, remove extra spaces,
fixing typos, simplify code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 894718a6be69d8cfd191dc291b42be32a1e4851b
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Dec 1 16:58:24 2010 +0200
Bluetooth: clean up l2cap code
Do not initialize static vars to zero, macros with complex values
shall be enclosed with (), remove unneeded braces.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 285b4e90318dcf421a00b2ac3fe8ab713f3281e3
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Dec 1 16:58:23 2010 +0200
Bluetooth: clean up rfcomm code
Remove extra spaces, assignments in if statement, zeroing static
variables, extra braces. Fix includes.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 735cbc4784a084b7a76c43c69f9dba683bb3b48b
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Dec 1 16:58:22 2010 +0200
Bluetooth: clean up sco code
Do not use assignments in IF condition, remove extra spaces
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit b78d7b4f204a6ba1901af36c95e10fded9816054
Author: Anderson Lizardo <anderson.lizardo@xxxxxxxxxxxxx>
Date: Mon Nov 29 12:15:50 2010 -0400
Bluetooth: Fix error handling for l2cap_init()
create_singlethread_workqueue() may fail with errors such as -ENOMEM. If
this happens, the return value is not set to a negative value and the
module load will succeed. It will then crash on module unload because of
a destroy_workqueue() call on a NULL pointer.
Additionally, the _busy_wq workqueue is not being destroyed if any
errors happen on l2cap_init().
Signed-off-by: Anderson Lizardo <anderson.lizardo@xxxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit eeb366564be7c311b31c70821d18a43a8a57f9bc
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date: Mon Nov 1 18:43:53 2010 +0000
Bluetooth: Get rid of __rfcomm_get_sock_by_channel()
rfcomm_get_sock_by_channel() was the only user of this function, so I merged
both into rfcomm_get_sock_by_channel(). The socket lock now should be hold
outside of rfcomm_get_sock_by_channel() once we hold and release it inside the
same function now.
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit e0f0cb56364958223f0cb1f1b0b0eecf1b8dcb95
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date: Mon Nov 1 18:43:53 2010 +0000
Bluetooth: Get rid of __l2cap_get_sock_by_psm()
l2cap_get_sock_by_psm() was the only user of this function, so I merged
both into l2cap_get_sock_by_psm(). The socket lock now should be hold
outside of l2cap_get_sock_by_psm() once we hold and release it inside the
same function now.
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit cc11b9c14da4ca1c545b424dae2ae8fb1ab04063
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Mon Nov 22 13:21:37 2010 +0200
Bluetooth: do not use assignment in if condition
Fix checkpatch errors like:
"ERROR: do not use assignment in if condition"
Simplify code and fix one long line.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Acked-by: Ville Tervo <ville.tervo@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 940a9eea80946b64b96bd8af1fc71b30c602d057
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Nov 3 12:32:45 2010 +0200
Bluetooth: timer check sk is not owned before freeing
In timer context we might delete l2cap channel used by krfcommd.
The check makes sure that sk is not owned. If sk is owned we
restart timer for HZ/5.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit a49184c229535ebedbb659214db2d4d1d77b7c07
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Wed Nov 3 12:32:44 2010 +0200
Bluetooth: Check sk is not owned before freeing l2cap_conn
Check that socket sk is not locked in user process before removing
l2cap connection handler.
lock_sock and release_sock do not hold a normal spinlock directly but
instead hold the owner field. This means bh_lock_sock can still execute
even if the socket is "locked". More info can be found here:
http://www.linuxfoundation.org/collaborate/workgroups/networking/socketlocks
krfcommd kernel thread may be preempted with l2cap tasklet which remove
l2cap_conn structure. If krfcommd is in process of sending of RFCOMM reply
(like "RFCOMM UA" reply to "RFCOMM DISC") then kernel crash happens.
...
[ 694.175933] Unable to handle kernel NULL pointer dereference at virtual address 00000000
[ 694.184936] pgd = c0004000
[ 694.187683] [00000000] *pgd=00000000
[ 694.191711] Internal error: Oops: 5 [#1] PREEMPT
[ 694.196350] last sysfs file: /sys/devices/platform/hci_h4p/firmware/hci_h4p/loading
[ 694.260375] CPU: 0 Not tainted (2.6.32.10 #1)
[ 694.265106] PC is at l2cap_sock_sendmsg+0x43c/0x73c [l2cap]
[ 694.270721] LR is at 0xd7017303
...
[ 694.525085] Backtrace:
[ 694.527587] [<bf266be0>] (l2cap_sock_sendmsg+0x0/0x73c [l2cap]) from [<c02f2cc8>] (sock_sendmsg+0xb8/0xd8)
[ 694.537292] [<c02f2c10>] (sock_sendmsg+0x0/0xd8) from [<c02f3044>] (kernel_sendmsg+0x48/0x80)
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit d31dbf6e5989b2fd9a30ec5b25436e94f009d6df
Author: Vasiliy Kulikov <segooon@xxxxxxxxx>
Date: Sat Oct 30 18:26:31 2010 +0400
Bluetooth: hidp: fix information leak to userland
Structure hidp_conninfo is copied to userland with version, product,
vendor and name fields unitialized if both session->input and session->hid
are NULL. It leads to leaking of contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 3185fbd9d7bb166992f072440b3329f58bf2c60a
Author: Vasiliy Kulikov <segooon@xxxxxxxxx>
Date: Sat Oct 30 18:26:26 2010 +0400
Bluetooth: cmtp: fix information leak to userland
Structure cmtp_conninfo is copied to userland with some padding fields
unitialized. It leads to leaking of contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 5520d20f68310fc158dcbbecfd5eac5cdfc5a241
Author: Vasiliy Kulikov <segooon@xxxxxxxxx>
Date: Sat Oct 30 18:26:21 2010 +0400
Bluetooth: bnep: fix information leak to userland
Structure bnep_conninfo is copied to userland with the field "device"
that has the last elements unitialized. It leads to leaking of
contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon@xxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 127178d24c7eb2df53b1ba2b6f6f743e88178a1b
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Thu Nov 18 22:22:29 2010 +0200
Bluetooth: Automate remote name requests
In Bluetooth there are no automatic updates of remote device names when
they get changed on the remote side. Instead, it is a good idea to do a
manual name request when a new connection gets created (for whatever
reason) since at this point it is very cheap (no costly baseband
connection creation needed just for the sake of the name request).
So far userspace has been responsible for this extra name request but
tighter control is needed in order not to flood Bluetooth controllers
with two many commands during connection creation. It has been shown
that some controllers simply fail to function correctly if they get too
many (almost) simultaneous commands during connection creation. The
simplest way to acheive better control of these commands is to move
their sending completely to the kernel side.
This patch inserts name requests into the sequence of events that the
kernel performs during connection creation. It does this after the
remote features have been successfully requested and before any pending
authentication requests are performed. The code will work sub-optimally
with userspace versions that still do the name requesting themselves (it
shouldn't break anything though) so it is recommended to combine this
with a userspace software version that doesn't have automated name
requests.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 392599b95d76f4f3102d8614bdc1957795cd1a3a
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Thu Nov 18 22:22:28 2010 +0200
Bluetooth: Create a unified authentication request function
This patch adds a single function that's responsible for requesting
authentication for outgoing connections. This is preparation for the
next patch which will add automated name requests and thereby move the
authentication requests to a different location.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit ccd556fe334914bf2e465eb5bc480d49cd4406d7
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Wed Nov 10 17:11:51 2010 +0200
Bluetooth: Simplify remote features callback function logic
The current remote and remote extended features event callbacks logic
can be made simpler by using a label and goto statements instead of the
current multiple levels of nested if statements.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 17f490bcedd7b6677140b2d49efe9e9e6b84de60
Merge: 61790c5f3c5f158821821a00797d94504531839f be93112accb42c5586a459683d71975cc70673ca
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date: Wed Dec 1 21:04:09 2010 -0200
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
commit 2cb22a7a5624603b9db3571fc65489f5389b512c
Author: Roland Vossen <rvossen@xxxxxxxxxxxx>
Date: Wed Dec 1 21:37:34 2010 +0100
staging: brcm80211: replaced typedef struct wl_info_t by struct wl_info.
Part of the code cleanup effort. CodingStyle doc advises to restrict the usage
of typedefs. Also moved several function declarations from .c to .h file
because this typedef replace operation induced checkpatch.pl warnings.
Signed-off-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 01d11441fd7ede922e10008986ecdb0a84256bc5
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Wed Dec 1 11:16:35 2010 -0800
staging: brcm80211 needs lots of delay.h
Fix lots of errors like:
drivers/staging/brcm80211/phy/wlc_phy_n.c:17613: error: implicit declaration of function 'mdelay'
drivers/staging/brcm80211/util/nicpci.c:246: error: implicit declaration of function 'udelay'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Cc: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Cc: Dowan Kim <dowan@xxxxxxxxxxxx>
Cc: Roland Vossen <rvossen@xxxxxxxxxxxx>
Cc: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a043b26646444eba28e5010965dbf61bc3ba5277
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 30 20:32:51 2010 -0800
staging: brcm80211: bcmp => memcmp
s/bcmp/memcmp/
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9249ede9d4d9dbf41ab6545a7a43fd5f6e5aa620
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 30 20:09:49 2010 -0800
staging: brcm80211: bzero => memset
s/bzero/memset/g
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c10407ac459577f6b58f3db0777b6d0d53a3be9f
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 30 17:35:09 2010 -0800
staging: brcm80211: remove OSL_SYSUPTIME_SUPPORT
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c53d201371bf45cdb5b843ade52edd8903bb72f6
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 30 15:22:15 2010 -0800
staging: brcm80211: Remove bogus gcc version checking
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f5343314f62ba392ec069210ae342bc32c4ce367
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 30 15:22:14 2010 -0800
staging: brcm80211: Remove unused PKTFREESETCB
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 30 15:22:13 2010 -0800
staging: brcm80211: Remove OSL_DMADDRWIDTH
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b834517572d19d34c9cd9adb878aec3138db9224
Author: David Chosrova <david.chosrova@xxxxxxxxxxxxxx>
Date: Wed Dec 1 13:42:16 2010 +0100
Staging: rtl8192u: check return code kmalloc.
This patch checks the return code of kmalloc when trying to allocate
memory for priv->rx_urb in rtl8192_usb_initendpoints(), return -ENOMEM
when failed.
Signed-off-by: David Chosrova <david.chosrova@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8c66be9203d891ea37346a78925f0e6534b98bd3
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Wed Dec 1 17:34:39 2010 +0100
staging: iio: dds: ad9832: Fix kconfig description
The AD9832 driver doesn't support the AD9833 and AD9834
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0e7a3e7a746b5dc6ccf9896e882441c4fdbfd09a
Author: David Chosrova <dada2372@xxxxxxxxx>
Date: Mon Nov 29 21:50:48 2010 +0100
Staging: rtl8192u: remove dead code to disable dot11d
This patch removes all the ENABLE_DOT11D ifdefs.
It is always defined for driver. DOT11D has to do with regulatory domains.
What prompted this patch was a warning message in Sparse.
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr"
redefined in file included from drivers/staging/rtl8192u/:81:81:
drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location
of the previous definition
Now there are no ifdefs around dot11d.h it made no sense to have this
second definition, so I removed that macro as well. ( Thanks Dan ;-) ).
Acked-by. Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: David Chosrova <dada2372@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2894c6cd0ea84c30fc028ba92f8e61fbe7971e65
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:08 2010 +0200
Staging: w35und: Kill struct wb_usb
This patch kills struct wb_usb which now only contains a pointer to struct
usb_device.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9be98819d31c4e105ad028ee092d27a46a9e298a
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:07 2010 +0200
Staging: w35und: Remove unused fields from struct wb_usb
This patch removes two unused fields from struct wb_usb:
- DetectCount which is always zero
- IsUsb20 which is a write-only struct member
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4398954e5f91e340f5a2db53d219b6562e3e1bf0
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:06 2010 +0200
Staging: w35und: Kill wblinux_f.h header
The wblinux_f.h header file doesn't contain anything that's actually used. Kill
it.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 01b5ceeca5aa45735a987420c83228a9778a791f
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:05 2010 +0200
Staging: w35und: Merge mlmetxrx.c to mds.c
This patch merges mlmetxrx.c to mds.c because it's small and the functions are
only used in mto.c.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 37b0544a4a455609cbf25fa56441a6f1221dec85
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:04 2010 +0200
Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_
This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never
defined.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9618386a4e58e0459932846d9b07fa81225840d3
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:03 2010 +0200
Staging: w35und: Kill write-only ->TxToggle
This patch removes ->TxToggle from struct wb35_mds because it's a write only struct member.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9255650cbf997762bd667896b0b86661cd81c9b4
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:02 2010 +0200
Staging: w35und: Kill Vendor2 ifdef from hal_init_hardware
The Vendor2 macro is never defined so remove the ifdef'd block from
hal_init_hardware().
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:01 2010 +0200
Staging: w35und: Remove empty sysdef.h header
The sysdef.h header is empty now so kill it.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2855bb79d75ad1419b1f54008f861a39517acfd5
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 23:00:00 2010 +0200
Staging: w35und: Use pr_debug() for debugging
Use pr_debug() for debugging printk's and kill the FULL_DEBUG macro. It would
be even better to use dev_dbg() but unfortunately looking up struct device in
the current code structure makes things very ugly.
Please note that I dropped the DataDmp() calls from
RFSynthesizer_SwitchingChannel() because that function doesn't exist.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a4170e3dddc5eb88d23dd5f6e7c9cdefc244001e
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 22:59:59 2010 +0200
Staging: w35und: Kill unused code in mac_structures.h
This patch kills tons of unused macros and struct definitions from
mac_structures.h.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c84fa49f61798b6248cef56876f1643db3b7b2f3
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 22:59:58 2010 +0200
Staging: w35und: Kill WPA2 definitions
The _WPA2_ macro is always defined but the data structures that are wrapped by
it are never used. Kill them.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1140bd9f30f4d6dac6b53365a70819ecd4cc8c54
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 22:59:57 2010 +0200
Staging: w35und: Kill _USE_FALLBACK_RATE_ macro
The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only
used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined
because the reg.c file includes sysdef.h at the top. It's therefore safe to
remove the _USE_FALLBACK_RATE_ macro.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ac5435b9800f313bdcd6a43444ceb1d89f241a5e
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Sun Nov 28 22:59:56 2010 +0200
Staging: w35und: Remove unused defines from sysdef.h
This patch removes all the defines in sysdef.h that are not used at all.
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a5b10629edfa521071ccdb3b1e0e7fb350a044db
Author: Herb Shiu <herb_shiu@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 13:58:29 2010 -0800
ceph: Behave better when handling file lock replies.
Fill in the local lock with response data if appropriate,
and don't call posix_lock_file when reading locks.
Signed-off-by: Herb Shiu <herb_shiu@xxxxxxxxxxxxxxxxxxx>
Acked-by: Greg Farnum <gregf@xxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit 637ae8d547390df75bad42a7e9cb65e625119767
Author: Herb Shiu <herb_shiu@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 13:42:23 2010 -0800
ceph: pass lock information by struct file_lock instead of as individual params.
Signed-off-by: Herb Shiu <herb_shiu@xxxxxxxxxxxxxxxxxxx>
Acked-by: Greg Farnum <gregf@xxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit 25933abdd8c562182ca6dc9f8c4c2cc8265c3a80
Author: Herb Shiu <herb_shiu@xxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 14:14:38 2010 -0800
ceph: Handle file locks in replies from the MDS.
Previously the kernel client incorrectly assumed everything was a directory.
Signed-off-by: Herb Shiu <herb_shiu@xxxxxxxxxxxxxxxxxxx>
Acked-by: Greg Farnum <gregf@xxxxxxxxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit 884ea892763d4dfba509743f65961c782c0442db
Author: Sage Weil <sage@xxxxxxxxxxxx>
Date: Mon Nov 22 22:58:06 2010 -0800
ceph: avoid possible null deref in readdir after dir llseek
last may be NULL, but we dereference it in the else branch without
checking. Normally it doesn't trigger because last == NULL when fpos == 2,
but it could happen on a newly opened dir if the user seeks forward.
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
commit 673eb9ff33e26ee6f4278cdab06749aef1bbef5b
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 16:54:56 2010 -0300
[media] uvcvideo: Convert to unlocked_ioctl
The uvcvideo driver now locks all ioctls correctly on its own, the BKL
isn't needed anymore.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 6947756dfcecc493062a46e77f6bf51dddb5be75
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 13:36:34 2010 -0300
[media] uvcvideo: Lock stream mutex when accessing format-related information
The stream mutex protects access to the struct uvc_streaming ctrl,
cur_format and cur_frame fields as well as to the hardware probe
control. Lock it appropriately.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4aa275975beee41fd542a0f6df8cd0fee06089bf
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 15:18:08 2010 -0300
[media] uvcvideo: Move mmap() handler to uvc_queue.c
The mmap() implementation belongs to the video buffers queue, move it
there.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 8e815e1763b8d4e5adf0dc14bde8c55329cf95a8
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 14:46:44 2010 -0300
[media] uvcvideo: Move mutex lock/unlock inside uvc_free_buffers
Callers outside uvc_queue.c should not be forced to lock/unlock the
queue mutex manually. Move the mutex operations inside
uvc_free_buffers().
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 23d9f3ef23f0dc4bb20ccd5540b9a91ff08da08f
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 07:58:54 2010 -0300
[media] uvcvideo: Lock controls mutex when querying menus
uvc_find_control() must be called with the controls mutex locked. Fix
uvc_query_v4l2_menu() accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ca9afe6f87b569cdf8e797395381f18ae23a2905
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Nov 26 06:54:53 2010 -0300
[media] v4l2-dev: fix race condition
The unregister function had a race condition with the v4l2_open
function. Ensure that both functions test and clear the REGISTER
flag from within a critical section.
Thanks to Laurent Pinchart for finding this race.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 879aa24d6394aa04b690a600a41ff500441ad384
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Nov 26 06:47:28 2010 -0300
[media] V4L: improve the BKL replacement heuristic
The BKL replacement mutex had some serious performance side-effects on
V4L drivers. It is replaced by a better heuristic that works around the
worst of the side-effects.
Read the v4l2-dev.c comments for the whole sorry story. This is a
temporary measure only until we can convert all v4l drivers to use
unlocked_ioctl.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 2877842de8cbf6272b0a851cb12587b7dd8c2afb
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Nov 26 06:43:51 2010 -0300
[media] v4l2-dev: use mutex_lock_interruptible instead of plain mutex_lock
Where reasonable use mutex_lock_interruptible instead of mutex_lock.
Also fix the poll, read and write error codes when called with an unregistered
device (e.g. after a USB device was disconnected). Poll must return
POLLERR|POLLHUP and read/write must return -ENODEV.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 78b055be2710b63cb196fc37669f3b662fecc9e4
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Fri Nov 19 17:04:31 2010 -0300
[media] cx18: convert to unlocked_ioctl
Also added locking around snd_cx18_pcm_ioctl as a precaution
as requested by Andy Walls.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 4f68775b7dfc6115169f689a42535486bf10977e
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Tue Nov 16 18:13:06 2010 -0300
[media] radio-timb: convert to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Acked-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 697566939dc60048fca6e6dd69c7e089aaeb7ff8
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Tue Nov 16 18:12:16 2010 -0300
[media] sh_vou: convert to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 20aa5bb9dc4b5aba1b4d0f15aa92c4e83721a343
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 13:09:21 2010 -0300
[media] cafe_ccic: replace ioctl by unlocked_ioctl
Trivial change, approved by Jonathan Corbet <corbet@xxxxxxx>.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ca2621963de3934613f8aa63e19c03b1751707ae
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 11:17:00 2010 -0300
[media] et61x251_core: trivial conversion to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit feecf93d6b16887bf7e12fcc604bfba9048b2fa5
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 11:13:39 2010 -0300
[media] sn9c102: convert to unlocked_ioctl
Trivial conversion, this driver used a mutex already.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 61df3c9b3fe6a7e47d25b27ae4df0ecdb07b8fbd
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 10:09:38 2010 -0300
[media] BKL: trivial ioctl -> unlocked_ioctl video driver conversions
These drivers could be trivially converted to unlocked_ioctl since they
already did locking.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit d2c998f7453af7ad416bc38d09ae9d453d2fac5e
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 09:49:34 2010 -0300
[media] typhoon: convert to unlocked_ioctl
Convert the typhoon driver from ioctl to unlocked_ioctl.
When doing this I noticed a bug where curfreq was not initialized correctly
to mutefreq (it wasn't multiplied by 16).
The initialization is now also done before the device node is created.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 09:48:24 2010 -0300
[media] si4713: convert to unlocked_ioctl
Convert ioctl to unlocked_ioctl. Note that for this driver the locking
is done inside the sub-device.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit ee71e42321cced11fecb989d743ad9cdb0c384ea
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 09:46:23 2010 -0300
[media] tea5764: convert to unlocked_ioctl
Convert from ioctl to unlocked_ioctl using the v4l2 core lock.
Also removed the 'exclusive access' limitation. There was no need for it
and it violates the v4l2 spec as well.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 1cccee0b84e3445a142d0e9edcbf66b677b2e7e5
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 09:43:52 2010 -0300
[media] cadet: use unlocked_ioctl
Converted from ioctl to unlocked_ioctl.
This driver already used an internal lock, but it was missing in cadet_open and
cadet_release and it was not used correctly in cadet_read.
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 32958fdd1663aeaa23b5edbfbb0db684ffd4e20e
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date: Sun Nov 14 09:36:23 2010 -0300
[media] BKL: trivial BKL removal from V4L2 radio drivers
The patch converts a bunch of V4L2 radio drivers to unlocked_ioctl.
These are all simple conversions: most already had a lock and so the ioctl
fop could simply be replaced by unlocked_ioctl.
radio-miropcm20.c was converted to use the new V4L2 core lock.
While doing this work I noticed that many of these drivers initialized
some more fields or muted audio or something like that *after* creating
the device node. This should be done before the device node is created
to prevent problems. Especially hal tends to grab a device node as soon
as it is created.
In one or two cases the mutex_init was even done after the device creation!
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 12b3b5afed67e08aa641d30e57df20dab2e33432
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Nov 25 00:03:32 2010 +0100
ACPI / PM: Do not refcount power resources that can't be turned on
If turning on a power resource fails, do not reference count it,
since it cannot be in use in that case.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit 212967c69afd348342548272aedbe4d46a9325d6
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Thu Nov 25 00:02:36 2010 +0100
ACPI / PM: Check device state before refcounting power resources
Commit 3e384ee6c687cb397581ee8f9440fc8220cfac80 (ACPI / PM: Fix
reference counting of power resources) introduced a regression by
causing fan power resources to be turned on and reference counted
unnecessarily during resume, so on some boxes fans are always on
after resume.
Fix the problem by checking if the current device state is different
from the new state before reference counting and turning on power
resources in acpi_power_transition().
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22932 .
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Reported-and-tested-by: Maciej Rutecki <maciej.rutecki@xxxxxxxxx>
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
commit d7470b6afca85ed4388fff57fc9d89f5a3be02ff
Author: Stephane Eranian <eranian@xxxxxxxxxx>
Date: Wed Dec 1 18:49:05 2010 +0200
perf stat: Add csv-style output
This patch adds an option (-x/--field-separator) to print counts using a
CSV-style output. The user can pass a custom separator. This makes it very easy
to import counts directly into your favorite spreadsheet without having to
write scripts.
Example:
$ perf stat --field-separator=, -a -- sleep 1
4009.961740,task-clock-msecs
13,context-switches
2,CPU-migrations
189,page-faults
9596385684,cycles
3493659441,instructions
872897069,branches
41562,branch-misses
22424,cache-references
1289,cache-misses
Works also in non-aggregated mode:
$ perf stat -x , -a -A -- sleep 1
CPU0,1002.526168,task-clock-msecs
CPU1,1002.528365,task-clock-msecs
CPU2,1002.523360,task-clock-msecs
CPU3,1002.519878,task-clock-msecs
CPU0,1,context-switches
CPU1,5,context-switches
CPU2,5,context-switches
CPU3,6,context-switches
CPU0,0,CPU-migrations
CPU1,1,CPU-migrations
CPU2,0,CPU-migrations
CPU3,1,CPU-migrations
CPU0,2,page-faults
CPU1,6,page-faults
CPU2,9,page-faults
CPU3,174,page-faults
CPU0,2399439771,cycles
CPU1,2380369063,cycles
CPU2,2399142710,cycles
CPU3,2373161192,cycles
CPU0,872900618,instructions
CPU1,873030960,instructions
CPU2,872714525,instructions
CPU3,874460580,instructions
CPU0,221556839,branches
CPU1,218134342,branches
CPU2,218161730,branches
CPU3,218284093,branches
CPU0,18556,branch-misses
CPU1,1449,branch-misses
CPU2,3447,branch-misses
CPU3,12714,branch-misses
CPU0,8330,cache-references
CPU1,313844,cache-references
CPU2,47993728,cache-references
CPU3,826481,cache-references
CPU0,272,cache-misses
CPU1,5360,cache-misses
CPU2,1342193,cache-misses
CPU3,13992,cache-misses
This second version adds the ability to name a separator and uses
field-separator as the long option to be consistent with perf report.
Commiter note: Since we enabled --big-num by default in 201e0b0 and -x can't be
used with it, we need to notice if the user explicitely enabled or disabled -B,
add code to disable big_num if the user didn't explicitely set --big_num when
-x is used.
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Frederik Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: paulus@xxxxxxxxx
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>
LKML-Reference: <4cf68aa7.0fedd80a.5294.1203@xxxxxxxxxxxxx>
Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7
Author: David McCullough <david_mccullough@xxxxxxxxxx>
Date: Mon Nov 29 19:32:34 2010 +0000
net/ipv6/sit.c: return unhandled skb to tunnel4_rcv
I found a problem using an IPv6 over IPv4 tunnel. When CONFIG_IPV6_SIT
was enabled, the packets would be rejected as net/ipv6/sit.c was catching
all IPPROTO_IPV6 packets and returning an ICMP port unreachable error.
I think this patch fixes the problem cleanly. I believe the code in
net/ipv4/tunnel4.c:tunnel4_rcv takes care of it properly if none of the
handlers claim the skb.
Signed-off-by: David McCullough <david_mccullough@xxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 67d5288049f46f816181f63eaa8f1371877ad8ea
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Mon Nov 29 18:02:47 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ead5d238146981f922e3848fac83825d87c518f0
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Mon Nov 29 18:02:46 2010 +0000
vxge: use strcpy for strings
Use strncpy instead of memcpy when working on strings
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1bacdbb341e8c92c58651f06727318c3d0c1c30e
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Mon Nov 29 18:02:45 2010 +0000
vxge: remove unnecessary printks
Remove printks for ring blocks, fifo blocks, and rx doorbell mode as
they clutter the dmesg output during modprobe and provide no useful
information.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8afe7c8acd33bc52c56546e73e46e9d546269e2c
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Nov 29 09:47:49 2010 +0000
ipip: add module alias for tunl0 tunnel device
If ipip is built as a module the 'ip tunnel add' command would fail because
the ipip module was not being autoloaded. Adding an alias for
the tunl0 device name cause dev_load() to autoload it when needed.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4da6a738ffdb99b88efbe5b4c4fe521ca453640d
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Nov 29 09:47:48 2010 +0000
gre: add module alias for gre0 tunnel device
If gre is built as a module the 'ip tunnel add' command would fail because
the ip_gre module was not being autoloaded. Adding an alias for
the gre0 device name cause dev_load() to autoload it when needed.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Nov 29 09:47:47 2010 +0000
gre: minor cleanups
Use strcpy() rather the sprintf() for the case where name is getting
generated. Fix indentation.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f2cd2d3e9b3ef960612e362f0ad129d735452df2
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Nov 29 08:14:37 2010 +0000
net sched: use xps information for qdisc NUMA affinity
Allocate qdisc memory according to NUMA properties of cpus included in
xps map.
To be effective, qdisc should be (re)setup after changes
of /sys/class/net/eth<n>/queues/tx-<n>/xps_cpus
I added a numa_node field in struct netdev_queue, containing NUMA node
if all cpus included in xps_cpus share same node, else -1.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Cc: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0793f83f0ec2142d06abe53570417c8d95e0310a
Author: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Date: Wed Dec 1 12:39:28 2010 -0800
bnx2x: Add Nic partitioning mode (57712 devices)
NIC partitioning is another flavor of multi function - having few
PCI functions share the same physical port. Unlike the currently
supported mode of multi-function which depends on the switch
configuration and uses outer-VLAN, the NPAR mode is switch independent
and uses the MAC addresses to distribute incoming packets to the different
functions. This patch adds the specific HW setting of the NPAR mode
and some distinctions between switch dependent (SD) and
switch independent (SI) multi-function (MF) modes where the configuration
is not the same.
Advance driver version to 1.60.00-6
Signed-off-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 201e0b06efee80ce090579aa165c65c3d0836d95
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Wed Dec 1 17:53:27 2010 -0200
perf stat: Use --big-num format by default
[acme@mica linux]$ perf stat ls > /dev/null
Performance counter stats for 'ls':
1.512532 task-clock-msecs # 0.801 CPUs
2 context-switches # 0.001 M/sec
0 CPU-migrations # 0.000 M/sec
241 page-faults # 0.159 M/sec
2,973,331 cycles # 1965.797 M/sec
1,460,802 instructions # 0.491 IPC
314,642 branches # 208.023 M/sec
18,475 branch-misses # 5.872 %
<not counted> cache-references
<not counted> cache-misses
0.001887676 seconds time elapsed
To get the previous behaviour just use --no-big-num:
[acme@mica linux]$ perf stat --no-big-num ls > /dev/null
Performance counter stats for 'ls':
1.468014 task-clock-msecs # 0.795 CPUs
1 context-switches # 0.001 M/sec
0 CPU-migrations # 0.000 M/sec
241 page-faults # 0.164 M/sec
2900254 cycles # 1975.631 M/sec
1437991 instructions # 0.496 IPC
310905 branches # 211.786 M/sec
17912 branch-misses # 5.761 %
<not counted> cache-references
<not counted> cache-misses
0.001845435 seconds time elapsed
[acme@mica linux]$
Suggested-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 8c207692fc8fa3ea1a5ff97ad698efb09a81975a
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:19 2010 -0600
perf stat: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-12-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit f68d6bd451782b58c2b563dc86f0a81ba106c30c
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:20 2010 -0600
perf test: Fix spelling mistake in documentation
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-13-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 646420f1bcf6ddf3e150f92a5f2a8bd7d6057ff8
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:22 2010 -0600
perf trace: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-15-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 2e7a988198b11877d844d147ec81c7caea82c314
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:21 2010 -0600
perf top: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-14-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 1eacc94a66ce347abbf75f223361b21461331383
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:18 2010 -0600
perf sched: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-11-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit e04fffc321aeebab4962cfc120952272f2d1df98
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:17 2010 -0600
perf report: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-10-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 08dbd7e3fa2398910713b21399cca7c6e4b43011
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:16 2010 -0600
perf record: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-9-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 9d5b7f5b2b2c1ceade1fbbaefb2bd9167436329d
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:15 2010 -0600
perf probe: Fix spelling mistake in documentation
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-8-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 4aace251519745977f4b5ddf625b630b4807be3a
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:14 2010 -0600
perf lock: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-7-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 5c0ef0ab077c8bdb224540fea60473439be1bdb4
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:13 2010 -0600
perf kvm: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-6-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 5ea4f857850450dc1442144a00547d6623d79d78
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:12 2010 -0600
perf diff: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-5-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 342955593af08f185279e074b3d77719d2f23b82
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:11 2010 -0600
perf diff: Fix displacement and modules options short flag
The --displacement and --modules options to perf diff both use -m as a
short flag. Change --displacement to use -M since other perf commands
use -m, --modules.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-4-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit b6a535dbf615e168e796eec7318c77d1a3b7047f
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:10 2010 -0600
perf buildid-list: Document missing options
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-3-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 1968ad911d0769e58a484bb721d275814baf9f2f
Author: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Date: Tue Nov 30 19:57:09 2010 -0600
perf annotate: Document missing options.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1291168642-11402-2-git-send-email-shawn.bohrer@xxxxxxxxx>
Signed-off-by: Shawn Bohrer <shawn.bohrer@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit d13a2cb63d06fe2e3067c7d40f9a5946abd614c8
Author: David Strand <dpstrand@xxxxxxxxx>
Date: Wed Dec 1 11:43:08 2010 -0800
bonding: check for assigned mac before adopting the slaves mac address
Restore the check for an unassigned mac address before adopting the
first slaves as it's own. The change in behavior was introduced by:
commit c20811a79e671a6a1fe86a8c1afe04aca8a7f085
Author: Jiri Pirko <jpirko@xxxxxxxxxx>
bonding: move dev_addr cpy to bond_enslave
Signed-off-by: David Strand <dpstrand@xxxxxxxxx>
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6c08af030212d1a34593397bb01f262ff31c3629
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Nov 27 06:47:43 2010 +0000
b44: fix workarround for wap54g10
The code for the b44_wap54g10_workaround was never included, because
the config option was wrong. The nvram_get function was never in
mainline kernel, only in external OpenWrt patches.
The code should be compiled in when CONFIG_BCM47XX is selected and not
when CONFIG_SSB_DRIVER_MIPS is selected, because nvram_getenv is only
available on bcm47xx platforms and now in the mainline kernel code.
Using an include is better than a second function declaration, to fix
this when the function signature changes.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e27535b9c6e071d461be33b75a33047c9bb4c0ce
Author: Eli Cohen <eli@xxxxxxxxxxxxxxxxxx>
Date: Wed Nov 17 13:39:43 2010 +0000
IB/mlx4: Fix memory ordering of VLAN insertion control bits
We must fully update the control segment before marking it as valid,
so that hardware doesn't start executing it before we're ready.
Signed-off-by: Eli Cohen <eli@xxxxxxxxxxxxxx>
[ Move VLAN control bit setting to before wmb(). - Roland ]
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit e3d33cb13202cd51378c8d61e92a96183cc0e6fd
Author: Chien Tung <chien.tin.tung@xxxxxxxxx>
Date: Tue Nov 2 16:29:54 2010 +0000
MAINTAINERS: Update NetEffect entry
Correct web link as www.neteffect.com is no longer valid. Remove
Chien Tung as maintainer. I am moving on to other responsibilities at
Intel. Thanks for all the fish.
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 381601e5bbae78d7c18d946fe874a63957edea13
Author: Anders Franzen <Anders.Franzen@xxxxxxxxxxxx>
Date: Wed Nov 24 05:47:18 2010 +0000
Make the ip6_tunnel reflect the true mtu.
The ip6_tunnel always assumes it consumes 40 bytes (ip6 hdr) of the mtu of the
underlaying device. So for a normal ethernet bearer, the mtu of the ip6_tunnel is
1460.
However, when creating a tunnel the encap limit option is enabled by default, and it
consumes 8 bytes more, so the true mtu shall be 1452.
I dont really know if this breaks some statement in some RFC, so this is a request for
comments.
Signed-off-by: Anders Franzen <anders.franzen@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 04a6b516cdc6efc2500b52a540cf65be8c5aaf9e
Author: Vivek Goyal <vgoyal@xxxxxxxxxx>
Date: Wed Dec 1 19:34:52 2010 +0100
blk-throttle: Correct the placement of smp_rmb()
o I was discussing what are the variable being updated without spin lock and
why do we need barriers and Oleg pointed out that location of smp_rmb()
should be between read of td->limits_changed and tg->limits_changed. This
patch fixes it.
o Following is one possible sequence of events. Say cpu0 is executing
throtl_update_blkio_group_read_bps() and cpu1 is executing
throtl_process_limit_change().
cpu0 cpu1
tg->limits_changed = true;
smp_mb__before_atomic_inc();
atomic_inc(&td->limits_changed);
if (!atomic_read(&td->limits_changed))
return;
if (tg->limits_changed)
do_something;
If cpu0 has updated tg->limits_changed and td->limits_changed, we want to
make sure that if update to td->limits_changed is visible on cpu1, then
update to tg->limits_changed should also be visible.
Oleg pointed out to ensure that we need to insert an smp_rmb() between
td->limits_changed read and tg->limits_changed read.
o I had erroneously put smp_rmb() before atomic_read(&td->limits_changed).
This patch fixes it.
Reported-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit d1ae8ffdfaa16b2ab2e9346e81cf0ab6eaaae347
Author: Vivek Goyal <vgoyal@xxxxxxxxxx>
Date: Wed Dec 1 19:34:46 2010 +0100
blk-throttle: Trim/adjust slice_end once a bio has been dispatched
o During some testing I did following and noticed throttling stops working.
- Put a very low limit on a cgroup, say 1 byte per second.
- Start some reads, this will set slice_end to a very high value.
- Change the limit to higher value say 1MB/s
- Now IO unthrottles and finishes as expected.
- Try to do the read again but IO is not limited to 1MB/s as expected.
o What is happening.
- Initially low value of limit sets slice_end to a very high value.
- During updation of limit, slice_end is not being truncated.
- Very high value of slice_end leads to keeping the existing slice
valid for a very long time and new slice does not start.
- tg_may_dispatch() is called in blk_throtle_bio(), and trim_slice()
is not called in this path. So slice_start is some old value and
practically we are able to do huge amount of IO.
o There are many ways it can be fixed. I have fixed it by trying to
adjust/cleanup slice_end in trim_slice(). Generally we extend slices if bio
is big and can't be dispatched in one slice. After dispatch of bio, readjust
the slice_end to make sure we don't end up with huge values.
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit be93112accb42c5586a459683d71975cc70673ca
Author: Bala Shanmugam <sbalashanmugam@xxxxxxxxxxx>
Date: Fri Nov 26 17:35:46 2010 +0530
Bluetooth: Add new PID for Atheros 3011
Atheros 3011 has small sflash firmware and needs to be
blacklisted in transport driver to load actual firmware
in DFU driver.
Signed-off-by: Bala Shanmugam <sbalashanmugam@xxxxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 61faddf661a65a179751dc9fd209cb694d9a28af
Author: Stefan Seyfried <seife+kernel@xxxxxxxxxxxxxx>
Date: Tue Nov 30 21:49:08 2010 +0100
Bluetooth: Fix log spamming in btusb due to autosuspend
If a device is autosuspended an inability to resubmit URBs is
to be expected. Check the error code and only log real errors.
(Now that autosuspend is default enabled for btusb, those log
messages were happening all the time e.g. with a BT mouse)
Signed-off-by: Stefan Seyfried <seife+kernel@xxxxxxxxxxxxxx>
Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 8ed9e0e1b602a0bcdc3bef52ec05fdab5b484341
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Wed Dec 1 09:19:45 2010 -0800
Input: turbografx - fix reference counting
The ref-count of parport gained from parport_find_number()
was not released in normal path.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 0aded708d125a3ff7e5abaea9c2d9c6d7ebbfdcd
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Nov 30 21:56:32 2010 -0500
NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler
We need to use the cookie from the previous array entry, not the
actual cookie that we are searching for (except for the case of
uncached_readdir).
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit d0777f2c3eda180e3fc549e0efbe741014f17689
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Mon Nov 22 17:12:16 2010 -0800
spi/pxa2xx: Consider CE4100's FIFO depth
For PXA the default threshold is FIFO_DEPTH / 2. Adjust this value for
CE4100.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit d6ea3df0d470fb9260db93883f97764cf9f0e562
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Wed Nov 24 10:17:14 2010 +0100
spi/pxa2xx: Add CE4100 support
Sodaville's SPI controller is very much the same as in PXA25x. The
difference:
- The RX/TX FIFO is only 4 words deep instead of 16
- No DMA support
- The SPI controller offers a CS functionality
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 307991055b0ce65d53dc1eb501c456c10eb36360
Merge: 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 9b4320b77bab4031649c484da1c595f39c2e43cd
Author: Michal Marek <mmarek@xxxxxxx>
Date: Wed Dec 1 13:13:56 2010 +0100
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
commit 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 29 14:38:50 2010 -0800
initramfs: Really fix build break on symbol-prefixed archs
Define the __initramfs_size variable using VMLINUX_SYMBOL() to take care
of symbol-prefixed architectures, for example, blackfin.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Cc: Mike Frysinger <vapier.adi@xxxxxxxxx>
Cc: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>,
Cc: Michal Marek <mmarek@xxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
[mmarek: leave out Makefile change, since d63f6d1 already takes care of the
SYMBOL_PREFIX define]
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 2062ea522bb58bb2aeee86d051b37136491ccd65
Author: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 09:38:55 2010 +0000
ASoC: WM8731: Fix incorrect mask for bypass path disable
According to the datasheet the bypass path enable/disable is
bit 3 therefore we need 0x8 and not 0x4.
Signed-off-by: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 8348c259dd6a6019a8fa01b0a3443409480f7b9d
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Mon Nov 22 17:12:15 2010 -0800
arm/pxa2xx: reorgazine SSP and SPI header files
The PXA-SPI driver relies on some files / defines which are arm specific
and are within the ARM tree. The CE4100 SoC which is x86 has also the
SPI core.
This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to
include/linux where the CE4100 can access them.
This move got verified by building the following defconfigs:
cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
raumfeld_defconfig magician_defconfig
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 4a25605fb71f02b4f80091df91f777225a0309c5
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Mon Nov 22 17:12:15 2010 -0800
spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 49cbb1e0b6dcba9170e72fdf40c75fc24cadba4b
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Mon Nov 22 17:12:14 2010 -0800
spi/pxa2xx: add support for shared IRQ handler
This is required in case the interrupt line is shared with other
devices.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 50005a8deb38e5e6456ebd94e57adb321d4589de
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 12 13:04:16 2010 +0000
ARM: module: ignore unwind for sections not marked SHF_ALLOC
If a section is not marked with SHF_ALLOC, it will be discarded
by the module code. Therefore, it is not correct to register
the unwind tables.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 8931360eb9c6ec8bd30efef579cef81917a2fcf3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 12 13:02:46 2010 +0000
ARM: module: clean up handling of ELF unwind tables
There's no need to keep pointers to the ELF sections available while
the module is loaded - we only need the section pointers while we're
finding and registering the unwind tables, which can all be done during
the finalize stage of loading.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 16cdd4336fdca9b50f991b591005b5f6416f82c4
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Tue Nov 30 20:34:52 2010 +0000
lxfb: Maintain video processor palette through suspend/resume
The Geode X driver uses both of the LX's palettes, one for gamma
correction and one for colormaps.
The kernel driver currently only backs up the one used for colormaps
during suspend/resume. If you mess with gamma settings and do a
suspend/resume, colors go funny.
Fix this by backing up the video proc palette during suspend/resume,
alongside the display controller one which is already handled.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Acked-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 93c176f39fedaeff854ccb7681d626d65bdffe52
Author: Caglar Akyuz <caglar@xxxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 20:04:14 2010 +0000
video: da8xx: Register IRQ as last thing in driver probing.
Following commit exposed a bug in driver:
"fbdev: da8xx/omap-l1xx: implement double buffering"
Bug is, if interrupt handler is called before initialization is
finished, raster controller is enabled and following register
modifications causes hardware to stay in a broken state.
By looking at this one may say that proper locking is missing in
this driver, and a more proper fix should be prepared. However,
aformentioned commit causes a regression in the driver and some
fix to current one should be applied first.
Signed-off-by: Caglar Akyuz <caglar@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8d7bfb4a891d606d52e1a99cf7231b4417b935dc
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 1 10:08:02 2010 +0100
[S390] css: fix rsid evaluation for 2nd crw
Use correct bit positions of rsid field.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 398812159e328478ae49b4bd01f0d71efea96c39
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Wed Dec 1 10:08:01 2010 +0100
[S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus
This fixes the same problem as described in the patch "nohz: fix
printk_needs_cpu() return value on offline cpus" for the arch_needs_cpu()
primitive:
arch_needs_cpu() may return 1 if called on offline cpus. When a cpu gets
offlined it schedules the idle process which, before killing its own cpu,
will call tick_nohz_stop_sched_tick().
That function in turn will call arch_needs_cpu() in order to check if the
local tick can be disabled. On offline cpus this function should naturally
return 0 since regardless if the tick gets disabled or not the cpu will be
dead short after. That is besides the fact that __cpu_disable() should already
have made sure that no interrupts on the offlined cpu will be delivered anyway.
In this case it prevents tick_nohz_stop_sched_tick() to call
select_nohz_load_balancer(). No idea if that really is a problem. However what
made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is
used within __mod_timer() to select a cpu on which a timer gets enqueued.
If arch_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get
updated when a cpu gets offlined. It may contain the cpu number of an offline
cpu. In turn timers get enqueued on an offline cpu and not very surprisingly
they never expire and cause system hangs.
This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses
get_nohz_timer_target() which doesn't have that problem. However there might
be other problems because of the too early exit tick_nohz_stop_sched_tick()
in case a cpu goes offline.
This specific bug was indrocuded with 3c5d92a0 "nohz: Introduce
arch_needs_cpu".
In this case a cpu hotplug notifier is used to fix the issue in order to keep
the normal/fast path small. All we need to do is to clear the condition that
makes arch_needs_cpu() return 1 since it is just a performance improvement
which is supposed to keep the local tick running for a short period if a cpu
goes idle. Nothing special needs to be done except for clearing the condition.
Cc: stable@xxxxxxxxxx
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0607f8622953541e95030ab011258d9f1f381357
Author: Felipe Balbi <balbi@xxxxxx>
Date: Wed Dec 1 11:03:54 2010 +0200
usb: musb: gadget: prevent a NULL pointer dereference
Case we can't allocate struct musb_request,
prevent a NULL pointer dereference by returning
early.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit fcf173e4511193b1efeccb0f22a8c641b464353b
Author: Hema Kalliguddi <hemahk@xxxxxx>
Date: Wed Sep 29 11:26:39 2010 -0500
usb: musb: add names for IRQs in structure resource
Soon resource data will get automatically
populated from a set of autogenerated data
from TI's hardware database for the OMAP
platform.
Such database, might not have resources at
the expected order by the current drivers.
While we could hack in some exceptions to
that tool to generate resources in a specific
order, it seems less fragile to use the
resource name instead. That way, no matter
what order the resources are generated, the
driver still work.
Modified the OMAP, Blackfin and Davinci
architecture files to add the name of the IRQs
in the resource structures and musb driver to
use the platform_get_irq_byname() api to get
the device and dma irq numbers instead of using
the index.
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Acked-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Hema HK <hemahk@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit ea65df57c2eea803535a071752efb030c46a11f5
Author: Hema Kalliguddi <hemahk@xxxxxx>
Date: Wed Sep 22 19:27:40 2010 -0500
usb: musb: remove board_data parameter from musb_platform_init()
Removed the board_data parameter being
passed to musb_platform_init function
as board_data can be extracted from
device structure which is already member
of musb structure.
Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Hema HK <hemahk@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit b3d006c0e745bfd2dab4984ffe3279d5cf4e926a
Merge: 4c635a4e04700a371ef7e4d4bb33ed88747e801e 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 1 09:18:12 2010 +0100
Merge branch 'perf/rename' into perf/core
Merge reason: This is an older commit under testing that was not pushed yet - merge it.
Also fix up the merge in command-list.txt.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Acked-by: Tom Zanussi <tzanussi@xxxxxxxxx>
commit 3bfa321e662edf90fb8123a02c987c2965fa50bb
Author: Yan Li <yan.i.li@xxxxxxxxx>
Date: Tue Nov 30 23:51:03 2010 -0800
Input: synaptics - fix handling of 2-button ClickPads
Lenovo S10-3t's ClickPad is a 2-button ClickPad that reports BTN_LEFT
and BTN_RIGHT as normal touchpad, unlike the 1-button ClickPad used in
HP mini 210 that reports solely BTN_MIDDLE.
In 0xc0-cap response, the 1-button ClickPad has the 20-bit set while
2-button ClickPad has the 8-bit set.
This patch makes the kernel only handle 1-button ClickPad specially,
and treat 2-button ClickPad in the same fashion as regular touchpads.
This fixes kernel bug #18122 and MeeGo bug #4807.
Signed-off-by: Yan Li <yan.i.li@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit a318e6b1a04c9d8882712508eb9c8a061796c06b
Author: David Foley <favux.is@xxxxxxxxx>
Date: Tue Nov 30 23:45:46 2010 -0800
Input: wacom - add IDs for two new Bamboo PTs
Add two new Bamboo Pen & Touch models:
Bamboo Comic Medium (CTH661/S1; Product ID = 0xd8)
Bamboo P & T Special Edition Small (CTH461/L; Product ID = 0xdA)
Tested-by: IRIE Shinsuke <irieshinsuke@xxxxxxxxxxx>
Tested-by: Andrea Cadeddu <mrernia@xxxxxxxxx>
Signed-off-by: David Foley <favux.is@xxxxxxxxx>
Reviewed-by: Ping Cheng <pingc@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 25c9170ed64a6551beefe9315882f754e14486f4
Author: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Date: Tue Nov 30 17:36:08 2010 +0900
genirq: Fix incorrect proc spurious output
Since commit a1afb637(switch /proc/irq/*/spurious to seq_file) all
/proc/irq/XX/spurious files show the information of irq 0.
Current irq_spurious_proc_open() passes on NULL as the 3rd argument,
which is used as an IRQ number in irq_spurious_proc_show(), to the
single_open(). Because of this, all the /proc/irq/XX/spurious file
shows IRQ 0 information regardless of the IRQ number.
To fix the problem, irq_spurious_proc_open() must pass on the
appropreate data (IRQ number) to single_open().
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Reviewed-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
LKML-Reference: <4CF4B778.90604@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx [2.6.33+]
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit fa3c9f3de2504bb09f8ad512f89837751a3eb741
Merge: 193006f7e3b1abd42d7a3677b54fa2996461a842 55661fc1f105ed75852e937bf8ea408270eb0cca
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 1 16:39:08 2010 +0900
Merge branch 'sh/cachetlb' into sh-fixes-for-linus
commit 86b17f76f462db460d6d916e105a4c44cb353e36
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Mon Nov 29 23:33:04 2010 -0800
Input: document struct input_absinfo
Add documentation for struct input_absinfo that is used in EVIOCGABS
and EVIOCSABS ioctl and specify units of measure used for reporting
resolution for an axis.
Acked-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 0417596f66dd6621f4fd46563c7c56a95311dbe8
Author: Bastien Nocera <hadess@xxxxxxxxxx>
Date: Mon Nov 29 23:33:05 2010 -0800
Input: add keycodes for touchpad on/off keys
Some laptops will have a "touchpad toggle" soft button, which expects
user-space to turn off the touchpad themselves, some other devices will
do this in hardware, but send key events telling us that the touchpad
has been turned off/on.
KEY_TOUCHPAD_ON/KEY_TOUCHPAD_OFF will be used by user-space to show a
popup with the status of the touchpad.
Signed-off-by: Bastien Nocera <hadess@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit da0c490115de026618a7fdcd886602da44392a50
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 23:33:07 2010 -0800
Input: use pr_fmt and pr_<level>
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 4eb3c30b2e034b673df3e8f21b497e39f3911a02
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 23:33:07 2010 -0800
Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ use
Standardized message logging prefixes.
Removed \n from dbg macro, added \n to each dbg call site.
Removed direct use of __FILE__ from dbg, converted to pr_fmt(fmt)
Added non-debug printf argument verification of dbg calls
Removed "i8042.c" from printks, converted to pr_<level>
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit b029ffafe89cf4b97cf39e0225a5205cbbf9e02f
Author: Hemanth V <hemanthv@xxxxxx>
Date: Tue Nov 30 23:03:54 2010 -0800
Input: add CMA3000 accelerometer driver
Add support for CMA3000 Tri-axis accelerometer, which supports Motion
detect, Measurement and Free fall modes. CMA3000 supports both I2C/SPI
bus for communication, currently the driver supports I2C based
communication.
Signed-off-by: Hemanth V <hemanthv@xxxxxx>
Reviewed-by: Jonathan Cameron <jic23@xxxxxxxxx>
Reviewed-by: Sergio Aguirre <saaguirre@xxxxxx>
Reviewed-by: Shubhrajyoti <Shubhrajyoti@xxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 1 15:58:58 2010 +0900
sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects.
This switches over to selects for the subtypes to enable OHCI/EHCI
support explicitly rather than littering the usb Kconfig with subtype
dependencies.
Suggested-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1a44d72a4058f870c305a23aa5cbc4cacb6758ea
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Wed Dec 1 00:31:46 2010 +0000
ARM: mach-shmobile: mackerel: Add FSI-AK4643 support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d44deb35c26c74d0f1ebea95a5fc386f72d210f7
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Tue Nov 30 06:52:18 2010 +0000
ARM: mach-shmobile: mackerel: Add LEDs support
you can control it by
echo 0 > /sys/class/leds/led0/brightness
echo 1 > /sys/class/leds/led0/brightness
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 55661fc1f105ed75852e937bf8ea408270eb0cca
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 1 15:39:51 2010 +0900
sh: Assume new page cache pages have dirty dcache lines.
This follows the ARM change c01778001a4f5ad9c62d882776235f3f31922fdd
("ARM: 6379/1: Assume new page cache pages have dirty D-cache") for the
same rationale:
There are places in Linux where writes to newly allocated page
cache pages happen without a subsequent call to flush_dcache_page()
(several PIO drivers including USB HCD). This patch changes the
meaning of PG_arch_1 to be PG_dcache_clean and always flush the
D-cache for a newly mapped page in update_mmu_cache().
This addresses issues seen with executing binaries from MMC, in
addition to some of the other HCDs that don't explicitly do cache
management for their pipe-in buffers.
Requested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 595a251c0740785fd3c0d2156d78578c7479811e
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 20:15:58 2010 -0800
sparc: Write to prom console using indirect buffer.
sparc64 systems have a restriction in that passing in buffer
addressses above 4GB to prom calls is not reliable.
We end up violating this when we do prom console writes, because we
use an on-stack buffer to translate '\n' into '\r\n'.
So instead, do this translation into an intermediate buffer, which is
in the kernel image and thus below 4GB, then pass that to the PROM
console write calls.
On the 32-bit side we don't have to deal with any of these issues, so
the new prom_console_write_buf() uses the existing prom_nbputchar()
implementation. However we can now mark those routines static.
Since the 64-bit side completely uses new code we can delete the
putchar bits as they are now completely unused.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fb82155d5c401a5cf2bc2f555cb807f0bed035bb
Merge: 22a5b566c8c442b0b35b3b106795e2f2b3578096 3074adc8b6d9bf28b574a58241b958057a69a7a0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 20:13:35 2010 -0800
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: add workaround for dce3 ddc line vbios bug
drm/radeon/kms: fix interlaced and doublescan handling
drm/radeon/kms: fix typos in disabled vbios code
Revert "drm/i915/dp: use VBT provided eDP params if available"
drm/i915: Clear pfit registers when not used by any outputs
drm: record monitor status in output_poll_execute
drm: Set connector DPMS status to ON in drm_crtc_helper_set_config
drm/i915: fix regression due to ba3d8d749b01548b9
Revert "drm/radeon/kms: fix typo in r600 cs checker"
drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
MAINTAINERS: INTEL DRM DRIVERS list (intel-gfx) is subscribers-only
drm/i915/sdvo: Always fallback to querying the shared DDC line
drm/i915: Handle pagefaults in execbuffer user relocations
drm/i915/sdvo: Only enable HDMI encodings only if the commandset is supported
drm/radeon/kms: fix resume regression for some r5xx laptops
drm/radeon/kms: fix regression in rs4xx i2c setup
drm/i915: Only save/restore cursor regs if !KMS
drm/i915: Prevent integer overflow when validating the execbuffer
commit 3074adc8b6d9bf28b574a58241b958057a69a7a0
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Tue Nov 30 00:15:10 2010 -0500
drm/radeon/kms: add workaround for dce3 ddc line vbios bug
fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=23752
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc:stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit c49948f4bd39e27dd06a1cdb0c3743ca2a734f5e
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Tue Nov 30 15:46:47 2010 -0500
drm/radeon/kms: fix interlaced and doublescan handling
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 0ec80d645661dda50acd417bdfcb33df2e5dd31e
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Tue Nov 30 19:11:45 2010 -0500
drm/radeon/kms: fix typos in disabled vbios code
6xx/7xx was hitting the wrong BUS_CNTL reg and bits.
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 150f8815bbd15c1a91f74033c048fadcd5f3c715
Merge: c5027dec02c96964847fa68d512318ee5f6f7a19 3cf2efb1a7c68d55d60dcb2ed9609e1a2fc25952
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Wed Dec 1 12:10:34 2010 +1000
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
Revert "drm/i915/dp: use VBT provided eDP params if available"
drm/i915: Clear pfit registers when not used by any outputs
drm/i915: fix regression due to ba3d8d749b01548b9
commit 22a5b566c8c442b0b35b3b106795e2f2b3578096
Merge: 114279be2120a916e8a04feeb2ac976a10016f2f 3b24f0950bc55ca604a9f0da3ca894f9315cb573
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 17:57:57 2010 -0800
Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
* 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
at91/board-yl-9200: fix typo in video support
atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer'
at91/picotux200: remove commenting usb device and dataflash support
at91: rename rm9200ek and rm9200dk board file name
at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used
at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
at91: Convert remaining boards to new-style UART initialization
at91: merge all at91rm9200 defconfig in one single file
commit 114279be2120a916e8a04feeb2ac976a10016f2f
Author: Oleg Nesterov <oleg@xxxxxxxxxx>
Date: Tue Nov 30 20:56:02 2010 +0100
exec: copy-and-paste the fixes into compat_do_execve() paths
Note: this patch targets 2.6.37 and tries to be as simple as possible.
That is why it adds more copy-and-paste horror into fs/compat.c and
uglifies fs/exec.c, this will be cleanuped later.
compat_copy_strings() plays with bprm->vma/mm directly and thus has
two problems: it lacks the RLIMIT_STACK check and argv/envp memory
is not visible to oom killer.
Export acct_arg_size() and get_arg_page(), change compat_copy_strings()
to use get_arg_page(), change compat_do_execve() to do acct_arg_size(0)
as do_execve() does.
Add the fatal_signal_pending/cond_resched checks into compat_count() and
compat_copy_strings(), this matches the code in fs/exec.c and certainly
makes sense.
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 3c77f845722158206a7209c45ccddc264d19319c
Author: Oleg Nesterov <oleg@xxxxxxxxxx>
Date: Tue Nov 30 20:55:34 2010 +0100
exec: make argv/envp memory visible to oom-killer
Brad Spengler published a local memory-allocation DoS that
evades the OOM-killer (though not the virtual memory RLIMIT):
http://www.grsecurity.net/~spender/64bit_dos.c
execve()->copy_strings() can allocate a lot of memory, but
this is not visible to oom-killer, nobody can see the nascent
bprm->mm and take it into account.
With this patch get_arg_page() increments current's MM_ANONPAGES
counter every time we allocate the new page for argv/envp. When
do_execve() succeds or fails, we change this counter back.
Technically this is not 100% correct, we can't know if the new
page is swapped out and turn MM_ANONPAGES into MM_SWAPENTS, but
I don't think this really matters and everything becomes correct
once exec changes ->mm or fails.
Reported-by: Brad Spengler <spender@xxxxxxxxxxxxxx>
Reviewed-and-discussed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit a5880a9e5bb40fbae55de60051d69a29091053c3
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Fri Nov 19 11:01:48 2010 +0800
serial: mfd: adjust the baud rate setting
Previous baud rate setting code only has been tested with 3.5M/9600/
115200/230400/460800 bps, and recently we got a 3M bps device to test,
which needs to modify current MUL register setting, and with this
patch 2.5M/2M/1.5M/1M/0.5M should also work as they just use a MUL
value scale down from 3M's.
Also got some reference register setting from silicon guys for
different baud rates, which tries to keep the pre-scalar register value
to 16.
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Tue Nov 30 11:25:39 2010 -0800
drivers: char: hvc: add arm JTAG DCC console support
This driver adds a basic console that uses the arm JTAG
DCC to transfer data back and forth. It has support for
ARMv6 and ARMv7.
This console is created under the HVC driver, and should be named
/dev/hvcX (or /dev/hvc0 for example).
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Cc: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit de6f86ce51341559dc3c9c9f5c562da12fcfcb31
Author: Yegor Yefremov <yegor_sub1@xxxxxxxxxxxxxxxx>
Date: Mon Nov 22 11:06:32 2010 +0100
RS485 documentation: add 16C950 UART description
Add a notion about 16C950 UART, that is using DTR signal for RS485 mode.
Signed-off-by: Yegor Yefremov <yegorslists@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a4fb0b228e284107b9bdf44769bbdc80efd660e1
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 19 21:41:45 2010 +0300
serial: ifx6x60: fix memory leak
If tty_register_driver() failed then tty_driver is still alive.
Free it with put_tty_driver().
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit badb9533abbbba70df099765afe4ae432b442430
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 19 21:42:03 2010 +0300
serial: ifx6x60: free IRQ on error
If second request_irq() failed then the first IRQ must be freed in
error handling code.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3c6a483275f47a2ef7119309ad3d791c10cf30da
Author: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 09:55:54 2010 +0900
Serial: EG20T: add PCH_UART driver
UART driver of Intel EG20T(Topcliff) PCH
Intel EG20T PCH is the platform controller hub that is going to be used in
Intel's general embedded platform. All IO peripherals in
Intel EG20T PCH are actually devices sitting on AMBA bus.
Intel EG20T PCH has UART I/F. Using this I/F, it is able to access system
devices connected to UART.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 095e24b0ea75b2bdc532b39b04530993442f237f
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Wed Nov 17 07:35:20 2010 -0800
Serial: ce4100: Add PCI UART support for the ce4100
This patch adds support for the PCI UART on the ce4100.
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0ae86689d88bebba16c2db899f845446578d53b3
Merge: e7cddda48c7f892a3fb5c10a6f41a4395f46c0c2 6aa85a5ae610106d89e50c7e1f760c56d12f9bc4
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 30 17:04:33 2010 -0800
Merge branch 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb into usb-next
* 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb:
omap4: 4430sdp: enable the ehci port on 4430SDP
arm: omap4: select USB_ARCH_HAS_EHCI
arm: omap4: usb: add platform init code for EHCI
arm: omap4: add USBHOST and related base addresses
usb: ehci-omap: Add OMAP4 support
omap: usb: ehci: introduce HSIC mode
usb: ehci-omap: add helpers for checking port mode
usb: ehci-omap: use clkdev aliases for functional clocks
omap: clock: add clkdev aliases for EHCI clocks
usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP
usb: ehci-omap: don't hard-code TLL channel count
usb: ehci-omap: update clock names to be more generic
commit 4c635a4e04700a371ef7e4d4bb33ed88747e801e
Author: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 14:27:01 2010 -0800
perf tools: fix event parsing of comma-separated tracepoint events
There are number of issues that prevent the use of multiple tracepoint events
being specified in a -e/--event switch, separated by commas.
For example, perf stat -e irq:irq_handler_entry,irq:irq_handler_exit ... fails
because the tracepoint event parsing code doesn't recognize the comma separator
properly.
This patch corrects those issues.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Julia Lawall <julia@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Reported-by: Michael Ellerman <michaele@xxxxxxxxxxx>
LKML-Reference: <1291156021-17711-1-git-send-email-cjashfor@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 3e8e24f2fc66d32eb0e570e4117dfd05227047e6
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Tue Nov 30 17:12:13 2010 -0500
perf packaging: add memcpy to perf MANIFEST
There seems to be a new dependency on arch/*/lib/memcpy*.S when compiling
the perf tool. Make sure that file is included in the MANIFEST when
creating the tarball.
Cc: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1291155133-3499-2-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit e7cddda48c7f892a3fb5c10a6f41a4395f46c0c2
Author: cxie4 <cxie4@xxxxxxxxxxx>
Date: Tue Nov 30 13:35:15 2010 +0800
USB: pxa: Add USB client support for Marvell PXA9xx/PXA168 chips
This patch add USB client support Marvell PXA9xx/PXA168 chips. The USB
controller in PXA9xx/PXA168 is a High-Speed OTG controller. The available
endpoints is different between PXA9xx and PXA168.
NOTE:
It is the first version of Marvell PXA9xx/PXA168 USB controller driver.
The support for OTG mode will be added in later patch.
PXA9xx and PXA168 has integrated UTMI PHY in the chips. The initialization
for the PHY is a little different between PXA9xx and PXA168.
Signed-off-by: Chao Xie <chao.xie@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b48d7f50e6f16478304170eaf5c2d1a540ba5e31
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 30 17:57:02 2010 +0900
usb: Add in missing EHCI helpers.
Several of the EHCI glue drivers either predate or were merged in the
same timeframe as API changes at the USB core level, resulting in some
missing endpoint_reset and clear_tt_buffer_complete callbacks.
This fixes up all of ehci-atmel, mxc, w90x900, and xilinx-of to tie in
the new helpers, which brings them in line with everyone else.
Reported-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7fc56f0d9908fe140a01387d59954e3d0a2e7744
Author: Luo Andy <yifei.luo@xxxxxxxxx>
Date: Tue Nov 23 10:41:21 2010 +0800
usb: gadget: langwell_udc: add usb test mode support
This patch adds test mode support for Langwell gadget driver.
Signed-off-by: Henry Yuan <hang.yuan@xxxxxxxxx>
Signed-off-by: Andy Luo <yifei.luo@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b23f2f94136884ebeb1b5e2196f4a53086444afa
Author: Hao Wu <hao.wu@xxxxxxxxx>
Date: Mon Nov 29 15:17:03 2010 +0800
usb: composite gadget: set vbus_draw current limitation during suspend
This patch modifies the composite gadget to set vbus_draw current limitation
during suspend state. This current limitation in suspend state shouldn't be
more than 2.5mA
Signed-off-by: Hao Wu <hao.wu@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c3d6450e741da08c3bc2e2ba06d743c27540abac
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date: Tue Nov 30 17:58:25 2010 +0200
usb: otg: twl4030-usb: Fix unbalanced regulator disables at module removal
Function twl4030_usb_remove can cause unbalanced regulator disables in
twl4030_phy_power if the cable is not connected. Regulator enable/disable
calls are in balance only if the twl4030_phy_resume was called prior the
twl4030_usb_remove, that is, the cable was connected.
Fix this by checking the 'asleep' variable in twl4030_usb_remove since that
variable is used to check state in other functions.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Cc: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 02303f73373aa1da19dbec510ec5a4e2576f9610
Author: Dan Williams <dcbw@xxxxxxxxxx>
Date: Fri Nov 19 16:04:00 2010 -0600
usb-wwan: implement TIOCGSERIAL and TIOCSSERIAL to avoid blocking close(2)
Some devices (ex ZTE 2726) simply don't respond at all when data is sent
to some of their USB interfaces. The data gets stuck in the TTYs queue
and sits there until close(2), which them blocks because closing_wait
defaults to 30 seconds (even though the fd is O_NONBLOCK). This is
rarely desired. Implement the standard mechanism to adjust closing_wait
and let applications handle it how they want to.
Signed-off-by: Dan Williams <dcbw@xxxxxxxxxx>
commit 73f35c60d5c4a98061fc0f94505bf26fd4bb1a1c
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:10:52 2010 +0100
USB: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/usb/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
commit b17ea167c5fb50dcd5dce5b874a467f04eec886d
Author: Pete Zaitcev <zaitcev@xxxxxxxxxx>
Date: Tue Nov 16 21:51:19 2010 -0700
usbmon: correct length for isochronous
Usually the usbmon returns the amount of data specified in
urb->transfer_buffer_length for output submissions and urb->actual_length
for input callbacks. However, for Isochronous input transfers, this is
not enough, since the returned data buffer may contain "holes".
One easy way to fix this is to use urb->transfer_buffer_length,
but this often transfers a whole lot of unused data, so we find
how much was actually used instead.
Original patch by Márton Németh. See also kernel bug 22182.
Signed-off-by: Pete Zaitcev <zaitcev@xxxxxxxxxx>
Signed-off-by: Márton Németh <nm127@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 33069739d1c2f03734d5b5b003593e9552d412c1
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:30:00 2010 -0800
msm: iommu: Miscellaneous code cleanup
Remove some unneeded assignments and messages, restructure
a failure path in iova_to_phys, and make __flush_iotlb
return int in preparation for adding IOMMU clock control.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 100832c9b6adb3d63407416931caeba3f3b9a777
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Mon Nov 15 18:20:08 2010 -0800
msm: iommu: Support cache-coherent memory access
Add support for allowing IOMMU memory transactions to be
cache coherent, eliminating the need for software cache
management in certain situations. This can lead to
improvements in performance and power usage, assuming the
multimedia core's access pattern exhibits spatial locality
and that its working set fits into the cache.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 08bd6839783319085ee0db4c888534e626225774
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Mon Nov 15 18:19:35 2010 -0800
msm: iommu: Definitions for extended memory attributes
Add the register field definitions and memory attribute
definitions that will be needed to support IOMMU
transactions with cache-coherent memory access.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 0ab84745ef65043a616b36b26bec58e1cb62a742
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:57 2010 -0800
msm: iommu: Kconfig dependency for the IOMMU API
Make the IOMMU driver select the IOMMU API in the kernel
configuration.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 00d4b2bb03b9ed27f28336b0a68f2bd7f67caa40
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:56 2010 -0800
msm: iommu: Check if device is already attached
An IOMMU device can only be attached to one IOMMU domain at
any given time. Check whether the device is already
attached to a domain before allowing it to be attached to
another domain. If so, return busy.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 2607b0a26094b2d2d174c3e27b2ecc9c49d86f40
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Mon Nov 15 17:46:10 2010 -0800
msm: iommu: Kconfig item for cacheable page tables
Add a Kconfig item to allow the IOMMU page tables to be
coherent in the L2 cache. This generally reduces IOTLB miss
latencies and has been shown to improve multimedia
performance.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit b7a5100bc29c2cc252bf6f1e247ae14fd733fbb8
Merge: 8244272341f00cab845cabc445dbd3665fc01f87 07a8cdd2bb17a4da68136d963b8bc71959bd31a5
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 30 15:52:04 2010 -0800
Merge branch 'for-greg' of git://gitorious.org/usb/usb into work
commit 8244272341f00cab845cabc445dbd3665fc01f87
Merge: abf03184a31a3286fc0ab30f838ddee8ba9f9b7b 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 30 15:38:41 2010 -0800
Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into work
commit 5b1c144475a7f2d0ab34d0b9b8414ab18b02a283
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Tue Nov 30 17:48:53 2010 -0200
perf debug: Simplify trace_event
No need to check that many times if debug_trace is on.
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 12c7a35ee6a1c605e740733f2cbd5b5079f09f0f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 14:53:05 2010 -0800
sparc: Delete prom_*getchar().
Completely unused.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 52aa8c539dad56728527de664f368915ff44badf
Merge: 55a4e78952286d498d89a399d845e7cfaa8ddd56 032a6424aeea7333a8dafc8cc05dd10b09c62680
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Nov 30 14:46:36 2010 -0800
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus
commit 55a4e78952286d498d89a399d845e7cfaa8ddd56
Merge: 9c7bc451e41abf78b0fd856a9f916f7d39e26297 27b1fec2caa668c162cd1a862c69e087df277fae
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Nov 30 14:45:49 2010 -0800
Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
commit e62cac1fd035b4cde707285008499dbe71955a86
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 14:33:29 2010 -0800
sparc: Pass buffer pointer all the way down to prom_{get,put}char().
This gets us closer to being able to eliminate the use
of dynamic and stack based buffers, so that we can adhere
to the "no buffer addresses above 4GB" rule for PROM calls.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d9bc6dc5b6b9cc9299739f0245ce4841f066b92
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 29 15:47:09 2010 -0500
SELinux: merge policydb_index_classes and policydb_index_others
We duplicate functionality in policydb_index_classes() and
policydb_index_others(). This patch merges those functions just to make it
clear there is nothing special happening here.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit ac76c05becb6beedbb458d0827d3deaa6f479a72
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 29 15:47:09 2010 -0500
selinux: convert part of the sym_val_to_name array to use flex_array
The sym_val_to_name type array can be quite large as it grows linearly with
the number of types. With known policies having over 5k types these
allocations are growing large enough that they are likely to fail. Convert
those to flex_array so no allocation is larger than PAGE_SIZE
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 23bdecb000c806cf4ec52764499a600f7200d7a9
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 29 15:47:09 2010 -0500
selinux: convert type_val_to_struct to flex_array
In rawhide type_val_to_struct will allocate 26848 bytes, an order 3
allocations. While this hasn't been seen to fail it isn't outside the
realm of possibiliy on systems with severe memory fragmentation. Convert
to flex_array so no allocation will ever be bigger than PAGE_SIZE.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit c41ab6a1b9028de33e74101cb0aae13098a56fdb
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 29 15:47:09 2010 -0500
flex_array: fix flex_array_put_ptr macro to be valid C
Using flex_array_put_ptr() results in a compile error "error: lvalue
required as unary â??&â?? operand" fix the casting order to fix this.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit c9e86a9b95f198d7df49b25fcd808ee39cba218f
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Mon Nov 29 15:46:39 2010 -0500
SELinux: do not set automatic i_ino in selinuxfs
selinuxfs carefully uses i_ino to figure out what the inode refers to. The
VFS used to generically set this value and we would reset it to something
useable. After 85fe4025c616 each filesystem sets this value to a default
if needed. Since selinuxfs doesn't use the default value and it can only
lead to problems (I'd rather have 2 inodes with i_ino == 0 than one
pointing to the wrong data) lets just stop setting a default.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Acked-by: James Morris <jmorris@xxxxxxxxx>
commit 7ae9f23cbd3ef9daff7f768da4bfd4c56b19300d
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 11:40:09 2010 -0500
selinux: rework security_netlbl_secattr_to_sid
security_netlbl_secattr_to_sid is difficult to follow, especially the
return codes. Try to make the function obvious.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 4b02b524487622ce1cf472123899520b583f47dc
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 11:40:08 2010 -0500
SELinux: standardize return code handling in selinuxfs.c
selinuxfs.c has lots of different standards on how to handle return paths on
error. For the most part transition to
rc=errno
if (failure)
goto out;
[...]
out:
cleanup()
return rc;
Instead of doing cleanup mid function, or having multiple returns or other
options. This doesn't do that for every function, but most of the complex
functions which have cleanup routines on error.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit b77a493b1dc8010245feeac001e5c7ed0988678f
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 11:40:08 2010 -0500
SELinux: standardize return code handling in selinuxfs.c
selinuxfs.c has lots of different standards on how to handle return paths on
error. For the most part transition to
rc=errno
if (failure)
goto out;
[...]
out:
cleanup()
return rc;
Instead of doing cleanup mid function, or having multiple returns or other
options. This doesn't do that for every function, but most of the complex
functions which have cleanup routines on error.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 9398c7f794078dc1768cc061b3da8cdd59f179a5
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 11:40:08 2010 -0500
SELinux: standardize return code handling in policydb.c
policydb.c has lots of different standards on how to handle return paths on
error. For the most part transition to
rc=errno
if (failure)
goto out;
[...]
out:
cleanup()
return rc;
Instead of doing cleanup mid function, or having multiple returns or other
options. This doesn't do that for every function, but most of the complex
functions which have cleanup routines on error.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 9c7bc451e41abf78b0fd856a9f916f7d39e26297
Merge: 2862945bf5262d516583477ce420a2f122306f43 662b083a87a3489f3f19c6e0651c1b99b0de5df0 1cb125caf2e0fdece14f72efbb3516f5c5fe1de9
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue Nov 30 14:13:15 2010 -0800
Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus
commit ad9c2b048b605fbc8d50526e330b88abdd631ab2
Author: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 30 11:06:47 2010 +0900
security: Fix comment of security_key_permission
Comment for return value of security_key_permission() has been wrong
since it was added in 2.6.15.
Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 662b083a87a3489f3f19c6e0651c1b99b0de5df0
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Tue Nov 30 14:11:49 2010 -0800
omap: Serial: Define register access modes in LCR
Access to some registers depends on register access mode
Three different modes are available for OMAP (at least)
â?¢ Operational mode LCR_REG[7] = 0x0
â?¢ Configuration mode A LCR_REG[7] = 0x1 and LCR_REG[7:0]! = 0xBF
â?¢ Configuration mode B LCR_REG[7] = 0x1 and LCR_REG[7:0] = 0xBF
Define access modes and remove redefinitions and magic numbers
in serial drivers (and later in bluetooth driver).
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Acked-by: Govindraj.R <govindraj.raja@xxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 498cb95175c29ed96bf32f30df2d11ec1c7f3879
Author: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Date: Tue Nov 30 14:11:49 2010 -0800
OMAP: Serial: Define OMAP uart MDR1 reg and remove magic numbers
Define MDR1 register serial definitions used in serial and
bluetooth drivers.
Change magic number to ones defined in serial_reg for omap1/2
serial driver.
Remove redefined MDR1 register definitions in omap-serial driver.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Acked-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
Acked-by: Govindraj.R <govindraj.raja@xxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 5c891f3840a7a330c96d7203d4bb5be6fa033724
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:55 2010 +0000
perf session: Allocate chunks of sample objects
The ordered sample code allocates singular reference objects struct
sample_queue which have 48byte size on 64bit and 20 bytes on 32bit. That's
silly. Allocate ~64k sized chunks and hand them out.
Performance gain: ~ 15%
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.398713983@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit f6f41eb9ccc0e6fad0ccba4c5e0a97de935db734
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:54 2010 -0800
msm: iommu: Don't flush page tables if no devices attached
Don't flush the page tables on an IOMMU domain if there are
no IOMMU devices attached to the domain. The act of
attaching to the domain will cause an implicit flush of
those areas if the page tables are configured to not be L2
cacheable.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 020bb75a6deeca5ebeae531dc7378c157affc8fd
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:53 2010 +0000
perf session: Cache sample objects
When the sample queue is flushed we free the sample reference objects. Though
we need to malloc new objects when we process further. Stop the malloc/free
orgy and cache the already allocated object for resuage. Only allocate when
the cache is empty.
Performance gain: ~ 10%
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.338488630@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 516cbc793eb4be5123289d067b54dfcdabeddb25
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:53 2010 -0800
msm: iommu: Mark functions with the right section names
Mark the init and exit functions as __init and __exit where
appropriate.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit e8952e3b32701817705b216b492a9be4fa5cbefc
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:52 2010 -0800
msm: iommu: Support for the 2nd GFX core's IOMMU
Add the platform data and resources needed for the second
2D graphics core's IOMMU.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit ff25ff842ea6afd58ccc2e3f386ee5ac540b6a63
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:51 2010 -0800
msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings
Based on recommendations from chip designers,
optimize the Machine ID to translation context
mappings for the first 2D core's IOMMU. Remove the
"gfx2d0_texv3_smmu" context, as it is no longer needed
under the new mapping scheme.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit fe17420784a6d3602e98f798731369fa05936cbe
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:49 2010 +0000
perf session: Keep file mmaped instead of malloc/memcpy
Profiling perf with perf revealed that a large part of the processing time is
spent in malloc/memcpy/free in the sample ordering code. That code copies the
data from the mmap into malloc'ed memory. That's silly. We can keep the mmap
and just store the pointer in the queuing data structure. For 64 bit this is
not a problem as we map the whole file anyway. On 32bit we keep 8 maps around
and unmap the oldest before mmaping the next chunk of the file.
Performance gain: 2.95s -> 1.23s (Faktor 2.4)
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.278787719@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 55b44629f599a2305265ae9c77f9d9bcfd6ddc17
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:46 2010 +0000
perf session: Use sensible mmap size
On 64bit we can map the whole file in one go, on 32bit we can at least map
32MB and not map/unmap tiny chunks of the file.
Base the progress bar on 1/16 of the data size.
Preparatory patch to get rid of the malloc/memcpy/free of trace data.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.213687773@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit d6513281c5f728d138ba895d600b9788e51508b1
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:44 2010 +0000
perf session: Simplify termination checks
No need to check twice.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.152886642@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 85b99952ccd3d84707661d8ae103c710daca1c8a
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:41 2010 +0000
perf session: Move ui_progress_update in __perf_session__process_events()
The progress bar is changed when the file offset changes. This happens only
when the next mmap is done. No need to call ui_progress_update() for every
event.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.094836523@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 0331ee0cf4187dcdc2b184cf701d8b58bf9ff637
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:38 2010 +0000
perf session: Cleanup __perf_session__process_events()
Replace the pseudo C++ self argument with session and give the mmap related
variables a sensible name. shift is a complete misnomer - it took me several
rounds of cursing to figure out that it's not a shift value.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163820.029687218@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit a5fcd5f59a2658a579533d6774e871aea7ab5e92
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:50 2010 -0800
msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings
Based on recommendations from chip designers,
optimize the Machine ID to translation context
mappings for the 3D core's IOMMU. Remove the
the "gfx3d_smmu" context device, as it is no longer
needed under the new mapping scheme.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
[dwalker@xxxxxxxxxxxxxx: updated commit text]
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 28990f75e66b36faf6ce56747890009d4e250243
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:35 2010 +0000
perf session: Use appropriate pointer type instead of silly typecasting
There is no reason to use a struct sample_event pointer in struct sample_queue
and type cast it when flushing the queue.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163819.969462809@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 12943325cda3be10819e047cd8b5032a4fef6080
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:49 2010 -0800
msm: iommu: Use more consistent naming in platform data
Rename all the IOMMU platform devices so that the names are
more consistent with the rest of the codebase.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit c4bd2eebee37b885b47ec48961923b671148703f
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:48 2010 -0800
msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU
Add register addresses and IRQ numbers for the IOMMU used
for the second 2D graphics core.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 23513c3b39207c569da2c8afdced62ec43b4a272
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:29:47 2010 -0800
msm: iommu: Increase maximum MID size to 5 bits
On msm8x60, the MID field on the AXI connection to the
IOMMU can be up to five bits wide. Thus, allow the IOMMU
context platform data to map up to 32 MIDs.
Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit a1225decc43849a73f7e4c333c3fdbbb8a9c1e65
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 30 17:49:33 2010 +0000
perf session: Fix list sort algorithm
The homebrewn sort algorithm fails to sort in time order. One of the problem
spots is that it fails to deal with equal timestamps correctly.
My first gut reaction was to replace the fancy list with an rbtree, but the
performance is 3 times worse.
Rewrite it so it works.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <20101130163819.908482530@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 70cc2c00d7471f21120befeb7fc107c856e3985b
Author: Gregory Bean <gbean@xxxxxxxxxxxxxx>
Date: Wed Nov 24 11:53:52 2010 -0800
msm: gpio: Add irq support to v2 gpiolib.
Complete the MSM v2 gpio subsystem by adding irq_chip.
Signed-off-by: Gregory Bean <gbean@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582
Author: Gregory Bean <gbean@xxxxxxxxxxxxxx>
Date: Wed Nov 24 11:53:51 2010 -0800
msm: gpio: Add v2 gpio support to MSM SoCs.
Beginning with the MSM8x60, the hardware block responsible for gpio
support changes. Provide gpiolib support for the new v2 architecture.
Cc: Baruch Siach <baruch@xxxxxxxxxx>
Cc: Pavan Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Gregory Bean <gbean@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 1cb125caf2e0fdece14f72efbb3516f5c5fe1de9
Author: Srinath <srinath@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 16 14:26:58 2010 -0800
omap: AM3517/05: Add craneboard support
Craneboard is a hardware development platform based on the
Sitara AM3517 ARM Cortex - A8 microprocessor device. This is a
low cost reference design.
This patch adds basic board file. Detailed support will follow in
subsequent patches.
[1] http://www.ti.com/arm
[2] http://www.mistralsolutions.com/products/craneboard.php
Signed-off-by: Srinath <srinath@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 9632f9890e76aa7a78f719b0b3b572f65e3e968b
Author: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Date: Tue Nov 16 14:26:57 2010 -0800
OMAP1: drop AMS_DELTA_FIQ config option
This patches removes a config option that was used to select a FIQ
handler to be build for Amstrad Delta, as required by the on-board serio
interface driver. Not having any problem reports received since it was
introduced in 2.6.35, the FIQ handler can now be built and initialized by
default, thus reqiring no extra config option.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit c6c4dea4011278f03ab8a3c8329fba9098d2a892
Author: Felipe Balbi <balbi@xxxxxx>
Date: Mon Nov 8 06:56:15 2010 +0000
arm: omap: zoom: substitute gpio number with symbolic name
It's easier to understand what that number means and
also avoids problems if we ever have to change it.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 20826853853aa1e1ba219ea65f1e6ba3bd662495
Author: Felipe Balbi <balbi@xxxxxx>
Date: Mon Nov 8 06:56:14 2010 +0000
arm: omap: combine zoom2 and zoom3 board-files
They are extremely similar anyway, let's get rid
of one file.
While at that, also remove the empty zoom_config
variable.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 235228ba21e34ba732b413c12259bac386f83283
Author: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Date: Sat Oct 23 16:49:00 2010 +0000
omap3: IGEP v2: Improve igep2_flash_init() function
The changes are:
- Use 'for' loop instead 'while' loop.
- No need to initialize ret to 0, we're assigning it right after.
- No need to check for onenandcs < GPMC_CS_NUM here, it will always be true.
Signed-off-by: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit ae3e033362430f2684bb3519456c88d14e182f01
Author: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Date: Sat Oct 23 16:48:59 2010 +0000
omap3: IGEP v2: Remove igep2_config array
omap_board_config_size is implicitly initialized to 0 in
plat-omap/common.c, get_config() won't dereference omap_board_config,
so we can remove the empty igep2_config array.
Signed-off-by: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit c320c7b7d380e630f595de1236d9d085b035d5b4
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Wed Oct 20 12:50:11 2010 -0200
perf events: Precalculate the header space for PERF_SAMPLE_ fields
PERF_SAMPLE_{CALLCHAIN,RAW} have variable lenghts per sample, but the others
can be precalculated, reducing a bit the per sample cost.
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 6aa85a5ae610106d89e50c7e1f760c56d12f9bc4
Author: Keshava Munegowda <keshava_mgowda@xxxxxx>
Date: Sun Nov 21 23:23:42 2010 +0530
omap4: 4430sdp: enable the ehci port on 4430SDP
The OMAP4 SDP has an SMSC3320 PHY hooked up to EHCI on Port1.
The PHY power is controlled by GPIO 157.
Turn on the PHY power, and register the controller at init.
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 56976b6ac4047ec456e2ba7e516ed2e9d96c3acf
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:42 2010 +0530
arm: omap4: select USB_ARCH_HAS_EHCI
The OMAP4 has an on-chip EHCI controller. Select USB_ARCH_HAS_EHCI
to allow the EHCI driver to be built on OMAP4.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit becf0737cf25bd0084ed85ccb1ab6c902e600a3c
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
arm: omap4: usb: add platform init code for EHCI
- Add platform init code for EHCI on OMAP4
- Add pad configuration for PHY and TLL modes
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 811406c2e69281b0e498d25a42902817299b6b3d
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
arm: omap4: add USBHOST and related base addresses
Add base addresses for USBHOST, USBTLL, EHCI and OHCI to
the header file.
This will disappear when the drivers are converted to use
the hwmod database, however this patch is needed until then.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 4792a15bf0f388838c3e16636f961c99bc2f3572
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:42 2010 +0530
usb: ehci-omap: Add OMAP4 support
Update the ehci-omap glue layer to support the controller in the
OMAP4. Major differences from OMAP3 is that the OMAP4 has per-port
clocking, and supports ULPI output clocking mode. The old input
clocking mode is not supported.
Also, there are only 2 externally available ports as against 3
in the OMAP3. The third port is internally tied off and should
not be used.
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
commit 1ed85659a29287bda958a9429461f4a1b0a033be
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
omap: usb: ehci: introduce HSIC mode
The EHCI controller in OMAP4 supports a new interface mode - HSIC.
Add this to the list of modes supported on OMAP3.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit a42ccdc14de388a35ad0e8057543369351395eb9
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
usb: ehci-omap: add helpers for checking port mode
Introduce helper functions to test port mode. These checks are
performed in several places in the driver, and these helpers
improve readability.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
commit c5dff5545c97ab33bdb2a529a2375966ceb0700c
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
usb: ehci-omap: use clkdev aliases for functional clocks
Use the recently updated aliases to get functional clocks needed by
the driver. This allows the driver to acquire OMAP4-specific clocks
without having to use different clock names for OMAP3 and OMAP4.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
commit 5467e16d891090d54d036044e66f94b89b1c3683
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
omap: clock: add clkdev aliases for EHCI clocks
Add clkdev aliases for the USBHOST and USBTLL clocks on OMAP3 and
OMAP4, so that the driver can refer to the clocks using a common alias.
This will disappear when the driver is converted to use the hwmod
database, but until then this patch is needed.
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7f124f4b353672bc150af959910cfc2a9778260a
Author: Keshava Munegowda <keshava_mgowda@xxxxxx>
Date: Sun Nov 21 23:23:41 2010 +0530
usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP
Introduce the CONFIG_USB_EHCI_HCD_OMAP option to select
EHCI support on OMAP3 and later chips. This scales better
than having a long line of dependencies for each new OMAP
with EHCI support.
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
commit c072604115ab50d023eb5c33d4f3229400e441f4
Author: Keshava Munegowda <keshava_mgowda@xxxxxx>
Date: Sun Nov 21 23:23:40 2010 +0530
usb: ehci-omap: don't hard-code TLL channel count
Make the TLL channel count a parameter instead of a hardcoded
value. This allows us to be flexible with future OMAP revisions
which could have a different number of channels.
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
commit 6dba39e278b81665a838f37a75fe37b89f3ce610
Author: Keshava Munegowda <keshava_mgowda@xxxxxx>
Date: Sun Nov 21 23:23:40 2010 +0530
usb: ehci-omap: update clock names to be more generic
Rename usbhost2_120m_fck to usbhost_hs_fck and usbhost1_48m_fck
to usbhost_fs_fck, to better reflect the clocks' functionalities.
In OMAP4, the frequencies for the corresponding clocks are not
necessarily the same as with OMAP3, however the functionalities
are.
Signed-off-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
commit ba03864872691c0bb580a7fb47388da337ef4aa2
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Tue Nov 30 15:14:48 2010 -0500
cifs: fix parsing of hostname in dfs referrals
The DFS referral parsing code does a memchr() call to find the '\\'
delimiter that separates the hostname in the referral UNC from the
sharename. It then uses that value to set the length of the hostname via
pointer subtraction. Instead of subtracting the start of the hostname
however, it subtracts the start of the UNC, which causes the code to
pass in a hostname length that is 2 bytes too long.
Regression introduced in commit 1a4240f4.
Reported-and-Tested-by: Robbert Kouprie <robbert@xxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Cc: Wang Lei <wang840925@xxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 3f419d2d487821093ee46e898b5f8747f9edc9cd
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 29 13:37:14 2010 -0800
inet: Turn ->remember_stamp into ->get_peer in connection AF ops.
Then we can make a completely generic tcp_remember_stamp()
that uses ->get_peer() as a helper, minimizing the AF specific
code and minimizing the eventual code duplication when we implement
the ipv6 side of TW recycling.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b3419363808f2481b24a817f491878e1795db4c7
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:27:11 2010 -0800
ipv6: Add infrastructure to bind inet_peer objects to routes.
They are only allowed on cached ipv6 routes.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 672f007d65f50468a4a1e55825fe58e5b035324d
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:20:00 2010 -0800
inetpeer: Add inet_getpeer_v6()
Now that all of the infrastructure is in place, we can add
the ipv6 shorthand for peer creation.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 021e9299113363cc1b713f86b2cba30b8e6cb5dd
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:12:23 2010 -0800
inetpeer: Add v6 peers tree, abstract root properly.
Add the ipv6 peer tree instance, and adapt remaining
direct references to 'v4_peers' as needed.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 026630450244b8f8d1baf54548be0800aa1823ed
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 12:08:53 2010 -0800
inetpeer: Abstract address comparisons.
Now v4 and v6 addresses will both work properly.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b534ecf1cd26f094497da6ae28a6ab64cdbe1617
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 11:54:19 2010 -0800
inetpeer: Make inet_getpeer() take an inet_peer_adress_t pointer.
And make an inet_getpeer_v4() helper, update callers.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 582a72da9a41be9227dc931d728ae2906880a589
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 11:53:55 2010 -0800
inetpeer: Introduce inet_peer_address_t.
Currently only the v4 aspect is used, but this will change.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 98158f5a853cafd33b254ae0eacc0dd69f90b93b
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 30 11:41:59 2010 -0800
inetpeer: Abstract out the tree root accesses.
Instead of directly accessing "peer", change to code to
operate using a "struct inet_peer_base *" pointer.
This will facilitate the addition of a seperate tree for
ipv6 peer entries.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 61790c5f3c5f158821821a00797d94504531839f
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Tue Nov 30 15:33:40 2010 +0100
iwlagn: fix microcode error on 4965
Commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 "iwlwifi: use
antenna information in EEPROM" caused 4965 device breakage with
"Microcode SW error detected. Restarting 0x82000000." message.
This patch reverts 4965 part of that commit.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 08ca944eb240b2299e743c76b43fbc7c2dd251de
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Tue Nov 30 12:19:34 2010 +0100
mac80211: Minor optimization in ieee80211_rx_h_data
Remove a superfluous ieee80211_is_data check as that was checked a few
lines before already and we wont't get here for non-data frames at all.
Second, the frame was already converted to 802.3 header format and
reading the fc and addr1 fields was only possible because the 802.3
header is short enough and didn't overwrite the relevant parts of the
802.11 header. Make the code more obvious by checking the ethernet
header's h_dest field.
Furthermore reorder the conditions to reduce the number of checks
when dynamic powersave is not needed (AP mode for example).
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 20ed3166c84d145589a89d8cde12aa32cf2d17f4
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date: Tue Nov 30 16:49:23 2010 +0100
mac80211/rt2x00: add ieee80211_tx_status_ni()
All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from
a workqueue, which causes "NOHZ: local_softirq_pending 08" messages.
To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni()
which can be called from process context, and call it from
rt2x00lib_txdone(). For the rt2800pci special case a driver
flag is introduced.
Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4352fab5c2a1a602447d711c84d149bf2f0bc7ba
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:53:28 2010 +0200
ath5k: Set turbo bit on rf bank 2
* A diff between rfbuffer settings of turbo and non-turbo
modes indicates there is a bit on bank 2 related to turbo operation
(it's set on turbo modes). This bit is present on all radios except
RF5413 that seems to have a completely different bank 2. Also
since 2317 has the same rf-registers locations with 2425 and
since the bit exists on 2317 I assume it also exists on 2425/2417).
So in case we use turbo mode (40MHz) enable it on bank modification.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8c2b418a07b4dc77d7efadb890ba9ad1a4161c3f
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:51:38 2010 +0200
ath5k: Clean up turbo mode initvals/rfregs
* Clean up what's left of turbo mode, since we handle all
register modifications (rfbuffer comes next) on code there
is no need to have duplicated arrays.
* Rename change_channel to skip_pcu on initvals.c as we did
on reset.c
Signed-off-by: Nick Kossifidis <micklfemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit acb091d67c5c9649cf5d25055ef6fd64239a6762
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:49:53 2010 +0200
ath5k: Cleanup turbo channel flags
* Clean up CHANNEL_T(URBO), use AR5K_BWMODE_40MHZ instead
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 73a06a683455f472cc09ad249064c66a41e29e39
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:48:32 2010 +0200
ath5k: Use correct clock when setting ofdm timings
* Use correct clock value when setting OFDM timings on
non-default bwmodes.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3bb17654605965226e5b322dbc22ece5ff354ac5
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:45:21 2010 +0200
ath5k: Skip tx power setting on AR5210 for now
* Don't return -EINVAL when trying to set tx power
on RF5110 because AR5210 reset will fail. We need to
add support for RF5110 and AR5210 eeprom in the future
but for now just skip it.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b02f5d1a17c652a74098f2a04db7fb8e6220057e
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:44:02 2010 +0200
ath5k: Tweak phy activate to rx start delay based on bwmode
* Tweak phy activation -> rx delay for different bwmodes
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c2b0ebef262e0a9b64f7ea8ec837cfc29605bef7
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:42:22 2010 +0200
ath5k: No need to save/restore staid flags on reset
* Since we set antenna flags on phy init and ack bitrate
mode on pcu init, there is no need to save/restore sta_id
flags on ath5k_hw_reset. Also we don't need to re-set our
mac address because it's not affected by resets.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8aec7af99b1e4594c4bb9e1c48005e6111f97e8e
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:39:28 2010 +0200
ath5k: Support synth-only channel change for AR2413/AR5413
* Add synth-only channel change for AR2413/5413. When we call
ath5k_reset with a channel ath5k_hw_reset will first try to
set channel on PHY while PHY is running instead of doing a normal
full reset. To do this phy_init has to change to implement this
functionality.
* Clean up change_channel flag, what it really did was skip PCU
registers when setting initvals. This is done because on reset
PCU registers are not affected (except the registers we set
in pcu init and -due to hw problems- TSF). Use a new skip_pcu
flag that's not misleading instead. In the future we might use
that to also skip PCU reset and save us the TSF etc problems
(needs testing because standard practice is to reset everything).
* Use fast channel change only when setting channel, and set skip_pcu
to false only on init. When we reset the card due to DMA or PHY
problems skip pcu but never do a fast channel change.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4c57581d939fd0f8f244b9730812069f4dac308a
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:37:30 2010 +0200
ath5k: Skip powertable setting when we are on the same channel
* Only set power table if we are changing channel/mode
there is no need to recalculate and reset the power table
all the time.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f08fbf6cf4a31c8df52b21440c7a7e6fbe474b28
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:33:22 2010 +0200
ath5k: Update PLL programming for turbo/half/quarter
* Set correct PLL settings for each bwmode
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a2677fe4298c61f0e93c063e59815bf21c530c4a
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:28:15 2010 +0200
ath5k: Update spur mitigation filter for turbo/half/quarter
* Add spur mitigation filter support for half/quarter and turbo.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b2b4c69f682a2868411899a77842061dd745884f
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:26:13 2010 +0200
ath5k: Tweak power detector delays on RF5111/RF5112
* Tweak power detector delays on AR5111/AR5112 when
using half/quarter modes.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 71ba1c30851575b43ba76b0f9c26ff5567e8136c
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:24:54 2010 +0200
ath5k: Always set IFS intervals on reset
* Make sure we always set IFS timings even if no
coverage class is set. If we don't we'll miss the
needed changes for different bwmodes.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 473cae27620c27377e278a6f92aaa483060e3c19
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:21:50 2010 +0200
ath5k: Use turbo flag on DCU
* Set AR5K_DCU_GBL_IFS_MISC_TURBO_MODE flag on DCU when operating
on 40MHz
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit eeb8832b3181d6ca8593051b68c466e5d2653bb3
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:19:45 2010 +0200
ath5k: Set all IFS intervals, not just slot time
* Replace set_slot_time with set_ifs_intervals that also sets
the various inter-frame space intervals based on current bwmode.
* Clean up AR5210 mess from reset_tx_queue, AR5210 only has one
data queue and we set IFS intervals for that queue on set_ifs_intervals
so there is nothing left to do for 5210 on reset_tx_queue.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 61cde037234c4b8e6497a23f5f236c64cbf9d41d
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:12:23 2010 +0200
ath5k: Extend rate_duration
* Extend ieee80211_generic_frame_duration to support the various
bwmodes.
* Better document what's going on with ack bitrates and update
write_rate_duration to support the standard ack bitrates (when
we don't set the high bit).
* Get rid of set_ack_bitrate_high and introduce a flag on ath5k_hw
for this (we only called the function on init anyway so there is no
difference).
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3017fcab416d8d1ee48ca16aa9a3062f600dab8e
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:09:11 2010 +0200
ath5k: Extend get_default_sifs/slot_time
* Extend get_default_sifs/slot_time to include timings for turbo
half and quarter rate modes.
* AR5210 code for now uses timings already on core clock units
instead of usecs so rename them (we 'll clean it up later).
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 25ddfa195735934256fda55bb4f2d749c19386ff
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:07:04 2010 +0200
ath5k: Move tx retries setting outside reset_tx_queue
* Move setting of tx retry limits on a separate function
(we 'll clean up this AR5210 mess later)
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b405086ba47678a5b8f6e7cd835a3d27ebb6f744
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:04:43 2010 +0200
ath5k: Increase PHY settling parameters for turo mode
* On turbo mode increase PHY settling times, note that
we only increase switch settling time on AR5212 as indicated
by initvals.
* A few cleanups: Move frame control settings for AR5210 from
reset_tx_queue to tweak_initvals and remove phy_scal settings
from tweak_initvals (we tweak them alread on set_sleep_clock).
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 325089ab5847f5c1e43f42bb90d32f981867c4c1
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:02:20 2010 +0200
ath5k: Small cleanup on tweak_initvals
* Now that we properly set rx/tx latencies for AR5311 remove
that old buggy part of code left inside ath5k_hw_tweak_initval_settings
that was never executed (you can't have an RF5112 radio on a mac older
than AR5212). Also use a magic value for 5311 PHY_SCAL value.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c297560206adf0cda8ce38ef9b20b0a025754c4d
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 21:00:37 2010 +0200
ath5k: Put core clock initialization on a new function
* Handle all usec parameters in one function. It's much cleaner
this way.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fa3d2feeff4723cce8d4722902492d60b7f75fcc
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:58:34 2010 +0200
ath5k: Add new field on ath5k_hw to track bandwidth modes
* Prepare for half/quarter/turbo support, introduce a new
ah_bwmode parameter and get rid of ah_turbo. Bwmode stands
for "bandwidth mode" and can have 4 values, default (20MHz),
turbo (40MHz), half rate (10MHz), and quarter rate (5MHz).
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 14fae2d4b61b890cea58d63091406b86ec9bafcd
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:55:17 2010 +0200
ath5k: Use new function to stop beacon queue
* Since we only use ath5k_hw_stop_tx_dma to stop the beacon
queue, introduce a new function ath5k_hw_stop_beacon_queue so
that we can use that instead and have better control. In the future
we can add more beacon queue specific stuff there (maybe tweak
beacon timers or something), for now just call ath5k_hw_stop_tx_dma.
* Also since we don't call ath5k_hw_stop_rx/tx_dma from outside
dma.c, make them static.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e8325ed87457e07b9ceeb1e7a31df787dd7ee106
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:52:24 2010 +0200
ath5k: Check RXE when setting RXDP
* Make sure we are not trying to set RXDP while RX is active,
for now ignore the return value.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f7317ba2d669c1b54fb31ed7834361a700a79217
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:50:16 2010 +0200
ath5k: Use DCU early termination correctly
* DCU early termination should be used to quickly flush QCU
according to docs so don't enable it for all queues, enable
it only when stopping each queue and disable it when we are
done.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b3a28e68d5c8d788a4e538a119a5d326545add8a
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:47:31 2010 +0200
ath5k: Debug DMA timeouts
* Increase timeouts on ath5k_hw_stop_tx_dma and also wait for
tx queue to stop before checking for pending frames
* Add a new debug level to debug dma start/stop
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 80dac9eecbdb95f61b9b3c7081e02412155982b7
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:45:38 2010 +0200
ath5k: Use new dma_stop function on base.c
* Since we stop rx/tx dma and pcu durring reset there is no need to
call ath5k_hw_stop_rx/tx_dma before, also there is no need to call
them durring stop_locked since we can use ath5k_hw_dma_stop for
both.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e088f23be166635b3938571c00c686094efa7cc4
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:43:18 2010 +0200
ath5k: Stop PCU on reset
* Stop PCU receive logic (DRU) durring reset
We need to be sure pcu is not active when trying to stop rx dma
right now this is done on ath5k_reset (base.c) but later we are
going to clean it up.
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d41174fabdae348c6583cf05aeb329da232c342c
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:41:15 2010 +0200
ath5k: Add new function to stop rx/tx DMA
* Add a new function to stop rx/tx dma and use in when reset starts
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9320b5c4a7260d9593102f378201d17e3f030739
Author: Nick Kossifidis <mickflemm@xxxxxxxxx>
Date: Tue Nov 23 20:36:45 2010 +0200
ath5k: Reset cleanup and generic cleanup
* No functional changes
* Clean up reset:
Introduce init functions for each unit and call them instead
of having everything inside ath5k_hw_reset (it's just c/p for
now so nothing changes except calling order -I tested it with
various cards and it's ok-)
* Further cleanups:
ofdm_timings belongs to phy.c
rate_duration belongs to pcu.c
clock functions are general and belong to reset.c (more to follow)
* Reorder functions for better organization:
We start with helpers and other functions follow in categories,
init functions are last
Signed-off-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ea066d5a91f2610116dcd27054f749e4f07799d8
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Nov 23 20:42:27 2010 +0530
ath9k: Add support for Adaptive Power Management
This feature is to mitigate the problem of certain 3
stream chips that exceed the PCIe power requirements.An EEPROM flag
controls which chips have APM enabled which is basically read from
miscellaneous configuration element of the EEPROM header.
This workaround will reduce power consumption by using 2 Tx chains for
Single and Double stream rates (5 GHz only).All self generated frames
(regardless of rate) are sent on 2 chains when this feature is
enabled(Chip Limitation).
Cc: Paul Shaw <paul.shaw@xxxxxxxxxxx>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Tested-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Tue Nov 30 20:15:39 2010 +0530
ath9k: Fix STA disconnect issue due to received MIC failed bcast frames
AR_RxKeyIdxValid will not be set for bcast/mcast frames and so relying
this status for MIC failed frames is buggy.
Due to this, MIC failure events for broadcast frames are not sent to
supplicant resulted in AP disconnecting the STA.
Able to pass Wifi Test case 5.2.18 with this fix.
Cc: Stable <stable@xxxxxxxxxx> (2.6.36+)
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8e26d5ad2f9c038609d42eebc676cd1107709eef
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Tue Nov 30 20:15:38 2010 +0530
mac80211: Fix STA disconnect due to MIC failure
Th commit titled "mac80211: clean up rx handling wrt. found_sta"
removed found_sta variable which caused a MIC failure event
to be reported twice for a single failure to supplicant resulted
in STA disconnect.
This should fix WPA specific countermeasures WiFi test case (5.2.17)
issues with mac80211 based drivers which report MIC failure events in
rx status.
Cc: Stable <stable@xxxxxxxxxx> (2.6.37)
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit abf03184a31a3286fc0ab30f838ddee8ba9f9b7b
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 29 10:17:22 2010 -0500
USB: fix autosuspend bug in usb-serial
This patch (as1437) fixes a bug in the usb-serial autosuspend
handling. Since the usb-serial core now has autosuspend support, it
must set the .supports_autosuspend member in every serial driver it
registers. Otherwise the usb_autopm_get_interface() call won't work.
This fixes Bugzilla #23012.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
CC: stable@xxxxxxxxxx
Reported-by: Kevin Smith <thirdwiggin@xxxxxxxxx>
Reported-and-tested-by: Simon Gerber <gesimu@xxxxxxxxx>
Reported-and-tested-by: Matteo Croce <matteo@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a85b4e7f4481c5a1ca89fa63c9c871151965075e
Author: Brian J. Tarricone <brian@xxxxxxxxxxxxx>
Date: Sun Nov 21 21:15:52 2010 -0800
USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
Tested on MacBookAir3,1. Without this, we get EPROTO errors when
fetching device config descriptors.
Signed-off-by: Brian Tarricone <brian@xxxxxxxxxxxxx>
Reported-by: Benoit Gschwind <gschwind@xxxxxxxxxxx>
Tested-by: Edgar Hucek <gimli@xxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6fdbad8021151a9e93af8159a6232c8f26415c09
Author: Jacques Viviers <jacques.viviers@xxxxxxxxx>
Date: Wed Nov 24 11:56:38 2010 +0200
USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
Add the PID for the Vardaan Enterprises VEUSB422R3 USB to RS422/485
converter. It uses the same chip as the FTDI_8U232AM_PID 0x6001.
This should also work with the stable branches for:
2.6.31, 2.6.32, 2.6.33, 2.6.34, 2.6.35, 2.6.36
Signed-off-by: Jacques Viviers <jacques.viviers@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 27f485b5b27926878ffc8f528bdefeb25e6bd3d3
Author: Tomoki Sekiyama <tomoki.sekiyama@xxxxxxxxx>
Date: Mon Nov 22 19:29:23 2010 +0900
USB: yurex: add .llseek fop to file_operations
Default llseek operation behavior was changed by the patch named
"vfs: make no_llseek the default" after the yurex driver had been merged,
so the llseek to yurex is now ignored.
This patch add llseek fop with default_llseek to yurex driver
to catch up to the change.
Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 28942bb6a9dd4e2ed793675e515cfb8297ed355b
Author: Michael Stuermer <ms@xxxxxxxxxx>
Date: Thu Nov 18 00:45:43 2010 +0100
USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
Another variant of the RT Systems programming cable for ham radios.
Signed-off-by: Michael Stuermer <ms@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2c31333a8fde7e26936a9f5371d02ff12c490993
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Mon Nov 29 20:53:23 2010 +0100
mac80211: ignore non-bcast mcast deauth/disassoc franes
This patch fixes an curious issue due to insufficient
rx frame filtering.
Saqeb Akhter reported frequent disconnects while streaming
videos over samba: <http://marc.info/?m=128600031109136>
> [ 1166.512087] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
> [ 1526.059997] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
> [ 2125.324356] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
> [...]
The reason is that the device generates frames with slightly
bogus SA/TA addresses.
e.g.:
[ 2314.402316] Ignore 9f:1f:31:f8:64:ff
[ 2314.402321] Ignore 9f:1f:31:f8:64:ff
[ 2352.453804] Ignore 0d:1f:31:f8:64:ff
[ 2352.453808] Ignore 0d:1f:31:f8:64:ff
^^ the group-address flag is set!
(the correct SA/TA would be: 00:1f:31:f8:64:ff)
Since the AP does not know from where the frames come, it
generates a DEAUTH response for the (invalid) mcast address.
This mcast deauth frame then passes through all filters and
tricks the stack into thinking that the AP brutally kicked
us!
This patch fixes the problem by simply ignoring
non-broadcast, group-addressed deauth/disassoc frames.
Cc: Jouni Malinen <j@xxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Reported-by: Saqeb Akhter <saqeb.akhter@xxxxxxxxx>
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cf63495d0dbe435b475a44672f5dee150da6471b
Author: David Kilroy <kilroyd@xxxxxxxxx>
Date: Wed Nov 24 20:33:02 2010 +0000
orinoco: abort scan on interface down
This fixes the problem causing the following trace:
------------[ cut here ]------------
WARNING: at linux-2.6.34/net/wireless/core.c:633 wdev_cleanup_work+0xb7/0xe0 [cfg80211]()
Hardware name: Latitude C840
Pid: 707, comm: cfg80211 Not tainted 2.6.34.7-0.5-desktop #1
Call Trace:
[<c02065c3>] try_stack_unwind+0x173/0x190
[<c02051cf>] dump_trace+0x3f/0xe0
[<c020662b>] show_trace_log_lvl+0x4b/0x60
[<c0206658>] show_trace+0x18/0x20
[<c064e0b3>] dump_stack+0x6d/0x72
[<c02443ae>] warn_slowpath_common+0x6e/0xb0
[<c0244403>] warn_slowpath_null+0x13/0x20
[<e2db5497>] wdev_cleanup_work+0xb7/0xe0 [cfg80211]
[<c025cfa9>] run_workqueue+0x79/0x170
[<c025d123>] worker_thread+0x83/0xe0
[<c025fef4>] kthread+0x74/0x80
[<c0203826>] kernel_thread_helper+0x6/0x10
---[ end trace 3f0348b3b0c6f4ff ]---
Reported by: Giacomo Comes <comes@xxxxxxxx>
Signed-off-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 37a09f07459753e7c98d4e21f1c61e8756923f81
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Nov 30 12:42:34 2010 -0500
NFS: Fix a readdirplus bug
When comparing filehandles in the helper nfs_same_file(), we should not be
using 'strncmp()': filehandles are not null terminated strings.
Instead, we should just use the existing helper nfs_compare_fh().
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 364829b1263b44aa60383824e4c1289d83d78ca7
Author: Slava Pestov <slavapestov@xxxxxxxxxx>
Date: Wed Nov 24 15:13:16 2010 -0800
tracing: Fix panic when lseek() called on "trace" opened for writing
The file_ops struct for the "trace" special file defined llseek as seq_lseek().
However, if the file was opened for writing only, seq_open() was not called,
and the seek would dereference a null pointer, file->private_data.
This patch introduces a new wrapper for seq_lseek() which checks if the file
descriptor is opened for reading first. If not, it does nothing.
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Slava Pestov <slavapestov@xxxxxxxxxx>
LKML-Reference: <1290640396-24179-1-git-send-email-slavapestov@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit 60e677373be9c0bf7c9a22937601d5a40e51c042
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Tue Nov 30 12:50:14 2010 +0100
perf header: Don't assume there's no attr info if no sample ids is provided
This primarily fixes perf-report, which didn't report the correct type
of event if perf-record was called to record one event different from
'cycles':
$ perf record -e instructions true
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.007 MB perf.data (~295 samples) ]
$ perf report | head -n1
# Events: 7 cycles
LPU-Reference: <m3mxor6nex.fsf@xxxxxxxxx>
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
commit d214afbd81405d4da2c5745fe867e6b313fd4178
Author: Ming Lei <tom.leiming@xxxxxxxxx>
Date: Thu Nov 25 19:27:25 2010 +0800
perf symbols: Figure out start address of kernel map from kallsyms
On ARM, module symbol start address is ahead of kernel symbol start address, so
we can't suppose that the start address of kernel map always is zero, otherwise
may cause incorrect .start and .end of kernel map (caused by fixup) when there
are modules loaded, then map_groups__find may return incorrect map for symbol
query.
This patch always figures out the start address of kernel map from
/proc/kallsyms if the file is available, so fix the issues on ARM for module
loaded case.
This patch fixes the following issues on ARM when modules are loaded:
- vmlinux symbol can't be found by kallsyms maps doing 'perf test'
- module symbols are parsed mistakenlly when doing 'perf top'/'perf report'
Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <20101125192725.62d31b42@tom-lei>
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 8a9533123f43f2cdb3eb601c17ff2ad336882eff
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Mon Nov 29 12:44:15 2010 -0200
perf symbols: Fix kallsyms kernel/module map splitting
On ARM, module addresss space is ahead of kernel space, so the module
symbols are handled before kernel symbol in dso__split_kallsyms, then
was causing one map to be created for each kernel symbol.
Reported-by: Ming Lei <tom.leiming@xxxxxxxxx>
Tested-by: Ming Lei <tom.leiming@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Ming Lei <tom.leiming@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <20101124144540.GB15875@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 3b24f0950bc55ca604a9f0da3ca894f9315cb573
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Sun Nov 21 11:24:07 2010 +0800
at91/board-yl-9200: fix typo in video support
for the epson frambuffer support it's CONFIG_FB_S1D13XXX
not CONFIG_FB_S1D135XX
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
commit 214b574ab81236e7740243985d63a1d6a61231a2
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Sat Nov 20 14:52:53 2010 +0800
atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer'
passing argument 2 of 'dma_map_single' discards qualifiers from pointer target type
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
commit 82d5b5c8da769184a9bc2cc2adc90555f4aa90b0
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Sun Nov 21 10:31:19 2010 +0800
at91/picotux200: remove commenting usb device and dataflash support
as based on http://www.picotux.com/pt200/picotux200.pdf
these board does not have such I/O
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
commit 985f554d8f0c2cf5bda5720921cb48654420d6b1
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Fri Nov 19 22:34:38 2010 +0800
at91: rename rm9200ek and rm9200dk board file name
to be a few more concistant with the other boards
as ek is for evaluation kit and dk for development kit
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Andrew Victor <linux@xxxxxxxxxxxx>
commit 55d83b0a6eb61d159a4a6d269745ee019f9f5f91
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Fri Nov 19 22:31:35 2010 +0800
at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Andrew Victor <linux@xxxxxxxxxxxx>
commit 8e79d2d4e7147eb6dfd075d7cb200c666566a9e0
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Fri Nov 19 22:31:03 2010 +0800
at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Andrew Victor <linux@xxxxxxxxxxxx>
commit 8ae8cd978bc773e916e0b51a76fe3f096fa31069
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Fri Nov 19 22:23:28 2010 +0800
at91: Convert remaining boards to new-style UART initialization
Convert the following AT91RM9200-based boards to the new-style UART
initialization:
- Ajeco 1ARM Single Board Computer
- Sperry-Sun KAFA board
- picotux 200
Remove the deprecated at91_init_serial
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Andrew Victor <linux@xxxxxxxxxxxx>
commit 47a25380e37f44db7202093ca92e4af569c34f55
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Tue Nov 30 15:49:31 2010 +0000
GFS2: Merge glock state fields into a bitfield
We can only merge the fields into a bitfield if the locking
rules for them are the same. In this case gl_spin covers all
of the fields (write side) but a couple of them are used
with GLF_LOCK as the read side lock, which should be ok
since we know that the field in question won't be changing
at the time.
The gl_req setting has to be done earlier (in glock.c) in order
to place it under gl_spin. The gl_reply setting also has to be
brought under gl_spin in order to comply with the new rules.
This saves 4*sizeof(unsigned int) per glock.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Cc: Bob Peterson <rpeterso@xxxxxxxxxx>
commit e06dfc492870e1d380f02722cde084b724dc197b
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Tue Nov 30 15:46:02 2010 +0000
GFS2: Fix uninitialised error value in previous patch
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 086d8334cf73b3bb695b82dd864a7a8b00d96b7e
Author: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Date: Tue Nov 23 23:52:55 2010 -0600
GFS2: fix recursive locking during rindex truncates
When you truncate the rindex file, you need to avoid calling gfs2_rindex_hold,
since you already hold it. However, if you haven't already read in the
resource groups, you need to do that.
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 7572777eef78ebdee1ecb7c258c0ef94d35bad16
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Nov 30 16:39:27 2010 +0100
fuse: verify ioctl retries
Verify that the total length of the iovec returned in FUSE_IOCTL_RETRY
doesn't overflow iov_length().
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
CC: Tejun Heo <tj@xxxxxxxxxx>
CC: <stable@xxxxxxxxxx> [2.6.31+]
commit d9d318d39dd5cb686660504a3565aac453709ccc
Author: Miklos Szeredi <mszeredi@xxxxxxx>
Date: Tue Nov 30 16:39:27 2010 +0100
fuse: fix ioctl when server is 32bit
If a 32bit CUSE server is run on 64bit this results in EIO being
returned to the caller.
The reason is that FUSE_IOCTL_RETRY reply was defined to use 'struct
iovec', which is different on 32bit and 64bit archs.
Work around this by looking at the size of the reply to determine
which struct was used. This is only needed if CONFIG_COMPAT is
defined.
A more permanent fix for the interface will be to use the same struct
on both 32bit and 64bit.
Reported-by: "ccmail111" <ccmail111@xxxxxxxxx>
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
CC: Tejun Heo <tj@xxxxxxxxxx>
CC: <stable@xxxxxxxxxx> [2.6.31+]
commit 0489b3f5eba735413ccedd425651cf41d6b1f7c5
Author: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Date: Tue Nov 30 09:38:35 2010 -0600
GFS2: reread rindex when necessary to grow rindex
When GFS2 grew the filesystem, it was never rereading the rindex file during
the grow. This is necessary for large grows when the filesystem is almost full,
and GFS2 needs to use some of the space allocated earlier in the grow to
complete it. Now, if GFS2 fails to reserve the necessary space and the rindex
file is not uptodate, it rereads it. Also, the only difference between
gfs2_ri_update() and gfs2_ri_update_special() was that gfs2_ri_update_special()
didn't clear out the existing resource groups, since you knew that it was only
called when there were no resource groups. Attempting to clear out the
resource groups when there are none takes almost no time, and rarely happens,
so I simply removed gfs2_ri_update_special().
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 0b1246e6776c79719ff4a3afd9c38fba99b99d5a
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Tue Nov 30 15:33:04 2010 +0000
GFS2: Remove duplicate #defines from glock.h
There are a number of duplicated #defines in glock.h
plus one which is unused. This removes the extra
definitions.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 06c63f9396133f312c5a49c2285c2c8015e80934
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Thu Nov 18 15:02:26 2010 -0800
regulator: fix kernel-doc for set_consumer_device_supply
Fix kernel-doc warning for set_consumer_device_supply():
Warning(drivers/regulator/core.c:912): missing initial short description on line:
* set_consumer_device_supply: Bind a regulator to a symbolic supply
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit f3c18a87f3ddcfd31b16f689d01eb6adcc99de74
Author: Bengt Jonsson <bengt.g.jonsson@xxxxxxxxxxxxxx>
Date: Wed Nov 10 11:06:22 2010 +0100
regulator: enable supply regulator only when use count is zero
Supply regulators are disabled only when the last
reference count is removed on the child regulator
(the use count goes from 1 to 0). This patch changes
the behaviour of enable so the supply regulator is
enabled only when the use count of the child
regulator goes from 0 to 1.
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@xxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit b9e26bc804e611d879353cd953cb17db1c52d307
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Fri Oct 22 16:38:22 2010 +0800
regulator: twl-regulator - fix twlreg_set_mode
The Singular Message is 16 bits:
DEV_GRP[15:13] MT[12] RES_ID[11:4] RES_STATE[3:0]
Current implementation return immedially after sucessfuly write MSB part.
To properly set mode, we need to write the complete message ( MSB and LSB ).
In twl.h, now we have defines for PM Master module register offsets,
use it instead of hard coded 0x15/0x16.
Use "message & 0xff" to ensure we send correct value for LSB.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Tested-by: Lesly Arackal Manuel <leslyam@xxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 3aa713e76e8f562c0d28faf18873c4f1836b17c9
Author: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Date: Thu Nov 4 11:01:31 2010 +0100
regulator: lock supply in regulator enable
This patch add locks around regulator supply enable.
Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 7727da22e820a96ab394db2fc0ab58f7f7ecb323
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Fri Nov 5 15:27:17 2010 +0800
regulator: Return proper error for regulator_register()
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit e36c1df8e18183ba2c691fe766a52c94020cdc5e
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Fri Nov 5 21:51:32 2010 +0800
regulator: Ensure enough delay time for enabling regulator
Integer division will truncate the result, this patch ensures we have
enough delay time for enabling regulator.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit aa7a74040a989eeb7a9265550a2538863e842a93
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Fri Nov 5 15:25:12 2010 +0800
regulator: Remove a redundant device_remove_file call in create_regulator
We already have device_remove_file() in error path,
no need to call it before goto link_name_err.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 59c700cf20a6eefb68187df3468ffa0b11d5e9a4
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 3 00:08:04 2010 -0400
regulator: Staticise mc13783_powermisc_rmw()
It is not used outside this driver so no need to make the symbol global.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit b12a1e29af595d05612153bcb85258193bbf9382
Author: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Date: Tue Nov 2 14:55:34 2010 +0100
regulator: regulator disable supply fix
This patch fixes a disable failure when regulator supply is used.
A while loop in regulator disable checks for supply pointer != NULL
but the pointer is not always updated, resulting in the while loop
running too many times causing a disable failure.
Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
commit 5091faa449ee0b7d73bc296a93bca9540fc51d0a
Author: Mike Galbraith <efault@xxxxxx>
Date: Tue Nov 30 14:18:03 2010 +0100
sched: Add 'autogroup' scheduling feature: automated per session task groups
A recurring complaint from CFS users is that parallel kbuild has
a negative impact on desktop interactivity. This patch
implements an idea from Linus, to automatically create task
groups. Currently, only per session autogroups are implemented,
but the patch leaves the way open for enhancement.
Implementation: each task's signal struct contains an inherited
pointer to a refcounted autogroup struct containing a task group
pointer, the default for all tasks pointing to the
init_task_group. When a task calls setsid(), a new task group
is created, the process is moved into the new task group, and a
reference to the preveious task group is dropped. Child
processes inherit this task group thereafter, and increase it's
refcount. When the last thread of a process exits, the
process's reference is dropped, such that when the last process
referencing an autogroup exits, the autogroup is destroyed.
At runqueue selection time, IFF a task has no cgroup assignment,
its current autogroup is used.
Autogroup bandwidth is controllable via setting it's nice level
through the proc filesystem:
cat /proc/<pid>/autogroup
Displays the task's group and the group's nice level.
echo <nice level> > /proc/<pid>/autogroup
Sets the task group's shares to the weight of nice <level> task.
Setting nice level is rate limited for !admin users due to the
abuse risk of task group locking.
The feature is enabled from boot by default if
CONFIG_SCHED_AUTOGROUP=y is selected, but can be disabled via
the boot option noautogroup, and can also be turned on/off on
the fly via:
echo [01] > /proc/sys/kernel/sched_autogroup_enabled
... which will automatically move tasks to/from the root task group.
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Acked-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: Paul Turner <pjt@xxxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
[ Removed the task_group_path() debug code, and fixed !EVENTFD build failure. ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1290281700.28711.9.camel@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit ed7c84d54837b182c5f56f821ef213c8ca817a91
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:29 2010 +0100
ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
Currently, the kprobes implementation for ARM only supports the ARM
instruction set, so it only works if CONFIG_THUMB2_KERNEL is not
enabled.
Until kprobes is updated to work with Thumb-2, turning it on will
cause horrible things to happen, so this patch disables it for now.
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 618d9c8f9e554b5eaaca3f8e55a28e1a928a8571
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Tue Nov 30 13:05:10 2010 +0100
ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a
result, using these directives in code sections can result in
misaligned data words when building a Thumb-2 kernel
(CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to
assume that fundamental types of word size or above are word-
aligned when accessing them from C. If the data is not really
word-aligned, this can cause impaired performance and stray
alignment faults in some circumstances.
In general, the following rules should be applied when using
data word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 725ca4adaea07460accd4622d44bcc7eaa34da09
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Tue Nov 30 13:04:36 2010 +0100
ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned data
words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume that
fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned, this
can cause impaired performance and stray alignment faults in some
circumstances.
In general, the following rules should be applied when using data word
declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit a75e5248c51af1eaeed936be6bd3497b93f09685
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:28 2010 +0100
ARM: 6504/1: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2.
The 32-bit conditional branches in Thumb-2 have a shorter range
(+/-512K) than their ARM counterparts (+/-32MB). The linker does
not currently generate trampolines to extend the range of these
Thumb-2 conditional branches, resulting in link errors when vmlinux
is sufficiently large, e.g.:
head.o:(.text+0x464): relocation truncated to fit: R_ARM_THM_JUMP19
This patch forces the longer-range, unconditional branch encoding
by use of an explicit IT instruction. The resulting branches are
triggered on the same conditions as before.
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 26e5ca93dda9425f8ff78ccb2f9b193328087e45
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:27 2010 +0100
ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
The code which makes up the zImage header intends to leave a
32-byte gap followed by a branch to the real entry point, a magic
number, and a word containing the absolute entry point address.
This gets messed up with with CONFIG_THUMB2_KERNEL, because the
size of the initial padding NOPs changes.
Instead, the header can be made fully compatible by restoring it to
ARM.
In the Thumb-2 case, we can replace the initial NOPs with a
sequence which switches to Thumb and jumps to the real entry point.
As a consequence, the zImage entry point is now always ARM, so no
special magic is needed any more for the uImage rules in the
Thumb-2 case.
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit bfa64c4ab1235b732542f11f4e0005e1774f779a
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:26 2010 +0100
ARM: 6502/1: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S
Some instruction operand combinations are used here which are nor
permitted in Thumb-2.
In particular, most uses of pc as an operand are disallowed in
Thumb-2, and deprecated in ARM from ARMv7 onwards.
The modified code introduced by this patch should be compatible
with all architecture versions >= v3, with or without
CONFIG_THUMB2_KERNEL.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6323875db20fd8ca8c8fbbd608bc377f2d4c8cf5
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:25 2010 +0100
ARM: 6501/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
In this specific case, we can achieve the desired alignment by
forcing a 32-bit branch instruction using the W() macro, since the
assembler location counter is already 32-bit aligned in this case.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4f79a5dd7c3e316e2230dc0ee665c40a39023a81
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:24 2010 +0100
ARM: 6500/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 077248fcce5edabb1b77ba3269e6c72341769d94
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:23 2010 +0100
ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 7eb25ebee894ba2f8a591a83e45accc091ced19f
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:22 2010 +0100
ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit bc8b57f08c53344d13e3b5e644c56c0355899b47
Author: Dave Martin <dave.martin@xxxxxxxxxx>
Date: Mon Nov 29 19:43:21 2010 +0100
ARM: 6497/1: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cb5d39b3a1440eca79c742d95f1d78180c272286
Author: Mika Westerberg <mika.westerberg@xxxxxx>
Date: Thu Nov 18 19:14:52 2010 +0100
ARM: 6487/1: add CONFIG_CRASH_DUMP to Kconfig
Add CONFIG_CRASH_DUMP configuration option which is used by dump
capture kernels.
Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4b3bf7aef94fc337610d78fce0d960e2ee1d5a8f
Author: Mika Westerberg <mika.westerberg@xxxxxx>
Date: Thu Nov 18 19:13:19 2010 +0100
ARM: 6486/1: provide zero vmcore_elf64_check_arch()
Since we don't support 64-bit ELF vmcores. This also prevents the
following warning:
fs/proc/vmcore.c: In function 'parse_crash_elf64_headers':
fs/proc/vmcore.c:502: warning: passing argument 1 of 'elf_check_arch'
from incompatible pointer type
Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 9833c39400c3e6ee19daeded6910df648741611e
Author: Mika Westerberg <mika.westerberg@xxxxxx>
Date: Fri Nov 19 09:29:24 2010 +0100
ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch()
Allow architectures to redefine this macro if needed. This is useful for
example in architectures where 64-bit ELF vmcores are not supported.
Specifying zero vmcore_elf64_check_arch() allows compiler to optimize
away unnecessary parts of parse_crash_elf64_headers().
We also rename the macro to vmcore_elf64_check_arch() to reflect that it
is used for 64-bit vmcores only.
Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit e6afec9b6808eff6dc392ac07c1552e87aebcdf7
Author: Pawel Moll <pawel.moll@xxxxxxx>
Date: Fri Nov 26 13:45:43 2010 +0100
ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interrupts
This change limits number of GIC-originating interrupts to the
platform maximum (defined by NR_IRQS) while still initialising
all distributor registers.
Signed-off-by: Pawel Moll <pawel.moll@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 9f1ee150fc7039eb65039ab17d9a95dfa6250133
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Sat Nov 6 23:34:03 2010 +0100
ARM: pxa/palm: fix ifdef around gen_nand driver registration
Reported-by: Rafael Gandolfi <kaillasse91@xxxxxxxxxx>
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit f9d1bf755315a66353a7f42319cff471b36fffb3
Author: Marek Vasut <marek.vasut@xxxxxxxxx>
Date: Sun Oct 10 00:34:28 2010 +0200
ARM: pxa: fix pxa2xx-flash section mismatch
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Acked-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit 1db550118c46d96f371de5b3d0bd51edb148bd54
Author: Jason Chagas <jason.chagas@xxxxxxxxxxx>
Date: Mon Nov 15 09:50:12 2010 +0800
ARM: mmp2: remove not used clk_rtc
RTC clock will remain at 32KHz and powered on, there is no need for it
at this moment.
Signed-off-by: Jason Chagas <jason.chagas@xxxxxxxxxxx>
Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>
commit b76fb39d49f67a484a6adc8f041d9ad833f6860e
Author: Daniel Glöckner <daniel-gl@xxxxxxx>
Date: Tue Nov 30 01:00:18 2010 +0100
s6105-ipcam: fix compilation
When the s6105-ipcam ASoC driver had been converted to the
multi-component API, a single reference to a former structure
element remained, blocking successful compilation.
Signed-off-by: Daniel Glöckner <daniel-gl@xxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 9e4ea718d3c53f9f2a65ddddf95ffd7743be458e
Author: Daniel Glöckner <daniel-gl@xxxxxxx>
Date: Tue Nov 30 01:00:17 2010 +0100
s6000-pcm: fix compilation
s6000_soc_platform has lost its forward declaration and there no
longer is a name element in it, so use a string constant when
calling request_irq.
Signed-off-by: Daniel Glöckner <daniel-gl@xxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit b1d36b1c3573fd5adecbd313d30a8bdc8d7fbc5e
Author: Daniel Glöckner <daniel-gl@xxxxxxx>
Date: Tue Nov 30 01:00:16 2010 +0100
s6000-i2s: fix compilation
A semicolon was missing.
Signed-off-by: Daniel Glöckner <daniel-gl@xxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 3f1af9d26fb02a99a60a045b8ae93ccc6fe50b97
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 17:42:47 2010 +0800
ASoC: Fix missing spin_unlock_irqrestore
In nuc900_dma_hw_params(), if snd_pcm_lib_malloc_pages failed
it returns without calling spin_unlock_irqrestore().
Since snd_pcm_lib_malloc_pages() does not touch struct nuc900_audio,
we don't need to hold the lock while calling snd_pcm_lib_malloc_pages().
Fix it by moving spin_lock_irqsave() down to after snd_pcm_lib_malloc_pages().
In nuc900_dma_prepare(), spin_unlock_irqrestore() is missing in the error path.
Fix it by removing the return in default case.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Wan ZongShun <mcuos.com@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 921169ca2f7c8a0a2ccda2ce33c465dfe3ae30ef
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Mon Nov 29 12:50:38 2010 +0000
GFS2: Clean up of gdlm_lock function
The DLM never returns -EAGAIN in response to dlm_lock(), and even
if it did, the test in gdlm_lock() was wrong anyway. Once that
test is removed, it is possible to greatly simplify this code
by simply using a "normal" error return code (0 for success).
We then no longer need the LM_OUT_ASYNC return code which can
be removed.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 802ec9b6682349d9d9c92a9e55f44324d2954f41
Author: Abhijith Das <adas@xxxxxxxxxx>
Date: Thu Nov 18 11:26:46 2010 -0500
GFS2: Allow gfs2 to update quota usage values through the quotactl interface
With this patch the gfs2_set_dqblk() function will be able to update the
quota usage block count (FS_DQ_BCOUNT) in addition to the already supported
FS_DQ_BHARD (limit) and FS_DQ_BSOFT (warn) fields of the dquot structure.
Signed-off-by: Abhi Das <adas@xxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit edc221d00bd5c6da0e5c67701f3782b72796619f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Nov 10 13:19:06 2010 -0800
GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg
Functions that use printf formatting, especially
those that use %pV, should have their uses of
printf format and arguments checked by the compiler.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 5e69069c1afb655b5f1a154856ccdb4bb7327b81
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 16:35:20 2010 -0800
GFS2: fs/gfs2/glock.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 2ae51ed7b548c1d943d080da617515e801ea5c3e
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Wed Nov 10 15:14:57 2010 +0000
GFS2: Clean up duplicated setattr code
While preparing the last patch I noticed that the gfs2_setattr_simple
code had been duplicated into two other places. This patch updates
those to call gfs2_setattr_simple rather than open coding it.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit 9e55cd53728719ac3a3234a6618259ab8e203a10
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Tue Nov 9 14:09:53 2010 +0000
GFS2: Remove unreachable calls to vmtruncate
Suggested-by: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit cc18152eb7c27653199546bd14e991a451ab8d1b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 5 16:12:36 2010 -0700
GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
commit d2115778c7ea0df2201f1ad9aab948c49ffa1078
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Wed Nov 3 19:58:53 2010 +0000
GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM
The WQ_RESCUER flag should only be used internally to the
workqueue implementation.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
commit b94ca0792d49f5856570ba66f53acd69cd0917fc
Author: Eric Benard <eric@xxxxxxxxxx>
Date: Fri Oct 15 11:27:17 2010 +0200
at91: merge all at91rm9200 defconfig in one single file
About all options present in each file are activated
in the single file.
Signed-off-by: Eric Benard <eric@xxxxxxxxxx>
Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
commit 822bc180a7f7a7bc5fcaaea195f41b487cc8cae8
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 29 16:55:40 2010 -0800
sched: Fix unregister_fair_sched_group()
In the flipping and flopping between calling
unregister_fair_sched_group() on a per-cpu versus per-group basis
we ended up in a bad state.
Remove from the list for the passed cpu as opposed to some
arbitrary index.
( This fixes explosions w/ autogroup as well as a group
creation/destruction stress test. )
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
LKML-Reference: <20101130005740.080828123@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3cf2efb1a7c68d55d60dcb2ed9609e1a2fc25952
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 29 10:09:55 2010 +0000
Revert "drm/i915/dp: use VBT provided eDP params if available"
This reverts commit 869184a675662bddcdf76c5b95665272facff2b8.
This is required for the Sony Vaio Jesse was working on at the time, but
breaks most other eDP machines - machines that were working in earlier
kernels.
Reported-and-tested-by: Dave Airlie <airlied@xxxxxxxxxx>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31188
Tested-by: Zhao Jian <jian.j.zhao@xxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 4acf89fb3bbb01ba9de4a7cc102e46095a12c94e
Author: Yauhen Kharuzhy <jekhor@xxxxxxxxx>
Date: Sun Nov 28 20:30:27 2010 +0200
ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
Dependency on (CPU_S3C2416 is not selected) was defined as "!CPU_2416",
instead of "!CPU_S3C2416". Fix it.
Signed-off-by: Yauhen Kharuzhy <jekhor@xxxxxxxxx>
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
commit 71f608ef56c987c5325c3aaf9c3fadd4ddc77f64
Author: Yauhen Kharuzhy <yauhen.kharuzhy@xxxxxxxxxxx>
Date: Sun Nov 28 20:30:23 2010 +0200
ARM: S3C2443: Select properly ARM core type
Select ARM920T core when compiling kernel for s3c2443.
Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@xxxxxxxxxxx>
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
commit 4249f8acf993046948dc1f2e74244fe484c8cb8f
Author: Yauhen Kharuzhy <jekhor@xxxxxxxxx>
Date: Sun Nov 28 20:30:19 2010 +0200
ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
Enable compilation of platform devices and initialization code used in
SMDK2416 board file.
Signed-off-by: Yauhen Kharuzhy <jekhor@xxxxxxxxx>
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
commit 60686aa0086a14f8b15c83a09f3df1eebe3aab3c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue Nov 30 08:14:21 2010 +0100
ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
In OSS emulation, SNDCTL_DSP_RESET ioctl needs the reset of the internal
buffer state in addition to drop of the running streams. Otherwise the
succeeding access becomes inconsistent.
Tested-by: Amit Nagal <helloin.amit@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 46fdb0937f26124700fc9fc80da4776330cc00d3
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Tue Oct 26 02:11:40 2010 -0700
rcu: Make synchronize_srcu_expedited() fast if running readers
The synchronize_srcu_expedited() function is currently quick if there
are no active readers, but will delay a full jiffy if there are any.
If these readers leave their SRCU read-side critical sections quickly,
this is way too long to wait. So this commit first waits ten microseconds,
and only then falls back to jiffy-at-a-time waiting.
Reported-by: Avi Kivity <avi@xxxxxxxxxx>
Reported-by: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
Tested-by: Takuya Yoshikawa <yoshikawa.takuya@xxxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit db3a8920995484e5e9a0abaf3bad2c7311b163db
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Mon Oct 25 07:39:22 2010 -0700
rcu: fix race condition in synchronize_sched_expedited()
The new (early 2010) implementation of synchronize_sched_expedited() uses
try_stop_cpu() to force a context switch on every CPU. It also permits
concurrent calls to synchronize_sched_expedited() to share a single call
to try_stop_cpu() through use of an atomically incremented
synchronize_sched_expedited_count variable. Unfortunately, this is
subject to failure as follows:
o Task A invokes synchronize_sched_expedited(), try_stop_cpus()
succeeds, but Task A is preempted before getting to the atomic
increment of synchronize_sched_expedited_count.
o Task B also invokes synchronize_sched_expedited(), with exactly
the same outcome as Task A.
o Task C also invokes synchronize_sched_expedited(), again with
exactly the same outcome as Tasks A and B.
o Task D also invokes synchronize_sched_expedited(), but only
gets as far as acquiring the mutex within try_stop_cpus()
before being preempted, interrupted, or otherwise delayed.
o Task E also invokes synchronize_sched_expedited(), but only
gets to the snapshotting of synchronize_sched_expedited_count.
o Tasks A, B, and C all increment synchronize_sched_expedited_count.
o Task E fails to get the mutex, so checks the new value
of synchronize_sched_expedited_count. It finds that the
value has increased, so (wrongly) assumes that its work
has been done, returning despite there having been no
expedited grace period since it began.
The solution is to have the lowest-numbered CPU atomically increment
the synchronize_sched_expedited_count variable within the
synchronize_sched_expedited_cpu_stop() function, which is under
the protection of the mutex acquired by try_stop_cpus(). However, this
also requires that piggybacking tasks wait for three rather than two
instances of try_stop_cpu(), because we cannot control the order in
which the per-CPU callback function occur.
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 2d999e03b7c8305b4385dd20992e4ed3e827177b
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Wed Oct 20 12:06:18 2010 -0700
rcu: update documentation/comments for Lai's adoption patch
Lai's RCU-callback immediate-adoption patch changes the RCU tracing
output, so update tracing.txt. Also update a few comments to clarify
the synchronization design.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 29494be71afe2a16ad04e344306a620d7cc22d06
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Date: Wed Oct 20 14:13:06 2010 +0800
rcu,cleanup: simplify the code when cpu is dying
When we handle the CPU_DYING notifier, the whole system is stopped except
for the current CPU. We therefore need no synchronization with the other
CPUs. This allows us to move any orphaned RCU callbacks directly to the
list of any online CPU without needing to run them through the global
orphan lists. These global orphan lists can therefore be dispensed with.
This commit makes thes changes, though currently victimizes CPU 0 @@@.
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 7b27d5475f86186914e54e4a6bb994e9a985337b
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Date: Thu Oct 21 11:29:05 2010 +0800
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
The first version of synchronize_sched_expedited() used the migration
code in the scheduler, and was therefore implemented in kernel/sched.c.
However, the more recent version of this code no longer uses the
migration code, so this commit moves it to the main RCU source files.
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit deb7a41815a8a32d4f9ea2af7a48ed1175222cec
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Thu Sep 30 21:33:32 2010 -0700
rcu: get rid of obsolete "classic" names in TREE_RCU tracing
The TREE_RCU tracing had obsolete rcuclassic_trace_init() and
rcuclassic_trace_cleanup() function names. This commit brings them
up to date: rcutree_trace_init() and rcutree_trace_cleanup(),
respectively.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit e940cc804ec212e483f91167b93d1740c2fd3415
Author: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Date: Thu Nov 4 14:55:26 2010 -0700
rcu: Distinguish between boosting and boosted
RCU priority boosting's tracing did not distinguish between ongoing
boosting and completion of boosting. This commit therefore adds this
capability.
Signed-off-by: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 8e79e1f9615b83d1e1d26b328d1b776111ca0cf7
Author: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Date: Thu Nov 4 14:31:19 2010 -0700
rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing.
Add the required verbiage to Documentation/RCU/trace.txt.
Signed-off-by: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 9e571a82f0cb205a65a0ea41657f19f22b7fabb8
Author: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Date: Thu Sep 30 21:26:52 2010 -0700
rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU
Add tracing for the tiny RCU implementations, including statistics on
boosting in the case of TINY_PREEMPT_RCU and RCU_BOOST.
Signed-off-by: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 24278d148316d2180be6df40e06db013d8b232b8
Author: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Date: Mon Sep 27 17:25:23 2010 -0700
rcu: priority boosting for TINY_PREEMPT_RCU
Add priority boosting, but only for TINY_PREEMPT_RCU. This is enabled
by the default-off RCU_BOOST kernel parameter. The priority to which to
boost preempted RCU readers is controlled by the RCU_BOOST_PRIO kernel
parameter (defaulting to real-time priority 1) and the time to wait
before boosting the readers blocking a given grace period is controlled
by the RCU_BOOST_DELAY kernel parameter (defaulting to 500 milliseconds).
Signed-off-by: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e
Merge: 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 193006f7e3b1abd42d7a3677b54fa2996461a842
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 30 14:55:11 2010 +0900
Merge branch 'sh/urgent' into sh-latest
commit 2818b19102fdc414248f772c46af176d36520ae7
Merge: 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 25338f2e09fcbaa0470841c928bf0e718ca13382
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 30 14:53:45 2010 +0900
Merge branch 'rmobile/mackerel' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 476428f8c3bb6679f8f52bf2b935ac40bc9c7358
Author: Suresh Jayaraman <sjayaraman@xxxxxxx>
Date: Wed Nov 24 17:49:07 2010 +0530
cifs: display fsc in /proc/mounts
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617
Merge: 1ad2096c4eba144522d87541c4024b8c84e95051 208c7dc2727ec0fbc678da5e749bcc178c08463d d8e7943d821d8ee7f48ff38f6f7c509297c88402
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 30 14:50:10 2010 +0900
Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest
commit b81209de2455c6051cf67f2acd8ec26ccb8caf83
Author: Suresh Jayaraman <sjayaraman@xxxxxxx>
Date: Wed Nov 24 17:49:06 2010 +0530
cifs: enable fscache iff fsc mount option is used explicitly
Currently, if CONFIG_CIFS_FSCACHE is set, fscache is enabled on files opened
as read-only irrespective of the 'fsc' mount option. Fix this by enabling
fscache only if 'fsc' mount option is specified explicitly.
Remove an extraneous cFYI debug message and fix a typo while at it.
Reported-by: Jeff Layton <jlayton@xxxxxxxxxx>
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 607a569da4cf289fd8eb3887080ed3b212e3112d
Author: Suresh Jayaraman <sjayaraman@xxxxxxx>
Date: Wed Nov 24 17:49:05 2010 +0530
cifs: allow fsc mount option only if CONFIG_CIFS_FSCACHE is set
Currently, it is possible to specify 'fsc' mount option even if
CONFIG_CIFS_FSCACHE has not been set. The option is being ignored silently
while the user fscache functionality to work. Fix this by raising error when
the CONFIG option is not set.
Reported-by: Jeff Layton <jlayton@xxxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit fbeba8bb16d7c50362e28f3f91a79fb414903199
Author: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Date: Sat Nov 27 11:37:54 2010 -0600
cifs: Handle extended attribute name cifs_acl to generate cifs acl blob (try #4)
Add extended attribute name system.cifs_acl
Get/generate cifs/ntfs acl blob and hand over to the invoker however
it wants to parse/process it under experimental configurable option CIFS_ACL.
Do not get CIFS/NTFS ACL for xattr for attribute system.posix_acl_access
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 78415d2d306bfed0a0ac351aec6c69759d007224
Author: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Date: Sat Nov 27 11:37:26 2010 -0600
cifs: Misc. cleanup in cifsacl handling [try #4]
Change the name of function mode_to_acl to mode_to_cifs_acl.
Handle return code in functions mode_to_cifs_acl and
cifs_acl_to_fattr.
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit d8e7943d821d8ee7f48ff38f6f7c509297c88402
Merge: df73af86b6e737f357aae85e0b5e621516117780 22efa0fee32d9e7f6f6fbc396a872b5708d86048
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 30 14:42:55 2010 +0900
Merge branch 'common/mmcif' into rmobile/mmcif
commit 25338f2e09fcbaa0470841c928bf0e718ca13382
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Tue Nov 30 04:37:33 2010 +0000
ARM: mach-shmobile: mackerel: Add USB1(Host) support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 67bace72ee64f6a11cfb914b91d9d6bd47e80ed8
Author: Kyle McMartin <kyle@xxxxxxxxxxx>
Date: Mon Nov 29 20:34:38 2010 -0500
parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn
Noticed-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxx>
commit 805e3f495057aa5307ad4e3d6dc7073d4733c691
Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Wed Nov 3 15:32:21 2010 +0000
xen: x86/32: perform initial startup on initial_page_table
Only make swapper_pg_dir readonly and pinned when generic x86 architecture code
(which also starts on initial_page_table) switches to it. This helps ensure
that the generic setup paths work on Xen unmodified. In particular
clone_pgd_range writes directly to the destination pgd entries and is used to
initialise swapper_pg_dir so we need to ensure that it remains writeable until
the last possible moment during bring up.
This is complicated slightly by the need to avoid sharing kernel PMD entries
when running under Xen, therefore the Xen implementation must make a copy of
the kernel PMD (which is otherwise referred to by both intial_page_table and
swapper_pg_dir) before switching to swapper_pg_dir.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
commit acfa747baf73922021a047f2d87a2d866f5dbab5
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Mon Nov 29 10:16:54 2010 +0100
TTY: open/hangup race fixup
Like in the "TTY: don't allow reopen when ldisc is changing" patch,
this one fixes a TTY WARNING as described in the option 1) there:
1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this
section tty_lock is held. However tty_lock is temporarily dropped in
the middle of the function by tty_ldisc_hangup.
The fix is to introduce a new flag which we set during the unlocked
window and check it in tty_reopen too. The flag is TTY_HUPPING and is
cleared after TTY_HUPPED is set.
While at it, remove duplicate TTY_HUPPED set_bit. The one after
calling ops->hangup seems to be more correct. But anyway, we hold
tty_lock, so there should be no difference.
Also document the function it does that kind of crap.
Nicely reproducible with two forked children:
static void do_work(const char *tty)
{
if (signal(SIGHUP, SIG_IGN) == SIG_ERR) exit(1);
setsid();
while (1) {
int fd = open(tty, O_RDWR|O_NOCTTY);
if (fd < 0) continue;
if (ioctl(fd, TIOCSCTTY)) continue;
if (vhangup()) continue;
close(fd);
}
exit(0);
}
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Reported-by: <Valdis.Kletnieks@xxxxxx>
Reported-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e2efafbf139d2bfdfe96f2901f03189fecd172e4
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Mon Nov 29 10:16:53 2010 +0100
TTY: don't allow reopen when ldisc is changing
There are many WARNINGs like the following reported nowadays:
WARNING: at drivers/tty/tty_io.c:1331 tty_open+0x2a2/0x49a()
Hardware name: Latitude E6500
Modules linked in:
Pid: 1207, comm: plymouthd Not tainted 2.6.37-rc3-mmotm1123 #3
Call Trace:
[<ffffffff8103b189>] warn_slowpath_common+0x80/0x98
[<ffffffff8103b1b6>] warn_slowpath_null+0x15/0x17
[<ffffffff8128a3ab>] tty_open+0x2a2/0x49a
[<ffffffff810fd53f>] chrdev_open+0x11d/0x146
...
This means tty_reopen is called without TTY_LDISC set. For further
considerations, note tty_lock is held in tty_open. TTY_LDISC is cleared in:
1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this
section tty_lock is held. However tty_lock is temporarily dropped in
the middle of the function by tty_ldisc_hangup.
2) tty_release via tty_ldisc_release till the end of tty existence. If
tty->count <= 1, tty_lock is taken, TTY_CLOSING bit set and then
tty_ldisc_release called. tty_reopen checks TTY_CLOSING before checking
TTY_LDISC.
3) tty_set_ldisc from tty_ldisc_halt to tty_ldisc_enable. We:
* take tty_lock, set TTY_LDISC_CHANGING, put tty_lock
* call tty_ldisc_halt (clear TTY_LDISC), tty_lock is _not_ held
* do some other work
* take tty_lock, call tty_ldisc_enable (set TTY_LDISC), put
tty_lock
I cannot see how 2) can be a problem, as there I see no race. OTOH, 1)
and 3) can happen without problems. This patch the case 3) by checking
TTY_LDISC_CHANGING along with TTY_CLOSING in tty_reopen. 1) will be
fixed in the following patch.
Nicely reproducible with two processes:
while (1) {
fd = open("/dev/ttyS1", O_RDWR);
if (fd < 0) {
warn("open");
continue;
}
close(fd);
}
--------
while (1) {
fd = open("/dev/ttyS1", O_RDWR);
ld1 = 0; ld2 = 2;
while (1) {
ioctl(fd, TIOCSETD, &ld1);
ioctl(fd, TIOCSETD, &ld2);
}
close(fd);
}
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Reported-by: <Valdis.Kletnieks@xxxxxx>
Cc: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6a20bd45fda271bd57e3ba41b3de3009797f4b5e
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 25 00:27:55 2010 +0100
NET: wan/x25, fix ldisc->open retval
We should never return positive values from ldisc->open, tty layer
doesn't (and never did) expect that.
If we do that, weird things like warnings in tty_ldisc_close happen.
Not sure if dev->base_addr is used somehow now.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Cc: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Cc: linux-x25@xxxxxxxxxxxxxxx
Tested-by: Sergey Lapin <slapin@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7f90cfc505d613f4faf096e0d84ffe99208057d9
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 25 00:27:54 2010 +0100
TTY: ldisc, fix open flag handling
When a concrete ldisc open fails in tty_ldisc_open, we forget to clear
TTY_LDISC_OPEN. This causes a false warning on the next ldisc open:
WARNING: at drivers/char/tty_ldisc.c:445 tty_ldisc_open+0x26/0x38()
Hardware name: System Product Name
Modules linked in: ...
Pid: 5251, comm: a.out Tainted: G W 2.6.32-5-686 #1
Call Trace:
[<c1030321>] ? warn_slowpath_common+0x5e/0x8a
[<c1030357>] ? warn_slowpath_null+0xa/0xc
[<c119311c>] ? tty_ldisc_open+0x26/0x38
[<c11936c5>] ? tty_set_ldisc+0x218/0x304
...
So clear the bit when failing...
Introduced in c65c9bc3efa (tty: rewrite the ldisc locking) back in
2.6.31-rc1.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Reported-by: Sergey Lapin <slapin@xxxxxxxxxxx>
Tested-by: Sergey Lapin <slapin@xxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 93ae86e759299718c611bc543b9b1633bf32905a
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 29 16:20:04 2010 -0500
keys: add missing include file for trusted and encrypted keys
This patch fixes the linux-next powerpc build errors as reported by
Stephen Rothwell.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Tested-by: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 31e323cca9d5c8afd372976c35a5d46192f540d1
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date: Mon Nov 29 14:16:53 2010 -0800
xen: don't bother to stop other cpus on shutdown/reboot
Xen will shoot all the VCPUs when we do a shutdown hypercall, so there's
no need to do it manually.
In any case it will fail because all the IPI irqs have been pulled
down by this point, so the cross-CPU calls will simply hang forever.
Until change 76fac077db6b34e2c6383a7b4f3f4f7b7d06d8ce the function calls
were not synchronously waited for, so this wasn't apparent. However after
that change the calls became synchronous leading to a hang on shutdown
on multi-VCPU guests.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Stable Kernel <stable@xxxxxxxxxx>
Cc: Alok Kataria <akataria@xxxxxxxxxx>
commit c6c0ac664c86ff6408fadbed4913938c8a732e26
Author: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Date: Thu Nov 25 09:44:07 2010 +1100
driver core: Document that device_rename() is only for networking
Document that device_rename() is not to be used by anything
other than the network core.
Signed-off-by: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dd318575ff0aae91ac4cbcc5b60c184e59267212
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Mon Nov 29 11:09:16 2010 +0100
mac80211: fix RX aggregation locking
The RX aggregation locking documentation was
wrong, which led Christian to also code the
timer timeout handling for it somewhat wrongly.
Fix the documentation, the two places that
need to hold the reorder lock across accesses
to the structure, and the debugfs code that
should just use RCU.
Also, remove acquiring the sta->lock across
reorder timeouts since it isn't necessary, and
change a few places to GFP_KERNEL because the
code path here doesn't need atomic allocations
as I noticed when reviewing all this.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Acked-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8b7f8532d15631776ce8bec2bbbc58f6aad738d1
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 28 19:37:48 2010 +0100
ath9k: fix software retry counter tracking
The recent tx path cleanups moved the software retry count tracking
from the ath_buf to the skb cb, however the actual counter update
referred to the wrong location, confusing block-ack window tracking.
Fix this by using the retries counter in the struct ath_frame_info.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 81fc2a332045dc1dae24f24d3e2dc4656f2cc498
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Fri Nov 26 23:24:33 2010 +0530
Revert "ath9k_htc: Handle monitor mode properly for HTC devices"
This reverts commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb.
The change had broken the packet injection on monitoring mode.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8c5e9c830a04ece8f0c35db2c1e0f6d87bd64894
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Fri Nov 26 06:10:07 2010 -0800
ath9k: Remove code which enables btcoex based on subsys id
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8f5dcb1cfb71ce832f53a4723deba72e6695078b
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Fri Nov 26 06:10:06 2010 -0800
ath9k: Reintroduce modparam to enable btcoex
It is not ideal to enable btcoex based on subsys id as it is
not unique, they are so random. It is also a pain keeping
all of them in a table to enable btcoex for a particular
hw. Going back to the old idea.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f30221e4ec62d905b56d5e8f7ccab6b406a97cf5
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Nov 25 10:02:30 2010 +0100
mac80211: implement off-channel mgmt TX
This implements the new off-channel TX API
in mac80211 with a new work item type. The
operation doesn't add a new work item when
we're on the right channel and there's no
wait time so that for example p2p probe
responses will be transmitted without delay.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Nov 25 10:02:29 2010 +0100
nl80211/cfg80211: extend mgmt-tx API for off-channel
With p2p, it is sometimes necessary to transmit
a frame (typically an action frame) on another
channel than the current channel. Enable this
through the CMD_FRAME API, and allow it to wait
for a response. A new command allows that wait
to be aborted.
However, allow userspace to specify whether or
not it wants to allow off-channel TX, it may
actually want to use the same channel only.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e030d58e8860f1c87b17631dbdd70747cbe1fb5b
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 15:46:07 2010 -0500
sysfs: remove useless test from sysfs_merge_group
Dan Carpenter pointed out that the new sysfs_merge_group() and
sysfs_unmerge_group() routines requires their grp argument to be
non-NULL, because they dereference grp to obtain the list of
attributes. Hence it's pointless for the routines to include a test
and special-case handling for when grp is NULL. This patch (as1433)
removes the unneeded tests.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
CC: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 251d380034c6c34efe75ffb89d863558ba68ec6a
Author: John Tapsell <johnflux@xxxxxxxxx>
Date: Thu Mar 25 13:30:45 2010 +0000
Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
BugLink: http://bugs.launchpad.net/bugs/441990
This was tested to successfully enable the hardware.
Signed-off-by: John Tapsell <johnflux@xxxxxxxxx>
Signed-off-by: Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
CC: stable@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4960b8fe1b0602195e2170bb94d50edc47d36d73
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 10:42:39 2010 +0100
staging: ft1000: Fix goto error logic.
Fix goto error logic which could lead to kernel panics
because kthread_stop() is called in not correct error
conditions. Seen it sometimes when dsp_reload() fails
then I got kernel panic.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c20ec76157747434652e721cdd4dccd8654ad370
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:42:02 2010 +0000
forcedeth: Use netdev_dbg for printk(KERN_DEBUG
Use the normal debugging functions.
Print mac address when using random_ether_addr.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ef46ffbc2841dddebe521764c06673474ca5d041
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:42:01 2010 +0000
forcedeth: Remove netdev_dbg uses
These were probably just for initial driver debugging
and have not been enabled in builds in git history.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b2ba08e606dfd106a394c3ac7a56c497b4c8f230
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:42:00 2010 +0000
forcedeth: Convert dev_printk(<level> to dev_<level>(
Use vsprintf extension %pM for a mac address in one instance.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cd66328bdab782ee40d17b573a3067a591cb7b4f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:59 2010 +0000
forcedeth: Separate vendor specific initializations into functions
Neaten the phy_init function by adding and calling vendor
specific functions.
object size is reduced by ~1kb:
$ size drivers/net/forcedeth.o.*
text data bss dec hex filename
83475 1848 19304 104627 198b3 drivers/net/forcedeth.o.new
84459 1848 19544 105851 19d7b drivers/net/forcedeth.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c41d41e1687dcf344f55dd15c7121532e5c195d4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:58 2010 +0000
forcedeth: Add function init_realtek_8211b
Deduplicate the code use for the init/reset of this device.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d397f3698ec438c3c14abf45bfac88cca1882d9
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:57 2010 +0000
forcedeth: Convert pr_<level> to netdev_<level>
Use netdev_<level> when a struct net_device * is available.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 294a554e274f961ac33c7d739d5b912bd0005f5b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:56 2010 +0000
forcedeth: Use pr_fmt and pr_<level>
Convert printks to pr_<level>.
Remove "forcedeth: " from some calls as it's now added by pr_fmt.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f52dafc1a67c98baa9b6fa1866a4caa4be4831fb
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:55 2010 +0000
forcedeth: Convert remaining dprintk to netdev_dbg
The remaining dprintk uses are emitted as KERN_INFO.
Change these dprintk uses to netdev_dbg.
Remove the now unused dprintk macros.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:54 2010 +0000
forcedeth: Use print_hex_dump
Use the standard code to emit hex dumps.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6b80858d2c0a378894b9df35d3703d62b0b12dbc
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:53 2010 +0000
forcedeth: convert dprintk(KERN_DEBUG to netdev_dbg
Use the more standard macro to preface netdev->name.
Fix casting on resource use.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 344d0dce5164d0bf2d73cf10510fe08ed8cf8248
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 29 07:41:52 2010 +0000
forcedeth: Change reg_delay arguments and use
Move the printk out of reg_delay and make
the callers emit a message on error.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e999fb057436c2167d5ee3f5c82753e953981525
Author: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Tue Nov 23 13:29:28 2010 +0100
staging: ft1000: Remove functions which create devices in kernel space.
Remove exec_mknod() and rm_mknod() helpers which was used for
device nodes creating/removing in kernel space.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5c5e138b590a748c57d54b39634cda974ab9af1d
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Fri Nov 26 23:29:23 2010 +0100
carl9170: fix carl9170_tx_prepare typo
commit: "carl9170: revamp carl9170_tx_prepare"
introduced a peculiar bug that would only show
up if the the module parameter noht is set to 1.
Then all outbound voice, video and background
frames would each invoke a (bogus) RTS/CTS
handshake.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7dff3125534c1d035a910052335a3a39fbb31aa7
Author: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Date: Fri Nov 26 20:41:55 2010 +0200
mac80211: Fix frame injection using non-AP vif
In order for frame injection to work properly for some use cases
(e.g., finding the station entry and keys for encryption), mac80211
needs to find the correct sdata entry. This works when the main vif
is in AP mode, but commit a2c1e3dad516618cb0fbfb1a62c36d0b0744573a
broke this particular use case for station main vif. While this type of
injection is quite unusual operation, it has some uses and we should fix
it. Do this by changing the monitor vif sdata selection to allow station
vif to be selected instead of limiting it to just AP vifs. We still need
to skip some iftypes to avoid selecting unsuitable vif for injection.
Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 46047784b8cdcfc916f6c1cccee0c18dd1223dfd
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Fri Nov 26 23:24:31 2010 +0530
ath9k: Disable SWBA interrupt on remove_interface
while removing beaconing mode interface, SWBA interrupt
was never disabled when there are no other beaconing interfaces.
Cc: stable@xxxxxxxxxx
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c426ee247e40a70490f3d67d3c9c7d1aba54516f
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri Nov 26 11:38:04 2010 +0100
ath9k/carl9170: advertise P2P
With some upcoming changes we'd like to use
the interface types for P2P capability tests.
Enable them now so that when we add those
tests in wpa_supplicant, nothing will break.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 98c316e348bedffa730e6f1e4baeb8a3c3e0f28b
Author: Gabor Juhos <juhosg@xxxxxxxxxxx>
Date: Thu Nov 25 18:26:07 2010 +0100
ath9k: use per-device struct for pm_qos_* operations
The ath9k driver uses a shared pm_qos_request_list structure for all
devices. This causes the following warning if more than one device is
present in the system:
WARNING: at kernel/pm_qos_params.c:234 ath9k_init_device+0x5e8/0x6b0()
pm_qos_add_request() called for already added request
Modules linked in:
Call Trace:
[<802b1cdc>] dump_stack+0x8/0x34
[<8007dd90>] warn_slowpath_common+0x78/0xa4
[<8007de44>] warn_slowpath_fmt+0x2c/0x38
[<801b0828>] ath9k_init_device+0x5e8/0x6b0
[<801bc508>] ath_pci_probe+0x2dc/0x39c
[<80176254>] pci_device_probe+0x64/0xa4
[<8019471c>] driver_probe_device+0xbc/0x188
[<80194854>] __driver_attach+0x6c/0xa4
[<80193e20>] bus_for_each_dev+0x60/0xb0
[<80193580>] bus_add_driver+0xcc/0x268
[<80194c08>] driver_register+0xe0/0x198
[<801764e0>] __pci_register_driver+0x50/0xe0
[<80365f48>] ath9k_init+0x3c/0x6c
[<8006050c>] do_one_initcall+0xfc/0x1d8
[<80355340>] kernel_init+0xd4/0x174
[<800639a4>] kernel_thread_helper+0x10/0x18
---[ end trace 5345fc6f870564a6 ]---
This patch fixes that warning by using a separate pm_qos_request_list
sructure for each device.
Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 16ccdf0dbc84b11bc8b7fdbad66804d06a683554
Author: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Date: Wed Nov 24 16:02:00 2010 +0000
libertas: fix invalid access
card->priv must not be accessed after lbs_remove_card() was called
as lbs_remove_card() frees card->priv via free_netdev().
For libertas_sdio this is a regression introduced by 23b149c1890f9.
The correct fix to the issue described there is simply to remove the
assignment. This flag is set at the appropriate time inside
lbs_remove_card anyway.
Reported-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Sven Neumann <s.neumann@xxxxxxxxxxxx>
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 517ff43146b17a0d067125f098f675d1e0ac2d82
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Wed Nov 24 16:00:49 2010 +0000
libertas: fix memory corruption in lbs_remove_card()
"priv" is stored at the end of the wiphy structure, which is freed
during the call to lbs_cfg_free(). It must not be touched afterwards.
Remove the unnecessary NULL assignment causing this memory corruption.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6efe04ee4109a9d3fc0d419667f54861628b0d45
Author: Al Cho <acho@xxxxxxxxxx>
Date: Fri Nov 26 19:07:27 2010 +0800
staging: keucr: fix keucr init other coding style
fix keucr init.c other coding style but not from checkpatch.pl.
replace ternary conditional "?:" with if/else.
Signed-off-by: Al Cho <acho@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e93192acff4eaf7024c2450d91f3de69258f1f12
Author: Al Cho <acho@xxxxxxxxxx>
Date: Fri Nov 26 19:06:39 2010 +0800
staging: keucr: fix keucr init coding style
fix keucr init.c init.h coding style.
only fix coding style check by checkpatch.pl.
Signed-off-by: Al Cho <acho@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 280740a9016db986758db811bbc998acc79e5551
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 26 20:06:53 2010 +0300
staging: msm: tvenc: fix error handling
Driver init() function should return error code.
Also fix tvenc_clk leak.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8956110dbbb75773d851854e6e11cd8428fce71a
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Wed Nov 24 11:46:09 2010 -0800
staging: fix intel_sst/intelmid sound build
SND_INTELMID selects 3 SND_* kconfig symbols, but that is useless
if the SOUND & SND symbols in their hierarchy are not enabled,
so make this symbol depend on SOUND & SND.
ERROR: "snd_pcm_period_elapsed" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_card_create" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_hw_constraint_integer" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_device_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_set_ops" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_jack_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_free_pages" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_ioctl" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_malloc_pages" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_ctl_new1" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_preallocate_pages_for_all" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_card_free" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_card_register" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_jack_report" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_ctl_add" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fa7a1db200ecb7a5912722a563646935700765a8
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 23 15:30:02 2010 -0800
staging: brcm80211: Remove BUSTYPE macro
BUSTYPE isn't used in this configuration.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c95e66e1fae810110410b59f411110ca671ffb28
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Tue Nov 23 22:20:31 2010 +0100
staging: brcm80211: remove unused dhd_ops_virt variable definition
The variable dhd_ops_virt was used before although its use was rather
limited as can be found in previous commit:
| commit 4fd68ae1a558043a2cc4ea2faf7235e71c3241aa
| Author: Julia Lawall <julia@xxxxxxx>
| Date: Tue Oct 26 12:25:33 2010 +0200
|
| drivers/staging/brcm80211/brcmfmac/dhd_linux.c: delete double assignment
|
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3be727c8f076cafaf26a1ceda4cad85f5166c8a3
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Tue Nov 23 22:20:30 2010 +0100
staging: brcm80211: remove some more packet related macros
macros PKTHEADROOM and PKTTAILROOM have been replaced by native
skbuff functions and macros PKTALLOCED and PKTUNALLOC have been
removed.
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 54991ad6d05186bd0324dbdc9c64c5b7952e74c4
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Tue Nov 23 14:06:24 2010 +0100
staging: brcm80211: removed packet macros for accessing sk_buff fields
With the packet storage type changed from void pointer to struct sk_buff
pointer there is no need for macros for accessing these fields through
casting. These can now be accessed directly.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c26b1378a71de617fb5ba7da8b6fdc882caed0e8
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Tue Nov 23 14:06:23 2010 +0100
staging: brcm80211: change packet buffer type to native struct sk_buff
The packet queues now store struct sk_buff pointer and subsequently
all driver code handling packets now use struct sk_buff as package
storage type. Next step will be getting rid of packet macros.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b6eb5c0f71af22f7b44353a01241fff9a02997af
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Tue Nov 23 14:06:22 2010 +0100
staging: brcm80211: remove unneccessary packets funtion prototype
The prototype for function pktsegcnt in bmcutils.h is not defined
nor used anywhere in the driver so it can be removed.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7c8bc0147f54ecb43f48d9e898ad7f85cb934db7
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Tue Nov 23 08:04:29 2010 +0100
staging: brcm80211: add include file for using semaphore related definitions
Source wl_iw.c uses semaphore definitions and as such should include
<linux/semaphore.h>.
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 57d8cd23c2a0d261bdc959201dd4a33a2080bdfb
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Mon Nov 22 16:58:52 2010 -0800
staging: brcm80211: OSL shrink: Remove OSL_PCI_READ/WRITE_CONFIG
Replace OSL layer PCI READ/WRITE macros with native calls.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b99bca8bba85aad229d711522442e8bc30a07068
Merge: 3b93ff030204ca36fb1e9917743bbf22a423e527 857cf1d1e623467622eff3a6b0edc720dcafdd52
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Mon Nov 29 11:21:25 2010 -0800
Merge branch 'work' into staging-next
commit 857cf1d1e623467622eff3a6b0edc720dcafdd52
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Mon Nov 29 11:18:08 2010 -0800
Staging: sep: do not select the driver by default
The Kconfig file should not have 'y' as the default, especially
as the driver will crash a machine if it is loaded and the hardware
is not present.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 77148625e10d0fda50d05e92d199c0df17b66e9a
Merge: a41778694806ac1ccd4b1dafed1abef8d5ba98ac 51cce8a590c4696d62bfacc63378d1036084cef7
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 29 11:19:09 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 3b93ff030204ca36fb1e9917743bbf22a423e527
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Mon Nov 29 11:18:08 2010 -0800
Staging: sep: do not select the driver by default
The Kconfig file should not have 'y' as the default, especially
as the driver will crash a machine if it is loaded and the hardware
is not present.
Cc: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit da3f825bc71b420e129b6344be0e3e863ebf8a42
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:39:20 2010 +0000
Staging: sep: Fix crash if a device is not found
The existing code works mostly by luck. The PCI probe is done by the
register and completes before the register returns thus allowing the other
init code to run in time. Without a SEP or if unlucky this doesn't occur
and you get an OOPS which for some reason causes grumpiness.
As the season of good b^Hcheer is supposed to be approaching we should
probably fix it.
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6f89be93ce6e718a51215336845c70ada06627ba
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:39:07 2010 +0000
Staging: sep: clean up a couple of spots missed in pass one
Another copy_user case and some formatting of dbg
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2bb3af58d0f712c728cf1230539044d94c9a3be0
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:38:54 2010 +0000
Staging: sep: cant is an angular inclination
So use can't instead.
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6eb44c531763ff50325822bac749e92938782795
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:38:39 2010 +0000
Staging: sep: Make SEP consistent
SEP is initials so make it consistent in the driver, ditto DMA and DCB
Consistent capitalisation of comment leads
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7c9eb69123a634c8551e8887bda03c2e549da233
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:38:21 2010 +0000
Staging: sep: Use kzalloc when needed
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit da14e55130785db243a98523b57ddf56d6c6320a
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:38:02 2010 +0000
Staging: sep: clean up some of the obvious sillies
Various assignments are done but not used
dev_dbg formatting is a bit weird and wraps when not needed
Take out some of the blank lines and reformat a bit to reduce view size
Remove some comments that are obvious
Fix else formatting
Remove some user triggerable dev_warns
Fix copy_from_user error return cases (-EFAULT not bytes copied)
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d1bb83213d5b7b3a4e3db59179917a433f82762c
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:34:52 2010 +0000
Staging: sep: Fix the kernel-doc in SEP
The long blurb goes at the end
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4c8e2a1f3d5e6b63ebfd26f324a2b24194af37fa
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:34:25 2010 +0000
Staging: sep: clean up caller_id function
This is called on a kmalloc/memset object. Remove everything that isn't a
set to zero
Oh look 8)
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8d80e4e2da31be71b8c1a5def986e10831d2aada
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:34:08 2010 +0000
Staging: sep: netlink - what netlink
Kill unused stuff
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 266aa856f2c3aeddadd2fcf186d119af10539c3e
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:33:55 2010 +0000
Staging: sep: handle the memrar stuff in the headers
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 62a8c3a32e4143812ed8e0f3783ef1ea40dc87e4
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:33:43 2010 +0000
Staging: sep: handle the rar definition stuff in the header
SEP isn't the only driver that may need to handle both cases easily
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit de92e3a3b25dd0cda00a07b30c325785b5c2d939
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Wed Nov 24 19:33:26 2010 +0000
Staging: sep: minimal fix for wrong include
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 62877913ba55b3f2e5ac34dbc1a2975868ea8d25
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Mon Nov 22 10:33:51 2010 +0000
Staging: sst: add ioctls for post processing algorithm interface
This patch adds two new ioctls to intel_sst_ctrl device.
This i/f can be used by application to send algorithm parameters
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
[This will need further discussion in the context of the final ALSA interface
but is fine for staging, ie anyone who relies on it should expect changes
Also fixed a missing kmalloc fail check]
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 79a35ad57300f78c7250eeeca57b602e06ff402a
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Mon Nov 22 10:33:40 2010 +0000
Staging: sst: Construct fw string name runtime
The firmware name for each platform is appended by PCI id of device.
This patch makes use of pci id to construct the string rather than
hardcode the string.
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 964c6975e8a4314c451d420f1cb54880ab535433
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Mon Nov 22 10:33:28 2010 +0000
Staging: sst: Add runtime PM support
This adds runtime PM support for audio driver.
This also fixes LPA audio mode for moorestown platform
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 951c44e0dbfaa580d5b4fb13427ab93ee252636a
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:56:07 2010 +0100
Staging: batman-adv: Use kernel functions to identify broadcasts
linux/etherdevice.h already provides functions to classify different
ethernet addresses. These inlineable functions should be used instead of
custom functions.
The check for multicast together with multicast can also be replaced
with a single test for multicast because for every ethernet address x
following is always true:
is_broadcast_ether_addr(x) => is_multicast_ether_addr(x)
or when looking more at the implementation:
(FF:FF:FF:FF:FF:FF == x) => [(01:00:00:00:00:00 & x) != 00:00:00:00:00:00]
Reported-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8cab2fbe6dacfdd3b122c450d2fffde6ac06a8b6
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:56:06 2010 +0100
Staging: batman-adv: Use kernel version min macro
The kernel headers already provide different versions of a min/max macro
which should be used by all modules according to
Documentation/CodingStyle.
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 003db3b2ad61c2964d624b0786cf8202e9a92c8e
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:56:05 2010 +0100
Staging: batman-adv: add gateway IPv6 support by filtering DHCPv6 messages
Some additional checks will be needed in case of extension headers
like the fragmentation or hop-by-hop (for jumbo frames for example)
headers or ipsec stuff. But this patch should do for most people
for now, the rest can be added with a later one.
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
Acked-by: Linus Lüssing <linus.luessing@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c9c556b63b19c8b52de5c5ea6f47ab16fc540e47
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:56:04 2010 +0100
Staging: batman-adv: best gw DHCP filter 802.1Q support
The DHCP filter inspects packets to determine whether or not to send
them via ethernet unicast. This patch adds 802.1Q (vlan) support for
this check.
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
[sven.eckelmann@xxxxxx: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6c3a42db6ca46204b35f0cdb8abfa9e4771641ef
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:56:03 2010 +0100
Staging: batman-adv: send DHCP requests directly to the chosen gw
If the gateway client mode is active batman-adv will send the
broadcasted DHCP requests via unicast to the currently selected best
gateway. Therefore attached clients can profit from batman's knowledge
about the network topology.
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
[sven.eckelmann@xxxxxx: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dfaf9dd3459cac02411cebf418e8469aa0d8ca5d
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:56:02 2010 +0100
Staging: batman-adv: adding gateway functionality
Via the /sys filesystem you can change the gateway mode of a node using
gw_mode. Adjustments to it can be done using gw_bandwidth for server
mode and gw_sel_class for client mode.
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
[sven.eckelmann@xxxxxx: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7a18deb7b03e4112af5add8498889f9b2b36d59f
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:56:01 2010 +0100
Staging: batman-adv: Limit spin_locks to spin_lock_bh
spin_lock_irqsave disables the IRQs and stores them inside the flags
provided by the caller. This is needed to protect a bottom half handler
or a user context critical section from being interrupted by an
interrupt handler which also tries to acquire the spinlock and locks
forever.
The linux device drivers will receive the packets inside an interrupt
handler and the network infrastructure will process them inside bottom
half. Thus batman-adv will only run in user context and bottom half
handlers. We can conclude that batman-adv doesn't share its own
spinlocks with real interrupt handlers.
This makes it possible to exchange the quite complex spin_lock_irqsave
with spin_lock_bh which only stops bottom halves from running on the
current cpu, but allows interrupt handlers to take over to keep the
interrupt latency low.
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit bd204952cf161404eae0aa6478fb1b4c586ac678
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:56:00 2010 +0100
Staging: batman-adv: Rewrite hash using hlist_*
The hash implementation is a complete implementation of a hash using
buckets as hash entries and overflow buckets attached to them.
The kernel already provides datastructures hlist_head and hlist_node
which can be used to implement an hash using lists as hash buckets. So
it is better to implement heavily used functionality on top of those
instead of providing a full hash implementation.
The rewrite changes the behavior of some functions slightly:
* hash_add add elements to the front instead of the tail
* hash_iterate doesn't provide pointer to access bucket->data directly,
but it can be accessed using hlist_entry
Reported-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a3238c3b379146a2d480dfee4c7f76c4692d7466
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:59 2010 +0100
Staging: batman-adv: Make hash_iterate inlineable
hash_iterate is next to the function pointers the most called function
related to hashes which benefits from inlining as it is uses in loops.
Reported-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 60eb502436910fb8118639e2ce4d7a4f732b6754
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:58 2010 +0100
Staging: batman-adv: Move hash callback related function to header
To enable inlining of the function pointers hashdata_choose_cb,
hashdata_choose_cb and hashdata_free_cb, also the hash functions which
uses them must be inlined by the called function.
This should increase the performance, but also increases the size of the
generated machine code slightly.
Reported-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6d5e654240dc14ded3d74aa5df6857572ba9f5e3
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:57 2010 +0100
Staging: batman-adv: Remove hashdata_choose_cb from hash
Function pointers cannot be inlined by a compiler and thus always has
the overhead of an call. hashdata_choose_cb's are one of the most often
called function pointers and its overhead must kept relative low.
As first step, every function which uses this function pointer takes it
as parameter instead of storing it inside the hash abstraction
structure.
This not generate any performance gain right now. The called functions
must also be able to be inlined by the calling functions to enable
inlining of the function pointer.
Reported-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 51f3d8a27c1a1ac6aced25ea93fc5c0520e9256c
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:56 2010 +0100
Staging: batman-adv: Remove hashdata_compare_cb from hash
Function pointers cannot be inlined by a compiler and thus always has
the overhead of an call. hashdata_compare_cb's are one of the most often
called function pointers and its overhead must kept relative low.
As first step, every function which uses this function pointer takes it
as parameter instead of storing it inside the hash abstraction
structure.
This not generate any performance gain right now. The called functions
must also be able to be inlined by the calling functions to enable
inlining of the function pointer.
Reported-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1341a00ad356dfb21978ce4e5e979024558042d2
Author: Linus Lüssing <linus.luessing@xxxxxxxx>
Date: Mon Nov 22 00:55:55 2010 +0100
Staging: batman-adv: Make hop_penalty configurable via sysfs
When having a mixed topology of both very mobile and rather static
nodes, you are usually best advised to set the originator interval on
all nodes to a level best suited for the most mobile node.
However, if most of the nodes are rather static, this can create a lot
of undesired overhead as a trade-off then. If setting the interval too
low on the static nodes, a mobile node might be chosen as a router for
too long, not switching away from it fast enough because of its
mobility and the low frequency of ogms of static nodes.
Exposing the hop_penalty is especially useful for the stated scenario: A
static node can keep the default originator interval, a mobile node can
select a quicker one resulting in faster route updates towards this
mobile node. Additionally, such a mobile node could select a higher hop
penalty (or even set it to 255 to disable acting as a router for other
nodes) to make it less desirable, letting other nodes avoid selecting
this mobile node as a router.
Signed-off-by: Linus Lüssing <linus.luessing@xxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1623948f879069b33d07986aa95e3b9969322ff4
Author: Linus Lüssing <linus.luessing@xxxxxx>
Date: Mon Nov 22 00:55:54 2010 +0100
Staging: batman-adv: Ommit storing struct device in sysfs functions
We actually do not need an extra struct device variable, therefore
replacing them with defines that directly get the bat_priv or
net_device. This further reduces the code size in bat_sysfs.c and
especially shortens some macros.
Signed-off-by: Linus Lüssing <linus.luessing@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit add9e1722755072f40d79104db04e350b25624d9
Author: Linus Lüssing <linus.luessing@xxxxxx>
Date: Mon Nov 22 00:55:53 2010 +0100
Staging: batman-adv: Wrapper functions for sysfs storing
Sysfs configuration options that just took a boolean value
(enable(d)/disable(d)/0/1) and integer setting basically all had the same
structure.
To avoid even more copy and pasting in the future and to make introducing
new configuration parameters for batman-adv simpler, more generic
wrapper functions are being introduced with this commit. They can deal with
boolean and unsigned integer parameters, storing them in the specified
atomic_t variables.
Signed-off-by: Linus Lüssing <linus.luessing@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 641ee3f8f4375bde4e216aacd26d286a34efed61
Author: Linus Lüssing <linus.luessing@xxxxxx>
Date: Mon Nov 22 00:55:52 2010 +0100
Staging: batman-adv: Unify sysfs file names with their bat_priv atomics
Both sysfs entries and variable names shall be as descriptive as
possible while not exceeding a certain length. This patch renames
bat_priv atomics to be equally descriptive with their according sysfs
entries.
Unifying sysfs and bat_priv atomic names also makes it easier to find
each others pendant.
The reduced ("type"-)information which was previously indicated with a
_enabled for booleans got substituted by a comment in bat_priv.
This patch has also been done in regards for the future BAT_ATTR_*
macros (they only need one name argument instead of a file and variable
name).
Signed-off-by: Linus Lüssing <linus.luessing@xxxxxx>
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 420193573f1191b22e08f85ead41c090d283dd05
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:55:51 2010 +0100
Staging: batman-adv: softif bridge loop avoidance
By connecting multiple batman-adv mesh nodes to the same ethernet
segment a loop can be created when the soft-interface is bridged
into that ethernet segment. A simple visualization of the loop
involving the most common case - a LAN as ethernet segment:
node1 <-- LAN --> node2
| |
wifi <-- mesh --> wifi
Packets from the LAN (e.g. ARP broadcasts) will circle forever from
node1 or node2 over the mesh back into the LAN.
This patch adds the functionality to detect other batman-adv nodes
connected to the LAN and select a 'gateway' to talk to the
non-batman-adv devices on this LAN. All traffic from and to the mesh
will be handled by this gateway to avoid the loop. OGMs received via
the soft-interface are interpreted as 'port announcements' to locate
potential batman-adv nodes. The patch can also deal with vlans on
top of batX and offers a list of LAN neighbors via debugfs.
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
[sven.eckelmann@xxxxxx: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 225f7b0b950d141819a8d9694141571b349e563d
Author: Andreas Langer <an.langer@xxxxxx>
Date: Mon Nov 22 00:55:50 2010 +0100
Staging: batman-adv: reassemble fragmented skb if mtu allows it
Signed-off-by: Andreas Langer <an.langer@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9061109ab18352c73b5dda426043dbb6d5e2dae7
Author: Andreas Langer <an.langer@xxxxxx>
Date: Mon Nov 22 00:55:49 2010 +0100
Staging: batman-adv: fragment forwarded packets
If a packet is too big to be forwarded over an interface it will be
fragmented on-the-fly (if fragmentation is enabled).
Signed-off-by: Andreas Langer <an.langer@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b8cd75445e842b11a0a8ff1e763303a575c21c77
Author: Andreas Langer <an.langer@xxxxxx>
Date: Mon Nov 22 00:55:48 2010 +0100
Staging: batman-adv: remove redundant is_my_mac() check in route_unicast_packet
Callers should check the if the received packet is for us before it
calls route_unicast_packet.
Signed-off-by: Andreas Langer <an.langer@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f3cc7595d242a22a9ffba91979d2cd4e4e815424
Author: Andreas Langer <an.langer@xxxxxx>
Date: Mon Nov 22 00:55:47 2010 +0100
Staging: batman-adv: move skb reassembly of fragmented packets into dedicated function
Signed-off-by: Andreas Langer <an.langer@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8bbde32cf5bd9dbe2f53d562f563b465c0829b23
Author: Andreas Langer <an.langer@xxxxxx>
Date: Mon Nov 22 00:55:46 2010 +0100
Staging: batman-adv: add frag_ prefix to all fragmentation related functions
Signed-off-by: Andreas Langer <an.langer@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 49b588e79f7c85aec05008a945fdf17d281e83f9
Author: Andreas Langer <an.langer@xxxxxx>
Date: Mon Nov 22 00:55:45 2010 +0100
Staging: batman-adv: restructure fragmentation to handle batman unicast packets
The unicast_frag_send_skb() function expected 'raw' packets (without any
batman-adv header) to fragment them. This needs to be changed, so that
this function is able to fragment packets that already traveled inside
the mesh but need to be fragmented now.
Signed-off-by: Andreas Langer <an.langer@xxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3f427604d669031343af8e6ecd8d1cc7a6408ab2
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:55:44 2010 +0100
Staging: batman-adv: use rcu callbacks when freeing batman_if
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b4abfcd4c79ec12340b4c68e3a211badd3c90e20
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:55:43 2010 +0100
Staging: batman-adv: convert batman_if custom refcounting to kref functions
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit bd27509f49ab841bc10fd604ccd9e7f9914b7120
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:42 2010 +0100
Staging: batman-adv: Don't remove interface with spinlock held
We call a lot of the netdevice code when holding if_list_lock which will
spin the whole time. This is not necessary because we only want to
protect the access to the list to be serialized. An extra queue can be
used which hold all interfaces which should be removed and then use that
queue without any locks for netdevice cleanup.
Reported-by: Rafal Lesniak <lesniak@xxxxxxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 43fc987224a45dc53ccc302df5889230d9587921
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:41 2010 +0100
Staging: batman-adv: Add new sysfs files to README
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2f1646788f4d3cd2ce5cb24d13096afbd8782665
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 00:55:40 2010 +0100
Staging: batman-adv: ensure that eth_type_trans gets linear memory
eth_type_trans tries to pull data with the length of the ethernet header
from the skb. We only ensured that enough data for the first ethernet
header and the batman header is available in non-paged memory of the skb
and not for the ethernet after the batman header.
eth_type_trans would fail sometimes with drivers which don't ensure that
all there data is perfectly linearised.
Reported-by: Rafal Lesniak <lesniak@xxxxxxxxxxxxxxxxx>
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4f26559156eae1b616ef2d0d168bd25f493e02f4
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 00:55:39 2010 +0100
Staging: batman-adv: Replace Andrew Lunn as Staging maintainer
Andrew Lunn didn't submit patches to staging since a while and may not
be the right person for new patches.
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4f76548299196e0fd880469a39552ccde797474b
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Tue Nov 23 11:40:13 2010 +0100
staging: iio: dac: ad5446: Remove unused sign member from chip specific information structure
Remove unused sign member from chip specific information structure
Fix typos
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d846263da4c6032b7a9440d335794ef8d3e76dfb
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Tue Nov 23 11:14:16 2010 +0100
staging: iio: dac: ad5446: Enable driver support for AD5620/AD5640/AD5660 DA converters
Initial support for single channel, 12-/14-/16-Bit nanoDAC with On-Chip Reference
staging: iio: dac: ad5446: Fix according to review feedback
Review feedback by Jonathan Cameron:
Use kernel doc style to document headers.
Turn data into a union
Add some comments for clarity
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f386caa3cd74231cd86c813fe4453e3d6e39876c
Author: Jonathan Cameron <jic23@xxxxxxxxx>
Date: Mon Nov 22 23:31:16 2010 +0000
staging: iio: documentation rewrite and cleanup of sysfs documetation
Change to capital syntax for documetation e.g. 'inX-inY_raw'
Use multiple 'What:' entries rather than wild cards or options so
as to make the documentation clearer and easier to search.
Some trivial spelling fixes.
Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fe34604844c151668579cb6ad52f75a5c651bed9
Author: Jonathan Cameron <jic23@xxxxxxxxx>
Date: Mon Nov 22 23:09:48 2010 +0000
staging: iio: adis16260 add suppport for adis16255 and adis16250.
Unusual element is addition of 'negate' and 'axis' platform data
to ensure we support all the functionality of the adis16255 driver
currently in staging.
Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxx>
Acked-by: Matthias Brugger <mensch0815@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a9672951a5c4e57e048895d868a2172962ef7ffd
Author: Jonathan Cameron <jic23@xxxxxxxxx>
Date: Mon Nov 22 23:09:47 2010 +0000
staging: iio: adis16260 add id table support
Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2b4756aa36909a94596752db341a0a2c8bb8c6ea
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Mon Nov 22 14:35:32 2010 +0100
staging: iio: adc: Enable driver support for ad7887 AD converter
Enable support for AD7887: SPI Micropower, 2-Channel, 125 kSPS, 12-Bit ADC
staging: iio: adc: Fix according to review feedback
Review feedback by Jonathan Cameron:
Combine statements.
Document struct members.
Remove redundant variable initialization.
Simplify multichannel scan from ring logic.
Fix coding style.
[v2]
staging: iio: adc: ad7887: Fix typos
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b5a49481754a5cbfdc47bd701208f77c5c9010c6
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Mon Nov 22 11:15:23 2010 +0100
staging: iio: dac: Enable driver support for AD5444 and AD5446 DA converters
Enable support for AD5444 and AD5446: 12-/14-Bit High Bandwidth
Multiplying DACs with Serial Interface.
staging: iio: dac: Add support for AD5541A, AD5512A digital to analog convertors
staging: iio: dac: Fix according to review feedback
Review feedback by Jonathan Cameron:
Remove spurious new line.
Document struct members.
Remove redundant variable initialization.
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 95bd48578bbe66fa5d16029c59dfbe95749a5f0b
Author: Huang Weiyi <weiyi.huang@xxxxxxxxx>
Date: Sat Nov 20 20:06:18 2010 +0800
staging: brcm80211: remove duplicated #include
Remove duplicated #include('s) in
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Signed-off-by: Huang Weiyi <weiyi.huang@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 72f9fc7c8150873d51c61cfb885dc7fbb075d62a
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Mon Nov 22 12:12:37 2010 -0800
staging: easycap needs smp_lock.h, fixes build error
Add header file to fix build error:
drivers/staging/easycap/easycap_main.c:4251: error: implicit declaration of function 'lock_kernel'
drivers/staging/easycap/easycap_main.c:4254: error: implicit declaration of function 'unlock_kernel'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b6faaae1a15a352d68b3e3cd8b840e56709820bf
Author: Marek Lindner <lindner_marek@xxxxxxxx>
Date: Mon Nov 22 12:34:49 2010 +0100
Staging: batman-adv: ensure that eth_type_trans gets linear memory
eth_type_trans tries to pull data with the length of the ethernet header
from the skb. We only ensured that enough data for the first ethernet
header and the batman header is available in non-paged memory of the skb
and not for the ethernet after the batman header.
eth_type_trans would fail sometimes with drivers which don't ensure that
all there data is perfectly linearised.
The failure was noticed through a kernel bug Oops generated by the
skb_pull inside eth_type_trans.
Reported-by: Rafal Lesniak <lesniak@xxxxxxxxxxxxxxxxx>
Signed-off-by: Marek Lindner <lindner_marek@xxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9ee898739b7e4d292abed911008b3f91b442118a
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Nov 22 12:34:50 2010 +0100
Staging: batman-adv: Don't remove interface with spinlock held
We call a lot of the netdevice code when holding if_list_lock which will
spin the whole time. This is not necessary because we only want to
protect the access to the list to be serialized. An extra queue can be
used which hold all interfaces which should be removed and then use that
queue without any locks for netdevice cleanup.
We create a "scheduling while atomic" Oops when calling different
netdevice related functions inside a spinlock protected area on a
preemtible kernel.
Reported-by: Rafal Lesniak <lesniak@xxxxxxxxxxxxxxxxx>
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6df78338e7af7960b67fa00aa2a5c63986a23d3c
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Sat Nov 20 12:07:16 2010 +0100
staging: brcm80211: updated maintainers contact information
Open-source development team extended so contacts updated.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c5d1b51d3559664920136b45f4d2366ed9a9e8be
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 29 18:00:23 2010 +0000
drm/i915: Clear pfit registers when not used by any outputs
... otherwise the panel-fitter may be left enabled with random settings
and cause unintended filtering (i.e. blurring of native modes on external
panels).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31942
Reported-and-tested-by: Ben Kohler <bkohler@xxxxxxxxx>
Tested-by: Ciprian Docan <docan@xxxxxxxxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf
Merge: 412dc7f368bf10a8049a8a4c41abbfd0108742e7 72083646528d4887b920deb71b37e09bc7d227bb
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Mon Nov 29 10:44:22 2010 -0800
Merge branch 'master' into work
commit 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 14:55:58 2010 +0800
ASoC: Add missing dev_set_drvdata in p1022_ds_probe
Otherwise, calling dev_get_drvdata in p1022_ds_remove returns NULL.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Timur Tabi <timur@xxxxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 67bd489aa309a680b1462ad635df29e8825152d2
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 14:54:58 2010 +0800
ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe
Otherwise, calling dev_get_drvdata in mpc8610_hpcd_remove returns NULL.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Timur Tabi <timur@xxxxxxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 3f90e5028a03be4496a04e4599b16f4420ff1304
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 17:43:39 2010 +0800
ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready
I think this unneededd !! operations just reduce the readability.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit a7a9820bae19775df1d6cc70d2571ee26e099413
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 17:40:53 2010 +0800
ASoC: Fix compile error for nuc900-pcm.c
This patch fixes below error:
CC sound/soc/nuc900/nuc900-pcm.o
sound/soc/nuc900/nuc900-pcm.c: In function 'nuc900_dma_open':
sound/soc/nuc900/nuc900-pcm.c:267: error: 'nuc900_ac97_data' undeclared (first use in this function)
sound/soc/nuc900/nuc900-pcm.c:267: error: (Each undeclared identifier is reported only once
sound/soc/nuc900/nuc900-pcm.c:267: error: for each function it appears in.)
sound/soc/nuc900/nuc900-pcm.c: At top level:
sound/soc/nuc900/nuc900-pcm.c:337: error: expected ',' or ';' before 'static'
sound/soc/nuc900/nuc900-pcm.c:354: error: 'nuc900_soc_platform_probe' undeclared here (not in a function)
make[3]: *** [sound/soc/nuc900/nuc900-pcm.o] Error 1
make[2]: *** [sound/soc/nuc900] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit e3edefbd4a9071daf388978355f69c37fbeae261
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 17:40:05 2010 +0800
ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove
This patch fixes below compile warning:
CC sound/soc/nuc900/nuc900-ac97.o
sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type
sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 5a8f1d4701a50bc2a1e112f6c8e7d30f63597eae
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Mon Nov 29 17:39:10 2010 +0800
ASoC: Fix compile error for nuc900-ac97.c
Fix below compile error by add a missing ';'.
CC sound/soc/nuc900/nuc900-ac97.o
sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type
sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type
sound/soc/nuc900/nuc900-ac97.c:318: error: expected ',' or ';' before 'static'
sound/soc/nuc900/nuc900-ac97.c:405: error: 'nuc900_ac97_drvprobe' undeclared here (not in a function)
make[3]: *** [sound/soc/nuc900/nuc900-ac97.o] Error 1
make[2]: *** [sound/soc/nuc900] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit 523fb8c867650196bef830d5dd9315d9975a9b7e
Author: Suresh Jayaraman <sjayaraman@xxxxxxx>
Date: Mon Nov 29 22:39:47 2010 +0530
cifs: trivial comment fix for cifs_invalidate_mapping
Only the callers check whether the invalid_mapping flag is set and not
cifs_invalidate_mapping().
Signed-off-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit a41778694806ac1ccd4b1dafed1abef8d5ba98ac
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Nov 28 21:43:02 2010 +0000
xps: add __rcu annotations
Avoid sparse warnings : add __rcu annotations and use
rcu_dereference_protected() where necessary.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b02038a17b271e0f70616c54e4eccb5cc33d1b74
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Nov 28 05:43:24 2010 +0000
xps: NUMA allocations for per cpu data
store_xps_map() allocates maps that are used by single cpu, it makes
sense to use NUMA allocations.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 49b4a6546fac02f58784f0744e0f99a6562ccc03
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Mon Nov 29 00:14:58 2010 +0000
sctp: kill unused macros in head file
1. SCTP_CMD_NUM_VERBS,SCTP_CMD_MAX
These two macros have never been used for several years since v2.6.12-rc2.
2.sctp_port_rover,sctp_port_alloc_lock
The commit 063930 abandoned global variables of port_rover and port_alloc_lock,
but still keep two macros to refer to them.
So, remove them now.
commit 06393009000779b00a558fd2f280882cc7dc2008
Author: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Oct 10 17:30:18 2007 -0700
[SCTP]: port randomization
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d65c3768afb47fb93c43fbfcafef53502edaaa85
Author: Simon Wood <simon@xxxxxxxxxxxxx>
Date: Mon Nov 29 17:41:23 2010 +0100
HID: add support for F430 Force Feedback Wheel
This patch adds USB IDs to enable force feedback on the Thrustmaster
F430 wheel.
Antonio did the work, I just converted to git patch to include in Kernel.
Reported-by: Antonio Orefice <aorefice77@xxxxxxxxx>
Signed-off-by: Simon Wood <simon@xxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 44266416f786514ec43a0d15ad951c34566b99c9
Author: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
Date: Mon Nov 29 18:46:22 2010 +0300
ARM: cns3xxx: Fix build with CONFIG_PCI=y
commit 6338a6aa7c082f11d55712251e14178c68bf5869 ("ARM: 6269/1: Add 'code'
parameter for hook_fault_code()") breaks CNS3xxx build:
CC arch/arm/mach-cns3xxx/pcie.o
pcie.c: In function 'cns3xxx_pcie_init':
pcie.c:373: warning: passing argument 4 of 'hook_fault_code' makes integer from pointer without a cast
pcie.c:373: error: too few arguments to function 'hook_fault_code'
This commit fixes the small issue.
Cc: stable@xxxxxxxxxx [36]
Signed-off-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
commit 7f51439a3c078393e7618a636fea403afa35948c
Author: Konstantin Sinyuk <kostyas@xxxxxxxxxxxxxx>
Date: Tue Nov 16 08:55:03 2010 +0200
[ARM] Dove: add support for CM-A510 machine.
This patch adds support for CM-A510 machine
Signed-off-by: Konstantin Sinyuk <kostyas@xxxxxxxxxxxxxx>
Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Reviewed-by: Saeed Bishara <saeed@xxxxxxxxxxx>
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
commit 1ccb53a4f3d0bfd65889fcfe988d829633641f49
Author: Evgeniy Dushistov <dushistov@xxxxxxx>
Date: Tue Nov 9 22:46:17 2010 +0300
[ARM] mv78xx: wrong cpu1 window base register address
The constant DDR_WINDOW_CPU1_BASE has wrong value.
Because of that mv78xx0_mbus_dram_info is not filled properly on
start, and in its turn drivers, that used mv78xx0_mbus_dram_info,
in my case mv643xx_eth.c, not work on second core.
According to
MV76100, MV78100, and MV78200 DiscoveryTM Innovation Series
CPU Family Functional Specifications
address should be 0x1570.
Signed-off-by: Evgeniy Dushistov <dushistov@xxxxxxx>
Acked-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>
commit 760efe6910d5743084b586d3d0a3b65aea96fb2f
Author: Mac Lin <mkl0301@xxxxxxxxx>
Date: Thu Nov 25 23:58:00 2010 +0800
USB: cns3xxx: Add EHCI and OHCI bus glue for cns3xxx SOCs
The CNS3XXX SOC has include USB EHCI and OHCI compatible controllers.
This patch adds the necessary glue logic to allow ehci-hcd and ohci-hcd
drivers to work on CNS3XXX
The EHCI and OHCI controllers share a common clock control and reset
bit, therefore additional check for the timming of enabling and disabling
is required. The USB bit of PLL Power Down Control is also shared by OTG,
24MHzUART clock, Crypto clock, PCIe reference clock, and Clock Scale
Generator. Therefore we only ensure it is enabled, while not disabling it.
Signed-off-by: Mac Lin <mkl0301@xxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
commit 5478755616ae2ef1ce144dded589b62b2a50d575
Author: Xiaotian Feng <dfeng@xxxxxxxxxx>
Date: Mon Nov 29 10:03:55 2010 +0100
block: check for proper length of iov entries earlier in blk_rq_map_user_iov()
commit 9284bcf checks for proper length of iov entries in
blk_rq_map_user_iov(). But if the map is unaligned, kernel
will break out the loop without checking for the proper length.
So we need to check the proper length before the unalign check.
Signed-off-by: Xiaotian Feng <dfeng@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit e4dde731ae70072338352c6f8fb75fd04a42cf8d
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Mon Nov 29 10:19:07 2010 +0200
vhost: correctly set bits of dirty pages
Fix two bugs in dirty page logging:
When counting pages we should increase address by 1 instead of
VHOST_PAGE_SIZE. Make log_write() correctly process requests
that cross pages with write_address not starting at page boundary.
Reported-by: Jason Wang <jasowang@xxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit ac70eb1305d5a81efd1e32327d7e79be15a63a5a
Author: Daniel T Chen <crimsun@xxxxxxxxxx>
Date: Sat Nov 27 13:58:04 2010 -0500
ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
BugLink: https://launchpad.net/bugs/682199
A 2.6.35 (Ubuntu Maverick) user, burningphantom1, reported a regression
in audio: playback was inaudible through both speakers and headphones.
In commit 272a527c04 of sound-2.6.git, a new model was added with this
machine's PCI SSID. Fortunately, it is now sufficient to use the auto
model for BIOS auto-parsing instead of the existing quirk.
Playback, capture, and jack sense were verified working for both
2.6.35 and the alsa-driver snapshot from 2010-11-27 when model=auto is
used.
Reported-and-tested-by: burningphantom1
Cc: <stable@xxxxxxxxxx> [2.6.35+]
Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit eb87e6770a9b1ad54b13fcfe80a1346d0c257536
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 06:19:52 2010 +0000
ARM: mach-shmobile: mackerel: Add lost GPIO_FN_LCDD 18 - 23
RGB24 bus needs 18-23 pin
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c5027dec02c96964847fa68d512318ee5f6f7a19
Author: Keith Packard <keithp@xxxxxxxxxx>
Date: Fri Nov 26 10:45:59 2010 -0800
drm: record monitor status in output_poll_execute
In order to correctly report monitor connected status changes, the
previous monitor status must be recorded in the connector->status
value instead of being discarded.
Signed-off-by: Keith Packard <keithp@xxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit bf9dc102e284a5aa78c73fc9d72e11d5ccd8669f
Author: Keith Packard <keithp@xxxxxxxxxx>
Date: Fri Nov 26 10:45:58 2010 -0800
drm: Set connector DPMS status to ON in drm_crtc_helper_set_config
When setting a new crtc configuration, force the DPMS state of all
connectors to ON. Otherwise, they'll be left at OFF and a future mode set
that disables the specified connector will not turn the connector off.
Signed-off-by: Keith Packard <keithp@xxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit f4f0c135de9d359e22172adfb1d30ddcb38c00a7
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 13:25:22 2010 +0900
ARM: mach-shmobile: mackerel: Add mackerel defconfig
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4b82b68925d19ab32159ba94b30768f705812e0f
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 02:21:48 2010 +0000
ARM: mach-shmobile: mackerel: document switch and pin modes.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 11fee467a119afac02d336bf41dcd9c4db2b6106
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 02:21:43 2010 +0000
ARM: mach-shmobile: mackerel: Add LCDC support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2264c151efa632fa8aab7377d13d9aa1476547bf
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 02:21:37 2010 +0000
ARM: mach-shmobile: mackerel: Add SMSC support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 920adc75d51d23fe3e8a7ce2c946b2b24e6f7742
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 02:21:21 2010 +0000
ARM: mach-shmobile: Add mackerel board support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 208c7dc2727ec0fbc678da5e749bcc178c08463d
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Mon Nov 29 02:10:08 2010 +0000
ARM: mach-shmobile: ag5evm: Add FSI resources
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 193006f7e3b1abd42d7a3677b54fa2996461a842
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Fri Nov 26 17:06:28 2010 +0000
sh: boards: mach-se: use IS_ERR() instead of NULL check
clk_get() returns ERR_PTR() on error, not NULL.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4bd5d259e451d35380de2fcd1a3510ae22d000a3
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Fri Nov 26 09:40:22 2010 +0000
sh: Add div6_reparent_clks to clock framework for FSI
Current clk_ops doesn't support .init which
is used to select external clock on ecovec
without CONFIG_SH_CLK_CPG_LEGACY.
To solve this problem, this patch add div6_reparent_clks
to clock-sh7724.
This patch solve compile error too.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 22efa0fee32d9e7f6f6fbc396a872b5708d86048
Author: Simon Horman <horms@xxxxxxxxxxxx>
Date: Sat Nov 27 00:11:55 2010 +0000
sh, mmc: Use defines when setting CE_CLK_CTRL
The 16-19th bits of CE_CLK_CTRL set the
MMC clock frequency.
Cc: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1ae0affedce1d3e401991fbe7f2674753f0a7641
Author: Simon Horman <horms@xxxxxxxxxxxx>
Date: Fri Nov 26 23:02:58 2010 +0000
mmc, sh: Correct value for reset
This resolves a regression that I introduced in
"mmc, sh: Move constants to sh_mmcif.h". Having
examined the manual and tested the code on an AP4EVB board
it seems that the correct sequence is.
1) Write 1 to bit 31 and zeros to all other bits
2) Write zero to all bits
Cc: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7211a1bae6eac26539eb2d77a26fcd1bccef8137
Author: Simon Horman <horms@xxxxxxxxxxxx>
Date: Fri Nov 26 23:02:57 2010 +0000
sh, mmc: Make mmcif_update_progress static inline
extern inline doesn't make much sense
Cc: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd
Author: Scott J. Goldman <scottjg@xxxxxxxxxx>
Date: Sat Nov 27 10:33:55 2010 +0000
vmxnet3: fix compilation when RSS is disabled
If RSS is disabled, we can ifdef out some RSS specific code. This fixes
the compile error found by Randy Dunlap.
Signed-off-by: Scott J. Goldman <scottjg@xxxxxxxxxx>
Reviewed-by: Bhavesh Davda <bhavesh@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bf26414510103448ad3dc069c7422462f03ea3d7
Author: Tom Herbert <therbert@xxxxxxxxxx>
Date: Fri Nov 26 08:36:09 2010 +0000
xps: Add CONFIG_XPS
This patch adds XPS_CONFIG option to enable and disable XPS. This is
done in the same manner as RPS_CONFIG. This is also fixes build
failure in XPS code when SMP is not enabled.
Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8fa9208e305e24978b897d6ea057604444ce77e1
Author: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Date: Fri Nov 26 02:41:20 2010 +0000
qeth: l3 fix len in tso hdr
The tso hdr is longer then the regular l3 hdr. Fix the calculation
of the total len by accounting the size of the tso hdr.
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2b6203bb7d85e6a2ca2088b8684f30be70246ddf
Author: Ursula Braun <ursula.braun@xxxxxxxxxx>
Date: Fri Nov 26 02:41:19 2010 +0000
qeth: enable interface setup if LAN is offline
Device initialization of a qeth device contains a STARTLAN step.
This step may fail, if cable is not yet plugged in. The qeth device
stays in state HARDSETUP until cable is plugged in. This prevents
further preparational initialization steps of the qeth device and
its network interface. This patch makes sure initialization of qeth
device continues, even though cable is not yet plugged in.
Once carrier is available, qeth is notified, triggers a recovery
which results in a working network interface.
Signed-off-by: Ursula Braun <ursula.braun@xxxxxxxxxx>
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cdac082e051136a021f28d0f63c56e916b541253
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 26 02:41:18 2010 +0000
drivers/s390/net: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f3aa3136d9c15ff693198eb34701a74bb0b6b969
Author: Sachin Sant <sachinp@xxxxxxxxxx>
Date: Fri Nov 26 02:41:17 2010 +0000
qeth lcs: convert mc rwlock to RCU
Commit 1d7138de878d1d4210727c1200193e69596f93b3
igmp: RCU conversion of in_dev->mc_list
converted rwlock to RCU.
Update the s390 network drivers(qeth & lcs) code to adapt to this change.
V2 : Changes based on suggestions given by Eric Dumazet
Signed-off-by: Sachin Sant <sachinp@xxxxxxxxxx>
Signed-off-by: Ursula Braun <ursula.braun@xxxxxxxxxx>
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5
Author: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Date: Sun Nov 28 18:10:53 2010 -0800
stmmac: fix stmmac_resume removing not yet used shutdown flag
The commit to convert to use the dev_pm_ops struct
introduces a bug. The shutdown flag is not yet used
because the hibernation on memory is done by using
the freeze callback.
Thanks to Vlad for having reported it.
Reported-by: Vlad Lungu <vlad.lungu@xxxxxxxxxxxxx>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit de855b992d75e49816eb09231764e7a63a4f555d
Author: Szymon Janc <szymon@xxxxxxxxxxx>
Date: Sat Nov 27 08:39:48 2010 +0000
forcedeth: use usleep_range not msleep for small sleeps
Signed-off-by: Szymon Janc <szymon@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 34cf97eb255b09751f1eb1b5573813e9ea3fe21f
Author: Szymon Janc <szymon@xxxxxxxxxxx>
Date: Sat Nov 27 08:39:46 2010 +0000
forcedeth: do not use assignment in if conditions
Signed-off-by: Szymon Janc <szymon@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5504e1397cc860e61fbb68c56e7a10db613275fd
Author: Szymon Janc <szymon@xxxxxxxxxxx>
Date: Sat Nov 27 08:39:45 2010 +0000
forcedeth: include <linux/io.h> and <linux/uaccess.h> instead of <asm/io.h> and <asm/uaccess.h> as suggested by checkpatch
Signed-off-by: Szymon Janc <szymon@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9b03b06b65856f70564c53654d44053f3072379e
Author: Szymon Janc <szymon@xxxxxxxxxxx>
Date: Sat Nov 27 08:39:44 2010 +0000
forcedeth: remove unnecessary checks before kfree
Signed-off-by: Szymon Janc <szymon@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9
Author: Szymon Janc <szymon@xxxxxxxxxxx>
Date: Sat Nov 27 08:39:43 2010 +0000
forcedeth: fix multiple code style issues
Signed-off-by: Szymon Janc <szymon@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 47c05314328d9c40f6006783dc4c1e3080bd2914
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 28 00:02:59 2010 +0000
zd1211rw: document need for kmalloc cast
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e80be0b0ee307a2801e57cf36333d3d659e4bcc6
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 27 23:05:45 2010 +0000
vxge: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f3167460144cd2c24b964a32d40d32f851b5d5f4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 27 23:05:44 2010 +0000
qlcnic: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0acdf68f495793143802dd4f3e47918dddcceed7
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 27 23:05:43 2010 +0000
netxen: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90
Author: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Date: Wed Nov 24 17:12:10 2010 -0800
Smack: UDS revision
This patch addresses a number of long standing issues
with the way Smack treats UNIX domain sockets.
All access control was being done based on the label of
the file system object. This is inconsistant with the
internet domain, in which access is done based on the
IPIN and IPOUT attributes of the socket. As a result
of the inode label policy it was not possible to use
a UDS socket for label cognizant services, including
dbus and the X11 server.
Support for SCM_PEERSEC on UDS sockets is also provided.
Signed-off-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 7e70cb4978507cf31d76b90e4cfb4c28cad87f0c
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 18:55:35 2010 -0500
keys: add new key-type encrypted
Define a new kernel key-type called 'encrypted'. Encrypted keys are kernel
generated random numbers, which are encrypted/decrypted with a 'trusted'
symmetric key. Encrypted keys are created/encrypted/decrypted in the kernel.
Userspace only ever sees/stores encrypted blobs.
Changelog:
- bug fix: replaced master-key rcu based locking with semaphore
(reported by David Howells)
- Removed memset of crypto_shash_digest() digest output
- Replaced verification of 'key-type:key-desc' using strcspn(), with
one based on string constants.
- Moved documentation to Documentation/keys-trusted-encrypted.txt
- Replace hash with shash (based on comments by David Howells)
- Make lengths/counts size_t where possible (based on comments by David Howells)
Could not convert most lengths, as crypto expects 'unsigned int'
(size_t: on 32 bit is defined as unsigned int, but on 64 bit is unsigned long)
- Add 'const' where possible (based on comments by David Howells)
- allocate derived_buf dynamically to support arbitrary length master key
(fixed by Roberto Sassu)
- wait until late_initcall for crypto libraries to be registered
- cleanup security/Kconfig
- Add missing 'update' keyword (reported/fixed by Roberto Sassu)
- Free epayload on failure to create key (reported/fixed by Roberto Sassu)
- Increase the data size limit (requested by Roberto Sassu)
- Crypto return codes are always 0 on success and negative on failure,
remove unnecessary tests.
- Replaced kzalloc() with kmalloc()
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Signed-off-by: David Safford <safford@xxxxxxxxxxxxxx>
Reviewed-by: Roberto Sassu <roberto.sassu@xxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit d00a1c72f7f4661212299e6cb132dfa58030bcdb
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 17:50:34 2010 -0500
keys: add new trusted key-type
Define a new kernel key-type called 'trusted'. Trusted keys are random
number symmetric keys, generated and RSA-sealed by the TPM. The TPM
only unseals the keys, if the boot PCRs and other criteria match.
Userspace can only ever see encrypted blobs.
Based on suggestions by Jason Gunthorpe, several new options have been
added to support additional usages.
The new options are:
migratable= designates that the key may/may not ever be updated
(resealed under a new key, new pcrinfo or new auth.)
pcrlock=n extends the designated PCR 'n' with a random value,
so that a key sealed to that PCR may not be unsealed
again until after a reboot.
keyhandle= specifies the sealing/unsealing key handle.
keyauth= specifies the sealing/unsealing key auth.
blobauth= specifies the sealed data auth.
Implementation of a kernel reserved locality for trusted keys will be
investigated for a possible future extension.
Changelog:
- Updated and added examples to Documentation/keys-trusted-encrypted.txt
- Moved generic TPM constants to include/linux/tpm_command.h
(David Howell's suggestion.)
- trusted_defined.c: replaced kzalloc with kmalloc, added pcrlock failure
error handling, added const qualifiers where appropriate.
- moved to late_initcall
- updated from hash to shash (suggestion by David Howells)
- reduced worst stack usage (tpm_seal) from 530 to 312 bytes
- moved documentation to Documentation directory (suggestion by David Howells)
- all the other code cleanups suggested by David Howells
- Add pcrlock CAP_SYS_ADMIN dependency (based on comment by Jason Gunthorpe)
- New options: migratable, pcrlock, keyhandle, keyauth, blobauth (based on
discussions with Jason Gunthorpe)
- Free payload on failure to create key(reported/fixed by Roberto Sassu)
- Updated Kconfig and other descriptions (based on Serge Hallyn's suggestion)
- Replaced kzalloc() with kmalloc() (reported by Serge Hallyn)
Signed-off-by: David Safford <safford@xxxxxxxxxxxxxx>
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit c749ba912e87ccebd674ae24b97462176c63732e
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 18:54:16 2010 -0500
key: add tpm_send command
Add internal kernel tpm_send() command used to seal/unseal keys.
Changelog:
- replaced module_put in tpm_send() with new tpm_chip_put() wrapper
(suggested by David Howells)
- Make tpm_send() cmd argument a 'void *' (suggested by David Howells)
Signed-off-by: David Safford <safford@xxxxxxxxxxxxxx>
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Acked-by: Serge E. Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit a0e39349d80d8b5deeb264fb190bd064f7063252
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 17:50:32 2010 -0500
tpm: add module_put wrapper
For readability, define a tpm_chip_put() wrapper to call module_put().
Replace existing module_put() calls with the wrapper.
(Change based on trusted/encrypted patchset review by David Howells.)
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Signed-off-by: David Safford <safford@xxxxxxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Acked-by: Serge E. Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit dc88e46029486ed475c71fe1bb696d39511ac8fe
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 17:50:31 2010 -0500
lib: hex2bin converts ascii hexadecimal string to binary
Similar to the kgdb_hex2mem() code, hex2bin converts a string
to binary using the hex_to_bin() library call.
Changelog:
- Replace parameter names with src/dst (based on David Howell's comment)
- Add 'const' where needed (based on David Howell's comment)
- Replace int with size_t (based on David Howell's comment)
Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
Acked-by: Serge E. Hallyn <serge@xxxxxxxxxx>
Acked-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit ce6ada35bdf710d16582cc4869c26722547e6f11
Author: Serge E. Hallyn <serge@xxxxxxxxxx>
Date: Thu Nov 25 17:11:32 2010 +0000
security: Define CAP_SYSLOG
Privileged syslog operations currently require CAP_SYS_ADMIN. Split
this off into a new CAP_SYSLOG privilege which we can sanely take away
from a container through the capability bounding set.
With this patch, an lxc container can be prevented from messing with
the host's syslog (i.e. dmesg -c).
Changelog: mar 12 2010: add selinux capability2:cap_syslog perm
Changelog: nov 22 2010:
. port to new kernel
. add a WARN_ONCE if userspace isn't using CAP_SYSLOG
Signed-off-by: Serge Hallyn <serge.hallyn@xxxxxxxxxx>
Acked-by: Andrew G. Morgan <morgan@xxxxxxxxxx>
Acked-By: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxx>
Cc: Stephen Smalley <sds@xxxxxxxxxxxxx>
Cc: "Christopher J. PeBenito" <cpebenito@xxxxxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab
Merge: 074e61ec3751da9ab88ee66d3818574556c03489 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17
Author: James Morris <jmorris@xxxxxxxxx>
Date: Mon Nov 29 08:27:07 2010 +1100
Merge branch 'master' into next
commit c661c4a2b0d64c33afc9018a406162b1f8ac5617
Author: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Date: Thu Nov 25 07:53:55 2010 +0000
cxgb3: Removing unused return variable
Currently the ret variable is not used for anything other than
receive the value of the t3_adapter_error(), which will always be 0,
because the reset parameter is 0.
Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 82a39eb6b3829a02e235656feddb4542517fcabc
Author: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>
Date: Thu Nov 25 03:15:07 2010 +0000
ipv6: Prepare the tree for un-inlined jhash.
jhash is widely used in the kernel and because the functions
are inlined, the cost in size is significant. Also, the new jhash
functions are slightly larger than the previous ones so better un-inline.
As a preparation step, the calls to the internal macros are replaced
with the plain jhash function calls.
Signed-off-by: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa285b1740f5b13e5a2606a927f3129954583d78
Author: Timo Teräs <timo.teras@xxxxxx>
Date: Tue Nov 23 04:03:45 2010 +0000
xfrm: fix gre key endianess
fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*.
Make xfrm_flowi_{s|d}port return network byte order values for gre
key too.
Signed-off-by: Timo Teräs <timo.teras@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6a632625c7da7594d059b88dae0e9c591af147ba
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:32 2010 +0000
ethoc: remove division from loops
Calculating the BD entry using a modulus operation isn't optimal, especially
inside the loop. This patch removes the modulus operations in favour of:
i) simply checking for wrapping in the case of cur_rx
ii) forcing num_tx to be a power of two and using it to mask out the
entry from cur_tx
The also prevents possible issues related overflow of the cur_rx and cur_tx
counters.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:31 2010 +0000
ethoc: fix function return type
update_ethoc_tx_stats doesn't need to return anything so make its return
type void in order to avoid an unnecessary cast when the function is called.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8dac428ae9ae54d8e8540ac157d92925dd7ebed8
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:30 2010 +0000
ethoc: rework mdio read/write
MDIO read and write were checking whether a timeout had expired to determine
whether to recheck the result of the MDIO operation. Under heavy CPU usage,
however, it was possible for the timeout to expire before the routine got
around to be able to check a second time even, thus erroneousy returning an
-EBUSY.
This patch changes the the MDIO IO routines to try up to five times to complete
the operation before giving up, thus lessening the dependency on CPU load.
This resolves a problem whereby a ping flood would keep the CPU so busy that
the above problem would manifest itself; the MDIO command to check link status
would fail and the interface would erroneously be shut down.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fa98eb0e867c6c16e239545d4deb7ad8f40631b3
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:29 2010 +0000
ethoc: rework interrupt handling
The old interrupt handling was incorrect in that it did not account for the
fact that the interrupt source bits get set irregardless of whether or not
their corresponding mask is set. This patch fixes that by masking off the
source bits for masked interrupts.
Furthermore, the handling of transmission events is moved to the NAPI polling
handler alongside the reception handler, thus preventing a whole bunch of
interrupts during heavy traffic.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 20f70ddd6558a39a89dba4af675686c5a8dbd7b3
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:28 2010 +0000
ethoc: Double check pending RX packet
An interrupt may occur between checking bd.stat and clearing the
interrupt source register which would result in the packet going totally
unnoticed as the interrupt will be missed. Double check bd.stat after
clearing the interrupt source register to guard against such an
occurrence.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7438a5455734d109fdf18d97147dc57a6dbe5a44
Author: Adam Edvardsson <adam.edvardsson@xxxxxxxx>
Date: Thu Nov 25 02:30:27 2010 +0000
ethoc: enable interrupts after napi_complete
Occasionally, it seems that some race is causing the interrupts to not be
reenabled otherwise with the end result that networking just stops working.
Enabling interrupts after calling napi_complete is more in line with what
other drivers do.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit eac0d3ff5a92de410964fdf0d072314821ca39fc
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:26 2010 +0000
ethoc: remove unused spinlock
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e0f4258be2515afce8ef1e6fb22312525c281798
Author: Jonas Bonn <jonas@xxxxxxxxxxxx>
Date: Thu Nov 25 02:30:25 2010 +0000
ethoc: Add device tree configuration
This patch adds the ability to describe ethernet devices via a flattened
device tree. As device tree remains an optional feature, these bits all
need to be guarded by CONFIG_OF ifdefs.
MAC address is settable via the device tree parameter "local-mac-address";
however, the selection of the phy id is limited to probing, for now.
Signed-off-by: Jonas Bonn <jonas@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 85beb5869a4f6abb52a7cf8e01de6fa57e9ee47d
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Wed Nov 24 16:23:34 2010 -0500
tracing/slab: Move kmalloc tracepoint out of inline code
The tracepoint for kmalloc is in the slab inlined code which causes
every instance of kmalloc to have the tracepoint.
This patch moves the tracepoint out of the inline code to the
slab C file, which removes a large number of inlined trace
points.
objdump -dr vmlinux.slab| grep 'jmpq.*<trace_kmalloc' |wc -l
213
objdump -dr vmlinux.slab.patched| grep 'jmpq.*<trace_kmalloc' |wc -l
1
This also has a nice impact on size.
text data bss dec hex filename
7023060 2121564 2482432 11627056 b16a30 vmlinux.slab
6970579 2109772 2482432 11562783 b06f1f vmlinux.slab.patched
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 25 02:18:45 2010 +0000
X25 remove bkl in call user data length ioctl
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 74a7e440807d34e586e9feb8e14851b5c80fbfe5
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 25 02:18:43 2010 +0000
X25 remove bkl from causediag ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5b7958dfa5db758e36e92e1790075b470b4947f8
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 25 02:18:40 2010 +0000
X25 remove bkl from calluserdata ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f90de660678cf553f63c387945830a2e4d26dd3e
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 25 02:18:35 2010 +0000
X25 remove bkl in facility ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5595a1a5997953dbd8c5df7c2f7d4b3a2eb2be4b
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 25 02:18:15 2010 +0000
X25 remove bkl in subscription ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5892b9e9ebdde50fbd524570d61ceb74f8be33f3
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Sun Nov 28 00:23:35 2010 +0000
bnx2x: Use helpers instead of direct access to the shinfo(skb) fields
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9ab4650f718a0e1cb8792bab4ef97efca4ac75c2
Author: Dinh Nguyen <Dinh.Nguyen@xxxxxxxxxxxxx>
Date: Mon Nov 15 11:30:01 2010 -0600
ARM: imx: Get the silicon version from the IIM module
Instead of reading the silicon version from ROM, we should
read the SREV register from the IIM.
Freescale has dropped all support for MX51 REV1.0, only MX51
REV 2.0 and 3.0 are valid.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit be7ff1afec25f2700ca85e3956a2cb3a7b74acd5
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date: Wed Nov 24 13:48:55 2010 +0000
bnx2: Remove config access to non-standard registers
In KVM passthrough mode, the driver may not have config access to
non-standard registers. The BNX2_PCICFG_MISC_CONFIG config register
access to setup mailbox swapping can be done using MMIO.
Update version to 2.0.20.
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a5dac108d57072eec4d6745f32c162524509f2cb
Author: Eddie Wai <waie@xxxxxxxxxxxx>
Date: Wed Nov 24 13:48:54 2010 +0000
bnx2: Fix reset bug on 5709
The 5709 chip requires the BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE bit to be
cleared and polling for pending DMAs to complete before chip reset.
Without this step, we've seen NMIs during repeated resets of the chip.
Signed-off-by: Eddie Wai <waie@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 19eb5cc559f716dc98ce03a5bad6030fdc71e897
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Wed Nov 24 13:14:50 2010 +0000
8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues
Now that the vlan device is lockless and single queue do not
transfer the real num queues. This is causing a BUG_ON to occur.
kernel BUG at net/8021q/vlan.c:345!
Call Trace:
[<ffffffff813fd6e8>] ? fib_rules_event+0x28/0x1b0
[<ffffffff814ad2b5>] notifier_call_chain+0x55/0x80
[<ffffffff81089156>] raw_notifier_call_chain+0x16/0x20
[<ffffffff813e5af7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff813e6756>] netdev_features_change+0x16/0x20
[<ffffffffa02995be>] ixgbe_fcoe_enable+0xae/0x100 [ixgbe]
[<ffffffffa01da06a>] vlan_dev_fcoe_enable+0x2a/0x30 [8021q]
[<ffffffffa02d08c3>] fcoe_create+0x163/0x630 [fcoe]
[<ffffffff811244d5>] ? mmap_region+0x255/0x5a0
[<ffffffff81080ef0>] param_attr_store+0x50/0x80
[<ffffffff810809b6>] module_attr_store+0x26/0x30
[<ffffffff811b9db2>] sysfs_write_file+0xf2/0x180
[<ffffffff8114fc88>] vfs_write+0xc8/0x190
[<ffffffff81150621>] sys_write+0x51/0x90
[<ffffffff8100c0b2>] system_call_fastpath+0x16/0x1b
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5a0d2268d259886f0c87131639d19eb4a67b4532
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 23 10:42:02 2010 +0000
net: add netif_tx_queue_frozen_or_stopped
When testing struct netdev_queue state against FROZEN bit, we also test
XOFF bit. We can test both bits at once and save some cycles.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d3c15cab213becc49a6f2ad7f48a59513a5f17dd
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Wed Nov 24 21:47:56 2010 +0000
ipv6: kill two unused macro definition
1. IPV6_TLV_TEL_DST_SIZE
This has not been using for several years since created.
2. RT6_INFO_LEN
commit 33120b30 kill all RT6_INFO_LEN's references, but only this definition remained.
commit 33120b30cc3b8665204d4fcde7288638b0dd04d5
Author: Alexey Dobriyan <adobriyan@xxxxx>
Date: Tue Nov 6 05:27:11 2007 -0800
[IPV6]: Convert /proc/net/ipv6_route to seq_file interface
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a40c9f88b5e3da500ddab9440e5ddac170c12281
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 23 22:57:47 2010 +0000
net: add some KERN_CONT markers to continuation lines
Cc: netdev@xxxxxxxxxxxxxxx
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5a6f95e653adf52ee1ff09cd5e66c2640c65ff66
Author: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Date: Tue Nov 23 03:08:27 2010 +0000
netxen: avoid using reset_devices as it may become obsolete
In kdump environment do not depend on reset_devices
parameter to reset the device as the parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the device
needs a reset.
Driver maintains a count of number of pci functions probed
and decrements the count when remove handler of that pci function
is called. If the first probe, probe of function 0,
detects the count as non zero then reset the device.
Signed-off-by: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b0044bcfa95ddf2e317863fb29121c284b6725ca
Author: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Date: Tue Nov 23 01:25:21 2010 +0000
qlcnic: avoid using reset_devices as it may become obsolete.
In kdump environment do not depend upon reset_devices parameter
to reset the pci function as this parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the pci
function needs to be reset.
Per function refcount is maintained in driver, which is set in probe
and reset in remove handler of adapter. If the probe detects the count
as non zero then reset the function.
Signed-off-by: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5584b8078a60e34ec7d37c9b67a0f3d389a1a2f6
Author: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Date: Mon Nov 22 23:00:42 2010 +0000
sctp: kill unused macro definition
These macros have been existed for several years since v2.6.12-rc2.
But they never be used. So remove them now.
Signed-off-by: Shan Wei <shanwei@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ce06b9d6d33fd2ed799b6e825d68fe95077da354
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Sun Nov 28 16:37:14 2010 +0100
HID: hid-core - rename hid_blacklist to hid_have_special_driver
To avoid confusion with hid_blacklist describing various quirks in
usbhid code, let's rename this one.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit de18a29e0fa3904894b4e02fae0e712cd43f740c
Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
Date: Sat Nov 27 22:30:41 2010 +0100
drm/i915: fix regression due to ba3d8d749b01548b9
We don't track gpu flush request in any special way. So even with
obj->write_domain == 0, a gpu flush might be outstanding but no
yet executed. Even worse, the latest request might use the object
only for reading. So and unconditional call to object_wait_rendering
is needed for !pipelined.
Hence revert that patch fully and untangle the flushing from the
synchronization again.
Reported-by: Keith Packard <keithp@xxxxxxxxxx>
Tested-by: Keith Packard <keithp@xxxxxxxxxx>
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit e7a3481c0246c8e45e79c629efd63b168e91fcda
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date: Mon Oct 25 16:53:46 2010 -0700
x86/pvclock: Zero last_value on resume
If the guest domain has been suspend/resumed or migrated, then the
system clock backing the pvclock clocksource may revert to a smaller
value (ie, can be non-monotonic across the migration/save-restore).
Make sure we zero last_value in that case so that the domain
continues to see clock updates.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cf7afbfeb8ceb0187348d0a1a0db61305e25f05f
Author: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Date: Mon Nov 22 01:31:54 2010 +0000
rtnl: make link af-specific updates atomic
As David pointed out correctly, updates to af-specific attributes
are currently not atomic. If multiple changes are requested and
one of them fails, previous updates may have been applied already
leaving the link behind in a undefined state.
This patch splits the function parse_link_af() into two functions
validate_link_af() and set_link_at(). validate_link_af() is placed
to validate_linkmsg() check for errors as early as possible before
any changes to the link have been made. set_link_af() is called to
commit the changes later.
This method is not fail proof, while it is currently sufficient
to make set_link_af() inerrable and thus 100% atomic, the
validation function method will not be able to detect all error
scenarios in the future, there will likely always be errors
depending on states which are f.e. not protected by rtnl_mutex
and thus may change between validation and setting.
Also, instead of silently ignoring unknown address families and
config blocks for address families which did not register a set
function the errors EAFNOSUPPORT respectively EOPNOSUPPORT are
returned to avoid comitting 4 out of 5 update requests without
notifying the user.
Signed-off-by: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 89bf67f1f080c947c92f8773482d9e57767ca292
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Nov 22 00:15:06 2010 +0000
drivers/net: use vzalloc()
Use vzalloc() and vzalloc_node() in net drivers
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fe6d2a38b2076cba515dc95b5dc1589a7ab51c17
Author: Sathya Perla <sathya.perla@xxxxxxxxxx>
Date: Sun Nov 21 23:25:50 2010 +0000
be2net: adding support for Lancer family of CNAs
Key changes are:
- EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx
vector to EQ-id.
- BAR mapping and some req locations different for Lancer.
- TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in
Lancer.
- CEV_IST reg not present in Lancer; so, peek into event queue to check for
new entries
- cq_create and mcc_create cmd interface is different for Lancer; handle
accordingly
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@xxxxxxxxxx>
Signed-off-by: Sathya Perla <sathya.perla@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a115413de13ae6beb0cbfc198afe385a261ab284
Author: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
Date: Sat Nov 13 20:42:29 2010 +0100
drbd: fix for spin_lock_irqsave in endio callback
In commit 9b7f76dc37919ea36caa9680a3f765e5b19b25fb,
Author: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
Date: Wed Aug 11 23:40:24 2010 +0200
drbd: new configuration parameter c-min-rate
a bad chunk slipped through, which is now reverted as well,
restoring the correct irqsave for the endio callback.
This patch also add comments at both req_mod()
and in the endio callback so it should not happen again.
Signed-off-by: Philipp Reisner <philipp.reisner@xxxxxxxxxx>
Signed-off-by: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
commit c13f7e1a94007c4381814e7daf033e3e8f0663f3
Author: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
Date: Fri Oct 29 23:32:01 2010 +0200
drbd: don't recvmsg with zero length
This should fix a performance degradation we observed recently.
If we don't expect any subheader, we should not call into the tcp stack,
as that may add considerable latency if there is no data available at
this point.
For a synthetic synchronous write load with single outstanding writes,
this additional latency when processing the "unplug remote" packet
added up to a performance degradation factor >= 10.
Signed-off-by: Philipp Reisner <philipp.reisner@xxxxxxxxxx>
Signed-off-by: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
commit 068ffaa8bfb67c2ddb3ecaf38cc90f94a1a92fe3
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Sat Nov 27 02:41:01 2010 -0200
perf tools: Fix lost and unknown events handling
Fix it by explaining what can be happening and giving the number of processed
and lost events.
Also holler if unknown events were found, that can be due to processing a
perf.data file collected using a newer tool where newer events got added on
reporting using an older perf tool, that or a bug, so ask for a report to be
made.
Works on both --tui and --stdio.
Suggested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frédéric Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 008f29d3865828bb27e35d6d3fa889d0853b469f
Author: Shawn Bohrer <sbohrer@xxxxxxxxxxxxxxx>
Date: Sun Nov 21 10:09:39 2010 -0600
perf trace: Handle DT_UNKNOWN on filesystems that don't support d_type
Some filesystems like xfs and reiserfs will return DT_UNKNOWN for the
d_type. Handle this case by calling stat() to determine the type.
Cc: Andreas Schwab <schwab@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290355779-3276-1-git-send-email-sbohrer@xxxxxxxxxxxxxxx>
Signed-off-by: Shawn Bohrer <sbohrer@xxxxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 9d1faba5fe410558099f13cfada2eab03186769d
Author: Ian Munsie <imunsie@xxxxxxxxxxx>
Date: Thu Nov 25 15:12:53 2010 +1100
perf symbols: Correct final kernel map guesses
If a 32bit userspace perf is running on a 64bit kernel, the end of the final
map in the kernel would incorrectly be set to 2^32-1 rather than 2^64-1.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290658375-10342-1-git-send-email-imunsie@xxxxxxxxxxx>
Signed-off-by: Ian Munsie <imunsie@xxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 37982ba0a0630066a6a0844a66aedaf91c66db84
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Fri Nov 26 18:31:54 2010 -0200
perf events: Default to using event__process_lost
Tool developers have to fill in a 'perf_event_ops' method table to
specify how to handle each event, so far the ones that were not
explicitely especified would get a stub that would just discard the
event.
Change that so that tool developers can get the lost event details and
the total number of such events at the end of 'perf report -D' output.
Suggested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit baa2f6cedbfae962f04281a31f08ec29667d31a0
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Fri Nov 26 19:39:15 2010 -0200
perf record: Add option to disable collecting build-ids
Collecting build-ids for long running sessions may take a long time
because it needs to traverse the whole just collected perf.data stream
of events, marking the DSOs that had hits and then looking for the
.note.gnu.build-id ELF section.
For things like the 'trace' tool that records and right away consumes
the data on systems where its unlikely that the DSOs being monitored
will change while 'trace' runs, it is desirable to remove build id
collection, so add a -B/--no-buildid option to perf record to allow such
use case.
Longer term we'll avoid all this if we, at DSO load time, in the kernel,
take advantage of this slow code path to collect the build-id and stash
it somewhere, so that we can insert it in the PERF_RECORD_MMAP event.
Reported-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit f6e3354d02aa1f30672e3671098c12cb49c7da25
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 16 00:22:09 2010 +0000
ARM: pgtable: introduce pteval_t to represent a pte value
This makes everywhere dealing with pte values use the same type.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 97092e0c56830457af0639f6bd904537a150ea4a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 16 00:16:01 2010 +0000
ARM: pgtable: use phys_addr_t for physical addresses
Ensure that physical addresses are typed as phys_addr_t
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6e4beb5e682953212da48ebb9e5c90408b8d38ae
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 23:48:55 2010 +0000
ARM: pgtable: use pXd_none_or_clear_bad() in pgd_free()
Remove knowledge of the 2-level wrapping in pgd_free(), and use the
pXd_none_or_clear_bad() macros when checking the entries.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b0d03745b18c39b8e86e70f7778f2093d2cd4ed7
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Sun Nov 21 11:00:56 2010 +0000
ARM: pgtable: get rid of get_pgd_slow()/free_pgd_slow()
These old names are just aliases for pgd_alloc/pgd_free. Just use the
new names.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 69529c0eb76469168f1dd5851f363dbab17ce8fd
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Tue Nov 16 00:19:55 2010 +0000
ARM: pgtable: directly pass pgd/pmd/pte to their error functions
Rather than passing the pte value to __pte_error, pass the raw pte_t
cookie instead. Do the same for pmd and pgd functions.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit b510b049b549500816280f7ceaa087cfefdec581
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 26 20:35:25 2010 +0000
ARM: pgtable: group pte functions together
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 4eec4b1396ac6a6a602b4521d40e9cf596ab776d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 26 20:12:12 2010 +0000
ARM: pgtable: group pgd functions and data together
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit cf36797f35676dafae9d44484391ac7f56b2485a
Author: Mac Lin <mkl0301@xxxxxxxxx>
Date: Tue Nov 23 00:32:44 2010 +0800
ARM: cns3xxx: Add architecture definition for EHCI/OHCI controller
This patch add plateform_device for EHCI and OHCI controller on CNS3XXX.
Power reference count (usb_pwr_ref) is used to control enabling and
disabling the single clock control for both EHCI and OHCI controller.
It also removes EHCI/OHCI unused virtual address definitions.
Signed-off-by: Mac Lin <mkl0301@xxxxxxxxx>
Signed-off-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
commit 38e64ba0f13918d11e50bbd5bb775781ccd6439d
Author: Mac Lin <mkl0301@xxxxxxxxx>
Date: Tue Nov 23 00:32:43 2010 +0800
ARM: cns3xxx: Add new and export the old power management functions
This patch adds cns3xxx_pwr_clk_dis, and exports these power management
functions that may be used by many other device drivers on CNS3XXX.
Signed-off-by: Mac Lin <mkl0301@xxxxxxxxx>
Signed-off-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
commit df8f4d2f3ef9ca2154f7bd531492a83c4ab4558a
Author: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
Date: Fri Nov 26 20:48:35 2010 +0300
ARM: cns3xxx: Make cns3xxx_pwr_soft_rst_force() to actually reset blocks
commit 6eb5d146d4535 ("ARM: cns3xxx: Use IO memory accessors everywhere")
breaks cns3xxx_pwr_soft_rst_force() function, so that it doesn't write
cleared bit into the register.
This patch fixes the issue by adding the necessary __raw_writel().
Signed-off-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
commit eb9b2b69d3bdfe9cd98cd9b2c5715346a0f0140d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 26 17:39:28 2010 +0000
ARM: pgtable: move pgprot functions to one place
Rather than scattering them throughout the file, group them together.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit af86da5318136eb49c0453c2e2be3280ee5d18d9
Author: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Date: Fri Nov 26 14:32:09 2010 +0300
perf, x86: P4 PMU - describe config format
Add description of .config in a sake of RAW events.
At least this should bring some light to those who
will be reading this code.
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Reviewed-by: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Lin Ming <ming.m.lin@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 004417a6d468e24399e383645c068b498eed84ad
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Thu Nov 25 18:38:29 2010 +0100
perf, arch: Cleanup perf-pmu init vs lockup-detector
The perf hardware pmu got initialized at various points in the boot,
some before early_initcall() some after (notably arch_initcall).
The problem is that the NMI lockup detector is ran from early_initcall()
and expects the hardware pmu to be present.
Sanitize this by moving all architecture hardware pmu implementations to
initialize at early_initcall() and move the lockup detector to an explicit
initcall right after that.
Cc: paulus <paulus@xxxxxxxxx>
Cc: davem <davem@xxxxxxxxxxxxx>
Cc: Michael Cree <mcree@xxxxxxxxxxxx>
Cc: Deng-Cheng Zhu <dengcheng.zhu@xxxxxxxxx>
Acked-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290707759.2145.119.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5ef428c4b5950dddce7311e84321abb3aff7ebb0
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Date: Thu Nov 18 11:47:31 2010 +0100
x86: Set cpu masks before calling CPU_STARTING notifiers
When booting up a CPU set the various topology masks before
calling the CPU_STARTING notifier. This way the notifier
can actually use the masks.
This is needed for a perf change.
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290077254-12165-2-git-send-email-andi@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 963988262c3c8f4234f64a0dde59446a295e07bb
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Wed Nov 24 18:55:29 2010 +0100
perf: Ignore non-sampling overflows
Some arch implementations call perf_event_overflow() by 'accident',
ignore this.
Reported-by: Francis Moreau <francis.moro@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5d508e820a23d9b6e8a149dfaa8ba5cbedf3d95c
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Tue Nov 23 16:21:45 2010 +0100
perf: Don't bother to init the hrtimer for no SW sampling counters
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290525705-6265-3-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2e939d1da9b5628642314c1e68b4319e61263c94
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Tue Nov 23 16:21:44 2010 +0100
perf: Limit event refresh to sampling event
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290525705-6265-2-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6c7e550f13f8ad82efb6a5653ae628c2543c1768
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date: Tue Nov 23 16:21:43 2010 +0100
perf: Introduce is_sampling_event()
and use it when appropriate.
Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290525705-6265-1-git-send-email-fbuihuu@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 35d3778a8fe3c8b4a7513565e34d3bde00ce43ec
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Wed Nov 24 10:43:55 2010 +0100
scripts/tags.sh: Add magic for trace-events
Make tags find the trace-event definitions
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Acked-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
LKML-Reference: <1290591835.2072.438.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6c869e772c72d509d0db243a56c205ef48a29baf
Merge: e4e91ac410356da3a518188f371e9d3b52ee38ee ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Nov 26 15:07:02 2010 +0100
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
Merge reason: Resolve conflict, queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit b7a2b39d9b7703ccf068f549c8dc3465fc41d015
Author: Nikanth Karthikesan <knikanth@xxxxxxx>
Date: Fri Nov 26 12:37:09 2010 +0530
sched: Remove unused argument dest_cpu to migrate_task()
Remove unused argument, 'dest_cpu' of migrate_task(), and pass runqueue,
as it is always known at the call site.
Signed-off-by: Nikanth Karthikesan <knikanth@xxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <201011261237.09187.knikanth@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 335d7afbfb71faac833734a94240c1e07cf0ead8
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Mon Nov 22 15:47:36 2010 +0100
mutexes, sched: Introduce arch_mutex_cpu_relax()
The spinning mutex implementation uses cpu_relax() in busy loops as a
compiler barrier. Depending on the architecture, cpu_relax() may do more
than needed in this specific mutex spin loops. On System z we also give
up the time slice of the virtual cpu in cpu_relax(), which prevents
effective spinning on the mutex.
This patch replaces cpu_relax() in the spinning mutex code with
arch_mutex_cpu_relax(), which can be defined by each architecture that
selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so
this patch should not affect other architectures than System z for now.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290437256.7455.4.camel@thinkpad>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 22a867d81707b0a2720bb5f65255265b95d30526
Merge: 5bb6b1ea67a73f0665a41726dd7138977b992c6c 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Nov 26 15:03:27 2010 +0100
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e4e91ac410356da3a518188f371e9d3b52ee38ee
Merge: ea7872b9d6a81101f6ba0ec141544a62fea35876 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Nov 26 15:04:42 2010 +0100
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 61ab25447ad6334a74e32f60efb135a3467223f8
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Fri Nov 26 13:00:59 2010 +0100
nohz: Fix printk_needs_cpu() return value on offline cpus
This patch fixes a hang observed with 2.6.32 kernels where timers got enqueued
on offline cpus.
printk_needs_cpu() may return 1 if called on offline cpus. When a cpu gets
offlined it schedules the idle process which, before killing its own cpu, will
call tick_nohz_stop_sched_tick(). That function in turn will call
printk_needs_cpu() in order to check if the local tick can be disabled. On
offline cpus this function should naturally return 0 since regardless if the
tick gets disabled or not the cpu will be dead short after. That is besides the
fact that __cpu_disable() should already have made sure that no interrupts on
the offlined cpu will be delivered anyway.
In this case it prevents tick_nohz_stop_sched_tick() to call
select_nohz_load_balancer(). No idea if that really is a problem. However what
made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is
used within __mod_timer() to select a cpu on which a timer gets enqueued. If
printk_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get
updated when a cpu gets offlined. It may contain the cpu number of an offline
cpu. In turn timers get enqueued on an offline cpu and not very surprisingly
they never expire and cause system hangs.
This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses
get_nohz_timer_target() which doesn't have that problem. However there might be
other problems because of the too early exit tick_nohz_stop_sched_tick() in
case a cpu goes offline.
Easiest way to fix this is just to test if the current cpu is offline and call
printk_tick() directly which clears the condition.
Alternatively I tried a cpu hotplug notifier which would clear the condition,
however between calling the notifier function and printk_needs_cpu() something
could have called printk() again and the problem is back again. This seems to
be the safest fix.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
LKML-Reference: <20101126120235.406766476@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 49f4138346b3cec2706adff02658fe27ceb1e46f
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Fri Nov 26 13:42:47 2010 +0100
printk: Fix wake_up_klogd() vs cpu hotplug
wake_up_klogd() may get called from preemptible context but uses
__raw_get_cpu_var() to write to a per cpu variable. If it gets preempted
between getting the address and writing to it, the cpu in question could be
offline if the process gets scheduled back and hence writes to the per cpu data
of an offline cpu.
This buggy behaviour was introduced with fa33507a "printk: robustify
printk, fix #2" which was supposed to fix a "using smp_processor_id() in
preemptible" warning.
Let's use this_cpu_write() instead which disables preemption and makes sure
that the outlined scenario cannot happen.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101126124247.GC7023@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2f6724b24525fc989c0707974b23d96b36132385
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Wed Nov 24 08:16:57 2010 +0200
wl1271: Fix setting of the hardware connection monitoring probe-req template
The probe-request template used in the hardware connection monitoring feature
thus far has been an empty one, without the SSID IE and without supported rate
IEs. This causes problems with some AP's.
Additionally, after connected scans, the template for connection maintenance
would remain to be the one last used for scanning - potentially incorrect.
Fix these by getting a pre-filled directed probe-request template for the
associated-to AP from mac80211.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 573c67cf819d52d2e12adf75a9a8cfbd216190a3
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date: Fri Nov 26 13:44:59 2010 +0200
wl12xx: disable 11a channels when regulatory changes if 11a is not supported
Instead of simply not scanning for the 11a channels when not supported by the
hardware, disable the channels in reg_notify. This centralizes the decision
on whether to scan 5GHz channel in one place and allows userspace to know
exactly which channels are in use.
Based on Juuso Oikarinen's idea.
Cc: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
commit e5cba24e3f018d4beb6acd101a82483c98f91ce7
Author: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 26 12:06:44 2010 +0100
workqueue: check the allocation of system_unbound_wq
I found a trivial bug on initialization of workqueue.
Current init_workqueues doesn't check the result of
allocation of system_unbound_wq, this should be checked
like other queues.
Signed-off-by: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
commit 65500fa94aaeb3475e39c0c5180f188014164ca4
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Thu Nov 4 13:06:59 2010 +0100
ARM: 6467/1: amba: optional PrimeCell core voltage switch
On some contemporary sub-micron SoCs, peripherals on the chip have
power domain switches, i.e. the voltage to the core may be turned
off to conserve power. In the Ux500 we have this for out PrimeCell
derivates.
This patch makes it possible to specify an (optional) regulator to
handle the voltage domain switch on AMBA PrimeCells, modeled very
similar to how block clocks are handled.
Additional amba_vcore_[enable|disable] calls are supplied to make
it possible introduce optional powering off of the core voltage.
Using this will require code to spool/unspool any core HW state.
Cc: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Cc: Bengt Jonsson <bengt.g.jonsson@xxxxxxxxxxxxxx>
Cc: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 283a1b92e25fe3a62c766a042f96dad2eefa7d17
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Mon Nov 8 10:11:19 2010 +0000
ARM: always build swp_emulate as ARMv7
swp_emulate is only used on ARMv7+, and includes ARMv7+ assembly
instructions. Allow the assembler to accept ARMv7 instructions,
but leave the compiler's code generation options alone.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 6d803ba736abb5e122dede70a4720e4843dd6df4
Author: Jean-Christop PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Date: Wed Nov 17 10:04:33 2010 +0100
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
factorise some generic infrastructure to assist looking up struct clks
for the ARM & SH architecture.
as the code is identical at 99%
put the arch specific code for allocation as example in asm/clkdev.h
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Acked-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit fbd29a14af42d374ddce9c16ff5f7805e69c764f
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date: Fri Nov 19 09:00:11 2010 -0800
spi/pxa2xx: register driver properly
use platform_driver_register instead of platform_driver_probe. The
latter only checks available devices at the time of calling. So if a
device gets inserter at a later point in time then the driver will never
play with it.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
commit 83cf1eecfe9afee99d6b86f963187acd414c019d
Merge: f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd 0e341af835fdf553820a1fa98341b93ab32ce466
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 26 10:28:11 2010 +0000
Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
commit f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd
Merge: 612275ad3966dd7ba491d5fe94e894a3861c9062 43eab87828fee65f89f4088736b2b7a187390a2f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 26 10:26:43 2010 +0000
Merge branch 'perf-split' of git://linux-arm.org/linux-2.6-wd into devel-stable
commit 612275ad3966dd7ba491d5fe94e894a3861c9062
Merge: 698fd6a2c3ca05ec796072defb5c415289a86cdc 176bfc44417544724e6df0831a7f576f4a56283d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri Nov 26 10:26:10 2010 +0000
Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
commit 6e9d4476063a820764ec063bf683379c38ea1e18
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Nov 26 16:48:31 2010 +0900
usb: ehci-sh: Add missing ehci helpers.
The ehci-sh driver was missing tie-ins for endpoint_reset and
clear_tt_buffer_complete, add them in.
Reported-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c1e0774d74481fdc3082d2096a99a3aa411a71f1
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Nov 26 16:43:38 2010 +0900
usb: ehci-sh: Fix up fault in shutdown path.
We can't use the generic usb_hcd_platform_shutdown helper on account of
the fact we don't stash the hcd pointer in the driver data, so we provide
our own shutdown handler.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ea7872b9d6a81101f6ba0ec141544a62fea35876
Author: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 25 16:04:53 2010 +0900
perf bench: Add feature that measures the performance of the arch/x86/lib/memcpy_64.S memcpy routines via 'perf bench mem'
This patch ports arch/x86/lib/memcpy_64.S to perf bench mem
memcpy for benchmarking memcpy() in userland with tricky and
dirty way.
util/include/asm/cpufeature.h, util/include/asm/dwarf2.h, and
util/include/linux/linkage.h are mostly dummy files with small
wrappers, so that we are able to include memcpy_64.S
unmodified.
Signed-off-by: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Cc: h.mitake@xxxxxxxxx
Cc: Miao Xie <miaox@xxxxxxxxxxxxxx>
Cc: Ma Ling <ling.ma@xxxxxxxxx>
Cc: Zhao Yakui <yakui.zhao@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
LKML-Reference: <1290668693-27068-2-git-send-email-mitake@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 49ce8fc651794878189fd5f273228832cdfb5be9
Author: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 25 16:04:52 2010 +0900
perf bench: Print both of prefaulted and no prefaulted results by default
After applying this patch, perf bench mem memcpy prints
both of prefualted and without prefaulted score of memcpy().
New options --no-prefault and --only-prefault are added
to print single result, mainly for scripting usage.
Usage example:
| mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB
| # Running mem/memcpy benchmark...
| # Copying 500MB Bytes ...
|
| 634.969014 MB/Sec
| 4.828062 GB/Sec (with prefault)
| mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB --only-prefault
| # Running mem/memcpy benchmark...
| # Copying 500MB Bytes ...
|
| 4.705192 GB/Sec (with prefault)
| mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB --no-prefault
| # Running mem/memcpy benchmark...
| # Copying 500MB Bytes ...
|
| 642.725568 MB/Sec
Signed-off-by: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Cc: h.mitake@xxxxxxxxx
Cc: Miao Xie <miaox@xxxxxxxxxxxxxx>
Cc: Ma Ling <ling.ma@xxxxxxxxx>
Cc: Zhao Yakui <yakui.zhao@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
LKML-Reference: <1290668693-27068-1-git-send-email-mitake@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit cffd9348a3ae87ac98a4b3c03a5359e28ad50b93
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Wed Nov 24 09:33:59 2010 +0000
fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver
Driver for ADV7393 add-on card for multiple Blackfin boards.
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit dbcc465a3c8d81da132cc1dd4e5fbf731172477f
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Wed Nov 24 09:33:58 2010 +0000
fbdev: bf537-lq035: new Blackfin Sharp LQ035 framebuffer driver
For LCDs hooked up to BF537-STAMP boards.
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 22a95949d03548cb346d81d71ce6c64dc273f421
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Fri Nov 26 05:20:25 2010 +0000
framebuffer: fix fbcmap.c kernel-doc warning
Fix kernel-doc warning in fbcmap.c:
Warning(drivers/video/fbcmap.c:92): No description found for parameter 'flags'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e536fb6f9dc3908ad4c642414002ec9daf590ed7
Merge: a235e4c9302509ac5956bbbffa22eb5ed9fcdc54 ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Fri Nov 26 10:45:03 2010 +1000
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
MAINTAINERS: INTEL DRM DRIVERS list (intel-gfx) is subscribers-only
drm/i915/sdvo: Always fallback to querying the shared DDC line
drm/i915: Handle pagefaults in execbuffer user relocations
drm/i915/sdvo: Only enable HDMI encodings only if the commandset is supported
drm/i915: Only save/restore cursor regs if !KMS
drm/i915: Prevent integer overflow when validating the execbuffer
commit a235e4c9302509ac5956bbbffa22eb5ed9fcdc54
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Wed Nov 24 22:26:55 2010 -0500
Revert "drm/radeon/kms: fix typo in r600 cs checker"
This reverts commit d33ef52d9db8a36900dd53f2e32db9a521ace259.
This change seems to expose a bug in the 3D driver tiggered by
certain apps, so revert it to keep userspace working.
Reported-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 43eab87828fee65f89f4088736b2b7a187390a2f
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sat Nov 13 19:04:32 2010 +0000
ARM: perf: separate PMU backends into multiple files
The ARM perf_event.c file contains all PMU backends and, as new PMUs
are introduced, will continue to grow.
This patch follows the example of x86 and splits the PMU implementations
into separate files which are then #included back into the main
file. Compile-time guards are added to each PMU file to avoid compiling
in code that is not relevant for the version of the architecture which
we are targetting.
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 629948310e4270e9b32c37b4a65a8cd5d6ebf38a
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sat Nov 13 18:45:27 2010 +0000
ARM: perf: encode PMU name in arm_pmu structure
Currently, perf uses the PMU ID as an index into a string table
to look up the name of a given PMU.
This patch encodes the name of a PMU directly into the arm_pmu
structure so that PMU-specific code can be factored out into
separate files.
Acked-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 3cb314bae2191b432a7e898abf865db880f6d07d
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sat Nov 13 17:37:46 2010 +0000
ARM: perf: add _init() functions to PMUs
In preparation for separating the PMU-specific code, this patch adds
self-contained init functions to each PMU, therefore removing any
PMU-specific knowledge from the PMU-agnostic init_hw_perf_events
function.
Acked-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 59a98a1e56edea4d7d9c5f4ce9d50e271a04993c
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sat Nov 13 17:18:36 2010 +0000
ARM: perf: avoid exposing internal stop function for v6 PMU
Unlike other pmu functions, armv6pmu_pmu_stop is not declared static.
This patch adds the missing keyword.
Acked-by: Jamie Iles <jamie.iles@xxxxxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 84fee97a026ca085f08381054513f9e24689a303
Author: Will Deacon <will.deacon@xxxxxxx>
Date: Sat Nov 13 17:13:56 2010 +0000
ARM: perf: consolidate common PMU behaviour
The functions for mapping PMU events (perf, cache and raw) are
common between all PMU types and differ only in the data on which
they operate.
This patch implements common definitions of these mapping functions
and changes the arm_pmu struct to hold pointers to the data which
they require. This is in anticipation of separating out the PMU-specific
code into separate files.
Acked-by: Jamie Iles <jamie.iles@xxxxxxxxxxxxx>
Acked-by: Jean Pihet <j-pihet@xxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
commit 01660dfc37933c92dbb7c5718aea61f88025d71f
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Mon Nov 8 18:31:53 2010 -0500
scripts/genksyms: fix header usage
FreeBSD does not like <malloc.h> when __STDC__ is defined, use the standard
<stdlib.h> instead.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit b9e4b1e0cd401e915e3ba97afc152946f78f9f0b
Author: Dennis Kügler <dennis.kuegler@xxxxxx>
Date: Tue Nov 23 21:40:09 2010 +0100
HID: Add support for Perixx PERIBOARD-707 (Plus)
This patch adds support for the media keys of the Perixx PERIBOARD-707 (Plus)
keyboard / remote control.
Signed-off-by: Dennis Kügler <dennis.kuegler@xxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 45f53cc90e8f0e46ab024d0bc1de49ebee0dc583
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Date: Fri Nov 5 12:06:05 2010 +0100
Kconfig: fix single letter command in scripts/config
The one letter commands in scripts/config didn't work and always
printed usage. Fix this here.
Cc: erick@xxxxxxxxxxxxx
Reported-by: erick@xxxxxxxxxxxxx
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 6e5b86924a633f5b6eefb051404339a5a7bb005e
Author: Américo Wang <xiyou.wangcong@xxxxxxxxx>
Date: Fri Nov 5 14:16:10 2010 +0800
gitignore: add scripts/recordmcount
This file is generated, should be ignored by git.
Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 10f26fa64200095af0e5d80a980e47877865e4b7
Author: Asbjoern Sloth Toennesen <asbjorn@xxxxxxxxxxx>
Date: Fri Nov 5 13:30:08 2010 +0000
kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
Instead of creating the debian package for the compiling userland,
create it for a userland matching the kernel thats being compiled.
This patch supports all Lenny release architectures,
and Linux-based architecture candidates for Squeeze.
If it can't find a proper Debian userspace it displays a warning,
and fallback to let deb-gencontrol use the host's userspace arch.
Eg. with this patch the following make command:
make ARCH=i386 deb-pkg
will output an i386 Debian package instead of an amd64 one,
when run on an amd64 machine.
Signed-off-by: Asbjoern Sloth Toennesen <asbjorn@xxxxxxxxxxx>
Acked-by: maximilian attems <max@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 1ad2096c4eba144522d87541c4024b8c84e95051
Merge: c4d73e7d75a54451d6e073c118ba2b8d87bd350d df73af86b6e737f357aae85e0b5e621516117780
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 25 16:45:43 2010 +0900
Merge branch 'rmobile/mmcif' into rmobile-latest
commit e5843341e3ad8ff00332376cd0745026e4b5d45f
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Nov 24 09:48:10 2010 +0000
dma: shdma: add a MODULE_ALIAS() to allow module autoloading
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 696d6e178a95d95dbb222d89e5e91a6fa9911440
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Wed Nov 24 07:41:14 2010 +0000
ARM: mach-shmobile: clock-sh73a0: modify MSTP order
This patch permuted clock arrays in the order of MSTP
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit df73af86b6e737f357aae85e0b5e621516117780
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Nov 24 10:05:26 2010 +0000
ARM: mach-shmobile: enable MMCIF DMA on ap4evb
Have to add DMA slave configuration to enable DMA for the sh7372 MMCIF
controller.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a782d688e9c6f9ca9a7a9a28e8e2876969ddef53
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Nov 24 10:05:22 2010 +0000
mmc: sh_mmcif: add DMA support
The MMCIF controller on sh-mobile platforms can use the DMA controller for data
transfers. Interface to the SH dmaengine driver to enable DMA. We also have to
lower the maximum number of segments to match with the number od DMA
descriptors on SuperH, this doesn't significantly affect driver's PIO
performance.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e47bf32aa8de06ec72e18b4fbbd880caeedb0088
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Nov 24 10:05:18 2010 +0000
mmc: sh_mmcif: cosmetic clean up
Replace pr_* with respective dev_*, sort headers alphabetically, remove an
unused struct member, superfluous variable initialisations and type-casts.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6d11dc14e608d637b09277c7b499f2f46b29cc35
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Nov 24 10:05:15 2010 +0000
ARM: mach-shmobile: add DMA defines for MMCIF on sh7372
Add DMA slave IDs and slave definitions for MMCIF on sh7372.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit aa0787a90c70587db6934547bb7687efc30062c7
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Wed Nov 24 10:05:12 2010 +0000
mmc: sh_mmcif: switch to completion, fix flags
In sh_mmcif.c an event is used as a completion, switch over. When a
wait_for_completion*_timeout() returns, it suffices to check the remaining
time, setting an additional flag before waking up the waiting task only reduces
the race window, but does not eliminate it. This patch switches the driver to
use a completion to signal an interrupt, the only case, when an interrupt
should not wake up the waiter, is when an automatic CMD12 completes. Also fix
MODULE_ALIAS.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2d3e4e7652f1db2de0fe8798a1a9be460ac9057b
Merge: 698fd6a2c3ca05ec796072defb5c415289a86cdc da1d39e3903bc35be2b5e8d2116fdd5d337244d4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 25 16:26:14 2010 +0900
Merge branch 'common/mmcif' into rmobile/mmcif
commit 9a67d761b39614c0495dcab9a204e21a9f4c4d31
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Thu Nov 18 10:40:03 2010 -0800
iwlagn: minor change in bt coex normal LUT
Minor changes in LUT
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 506aa156fa736e9f9ce476239c9549ebbf6b08ea
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 24 17:25:03 2010 -0800
iwlagn: use different kill mask when SCO active
use different kill_ack_mask and kill_cts_mask when detect SCO
is active.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 638514ff5d5845c6eba8c266ea04325be6e7d106
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 17 12:13:55 2010 -0800
iwlagn: Offical name for 100/130 device
Change to offical name for 100 devices:
"Intel(R) Centrino(R) Wireless-N 100"
Change to offical name for 130 devices:
"Intel(R) Centrino(R) Wireless-N 130"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit d2eceef02e717751d4f6a01eddea6f241d63c213
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 17 12:13:54 2010 -0800
iwlagn: Offical name for 6000g2b device
Change to offical name for 6000g2b devices:
"Intel(R) Centrino(R) Wireless-N 1030"
"Intel(R) Centrino(R) Advanced-N 6230"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 55017ab87831b3ca449b81b83b180baac2895666
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 17 12:13:53 2010 -0800
iwlagn: Offical name for 6000g2a device
Change to offical name for 6000g2a devices:
"Intel(R) Centrino(R) Advanced-N 6205"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit f9dc6467223319acaea64d95ff208409e4e48d07
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 17 12:13:52 2010 -0800
iwlagn: Offical name for 6050g2 device
Change to offical name for 6050g2 devices:
"Intel(R) Centrino(R) Wireless-N 6150"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 0c4ac342997c9597706a8fcbb0ccf920b3d33570
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 17 11:33:27 2010 -0800
iwlwifi: use mac80211 AC defines
Instead of hardcoding the numbers that must
match mac80211, use the constants. Not that
this means we could change the constants,
but at least this way it's clearer.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 6fb5511ab96d9f31be747bab842f96227a5c7aec
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 16 11:55:02 2010 -0800
iwlagn: advertise reliable TX status
Our hardware has reliable TX status, but we're
not currently advertising that to mac80211.
Since the packet loss monitoring will depend
on it, advertise it.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 2e34034e8c9755ff144379d410d5227926e91cce
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 16 11:51:38 2010 -0800
iwlagn: fix station powersave accounting for aggregation
Since aggregation queues are station-specific, the
device will not reject packets in them but rather
will stop the appropriate aggregation queues when
a station goes to sleep. I forgot to account for
this in the driver, so if a station went to sleep
that had aggregation enabled, traffic would stop
indefinitely.
Fix this by only accounting frames queued on the
normal AC queues for associated station.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 67158b67cea0c92dba1dda74cde926d149cc1a2e
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 16 11:51:04 2010 -0800
iwlagn: remove powersave warning
Through races, a packet may be enqueued for
transmission to a station while that station
is going to sleep, in which case the warning
here triggers. Instead of warning, check the
condition -- if this packet is not a PS-poll
response then we still enqueue it but it will
be rejected by the device since the station
is marked as asleep.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Nov 15 13:43:07 2010 -0800
iwlwifi: use antenna information in EEPROM
The valid tx/rx antenna information is part of EEPROM, so use it
to configure the device.
For few cases, the EEPROM did not reflect the correct antenna, but
it is too late to modify the EEPROM, so overwrite with .cfg parameters
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 4b7384f936817489a4172b9c5d946f63f479ca15
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Nov 15 13:56:10 2010 -0800
iwlwifi: remove unused define
was not used, remove it
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 2862945bf5262d516583477ce420a2f122306f43
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 18 19:59:51 2010 +0200
arm: omap2: timer-gp: delete unused variable
Delete a redundant local variable.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 7489ffcea62e0b990d3557746d19a47e83e07042
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 18 19:59:50 2010 +0200
arm: omap1: board-ams-delta: fix cast
Use IOMEM() macro to get rid of the following sparse warning:
arch/arm/mach-omap1/board-ams-delta.c:319:36: warning: incorrect type in initializer (different address spaces)
arch/arm/mach-omap1/board-ams-delta.c:319:36: expected void [noderef] <asn:2>*membase
arch/arm/mach-omap1/board-ams-delta.c:319:36: got void *<noident>
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 87aedfe25a754a3ab49a7cfdb8f81bc882bc34fa
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 18 19:59:49 2010 +0200
arm: omap1: mbox: delete unused variable
Delete unused variable from probe().
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit dba5e190fcbe2a76b1a867ec6cbe9d7009e43708
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 18 19:59:48 2010 +0200
arm: omap1: mbox: make variables static
Make some variables static to get rid of the following warnings:
arch/arm/mach-omap1/mailbox.c:136:18: warning: symbol 'mbox_dsp_info' was not declared. Should it be static?
arch/arm/mach-omap1/mailbox.c:142:18: warning: symbol 'omap1_mboxes' was not declared. Should it be static?
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit e6f168212243452eae7c0d0c20c2f6e213933fc8
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 18 19:59:47 2010 +0200
arm: omap1: make some functions static
Make some functions static to get rid of the following sparse warnings:
arch/arm/mach-omap1/mcbsp.c:177:12: warning: symbol 'omap1_mcbsp_init' was not declared. Should it be static?
arch/arm/mach-omap1/mux.c:346:22: warning: symbol 'omap1_cfg_reg' was not declared. Should it be static?
arch/arm/plat-omap/dma.c:177:5: warning: symbol 'omap_dma_in_1510_mode' was not declared. Should it be static?
arch/arm/plat-omap/sram.c:273:12: warning: symbol 'omap1_sram_init' was not declared. Should it be static?
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 706afddaf53522b67c81a0b1b38bdccd4d4ff00c
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date: Thu Nov 18 19:59:46 2010 +0200
arm: omap1: add missing includes
Add missing includes to get rid of the following sparse warnings:
arch/arm/mach-omap1/devices.c:225:13: warning: symbol 'omap1_camera_init' was not declared. Should it be static?
arch/arm/mach-omap1/flash.c:15:6: warning: symbol 'omap1_set_vpp' was not declared. Should it be static?
arch/arm/mach-omap1/serial.c:190:6: warning: symbol 'omap_serial_wake_trigger' was not declared. Should it be static?
arch/arm/mach-omap1/time.c:252:18: warning: symbol 'omap_timer' was not declared. Should it be static?
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 51cce8a590c4696d62bfacc63378d1036084cef7
Merge: 2fe66ec242d3f76e3b0101f36419e7e5405bcff3 4f8559383c41262b50dc758e2e310f257ce6a14d
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Nov 24 16:49:20 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 4f8559383c41262b50dc758e2e310f257ce6a14d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Nov 20 03:08:48 2010 +0100
ath9k_hw: remove ath9k_hw_stoppcurecv
It is no longer used anywhere
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fa6e15e0b5952fd2cd99fc6d4f4473f6b9da18df
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Fri Nov 19 16:53:22 2010 +0530
ath9k_htc: Identify devices using driver_info
Categorize AR7010 & AR9287 devices based on driver_info
of usb_device_id, instead of PIDs. This avoids per-device cases
and minimize code changes for new device addition.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f7ec8fb4d6f8f3ecb8b11e9e46ece95aa66139cc
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Fri Nov 19 16:53:21 2010 +0530
ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB)
AR9287 devices (PCI/USB) use different eeprom start location
to read nvram. New devices might endup with same devid. So use
driver_info to set offset, instead of devid. driver_info is
valid for HTC devices alone which is filled in usb_device_id.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 64f121708342afec306ce52920cc9982f4f1008f
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Fri Nov 19 16:53:20 2010 +0530
ath9k_htc: Add driver_info in usb device list
Added driver_info to identify AR7010, R9287 HTC devices.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bedbbb959d2c1d1dbb4c2215f5b7074b1da3030a
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Fri Nov 19 16:53:19 2010 +0530
ath: Add a driver_info bitmask field
The driver_info stores the device category information which
is used to load appropriate device firmware, select firmware offset
and eeprom starting location. The driver_info is accessed across
ath9k_htc and ath9k_hw. Hence placed under common structure.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 35162ba75900209755628ccf7357763797037ba6
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Nov 23 10:58:56 2010 -0800
iwlwifi: advance power management support
For 6000g2b and up, adding advance power management support
for better power consumption
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1f37daf3233ccda5072f715d6c322d84833cdd92
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Nov 23 10:58:55 2010 -0800
iwlwifi: power management checking for shadow register
If shadow register is enable, modify the power management
command to inform uCode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Nov 23 10:58:54 2010 -0800
iwlwifi: consider BT for power management
Check the BT PSPoll flag when fill PM command to uCode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 97badb0eefc9b6f23f864c5348b695be35f05882
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Nov 23 10:58:53 2010 -0800
iwlwifi: add more power management flags
Adding additional power management option available for the device.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit eeb1f83fa8f96501331cc17b73c57999e3a1ec5d
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Nov 23 10:58:52 2010 -0800
iwlagn: name change for BT config flag
Bit 7 of BT config flag is used to enable/disable PSPoll sync.
Make the name to match it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 99ba2a14283be96a682e04455061c08a46bbf4ec
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 24 08:10:06 2010 +0100
mac80211: implement packet loss notification
For drivers that have accurate TX status reporting
we can report the number of consecutive lost packets
to userspace using the new cfg80211 CQM event. The
threshold is fixed right now, this may need to be
improved in the future.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c063dbf52b998b852122dff07a8b8dd430b38437
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 24 08:10:05 2010 +0100
cfg80211: allow using CQM event to notify packet loss
This adds the ability for drivers to use CQM events
to notify about packet loss for specific stations
(which could be the AP for the managed mode case).
Since the threshold might be determined by the
driver (it isn't passed in right now) it will be
passed out of the driver to userspace in the event.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 79b1c460a0b55e55981c25c56597c4d5d2872de3
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Wed Nov 24 14:34:41 2010 +0900
cfg80211: Add documentation for antenna ops
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 48124d1a91fb77defc9734b4556350d59671fb2c
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Nov 23 15:05:02 2010 -0800
mac80211: avoid aggregation for VO traffic
This should help with latency issues which can happen when
using aggregation.
Cc: Felix Fietkau <nbd@xxxxxxxxxxx>
Cc: Matt Smith <matt.smith@xxxxxxxxxxx>
Cc: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c8b576061d87e2a4fb100e70c6a6dae189b3a310
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Nov 23 15:05:01 2010 -0800
ath9k: avoid aggregation for VO traffic
This should help with latency issues which can happen when
using aggregation.
Cc: Matt Smith <matt.smith@xxxxxxxxxxx>
Cc: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 72a8a3edd630995662bdc85957206685f376f9c4
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Tue Nov 23 03:10:32 2010 +0100
mac80211: reduce the number of retries for nullfunc probing
Since nullfunc frames are transmitted as unicast frames, they're more
reliable than the broadcast probe requests, so we need fewer retries
to figure out whether the AP is really gone.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4e5ff37692df35c8826f1291204841b174d3c3ce
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Tue Nov 23 03:10:31 2010 +0100
mac80211: use nullfunc instead of probe request for connection monitoring
nullfunc frames are better for connection monitoring, because probe requests
are answered even if the AP has already dropped the connection, whereas
nullfunc frames from an unassociated station will trigger a disassoc/deauth
frame from the AP (WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA), which allows
the station to reconnect immediately instead of waiting until it attempts to
transmit the next unicast frame.
This only works on hardware with reliable tx ACK reporting, any other hardware
needs to fall back to the probe request method.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dd5b4cc71cd09c33e1579cc6d5720656e94e52de
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Nov 22 20:58:24 2010 +0100
cfg80211/mac80211: improve ad-hoc multicast rate handling
- store the multicast rate as an index instead of the rate value
(reduces cpu overhead in a hotpath)
- validate the rate values (must match a bitrate in at least one sband)
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 46090979a55a0dc2cdb3d939f94fa47742108194
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Tue Nov 23 20:28:03 2010 +0100
mac80211: probe the AP when resuming
Check the connection by probing the AP (either using nullfunc or a
probe request). If nullfunc probing is supported and the assoc is no
longer valid, the AP will send a disassoc/deauth immediately.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7ccc8bd7593634d827e8bc55898a5038e29848b5
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Nov 19 22:55:38 2010 +0100
mac80211: calculate beacon loss time accurately
Instead of using a fixed 2 second timeout, calculate beacon loss interval
from the advertised beacon interval and a frame count. With this beacon
loss happens after N (default 7) consecutive frames are missed which
for a typical setup (100TU beacon interval) is ~700ms (or ~1/3 previous).
Signed-off-by: Sam Leffler <sleffler@xxxxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c8a7972c3b3633bf90daf50b135665d8ca4838c4
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Nov 19 22:55:37 2010 +0100
mac80211: restart beacon miss timer on system resume from suspend
Signed-off-by: Paul Stewart <pstew@xxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0b81c23d2e3a8589514fa69b2f153f006a4ad773
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 21:11:43 2010 +0100
b43: N-PHY: little cleanups
Remove some typos, warnings, initialize some values to follow wl's code path.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a529cecd29ecf1e5416316ae06ce515bf67b5d5a
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 21:11:42 2010 +0100
b43: N-PHY: rev2: save and restore PHY regs on RSSI poll
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fee613b77df721781b9794945f0f1a8f535456ff
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 21:11:41 2010 +0100
b43: N-PHY: fix BPHY init
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bec186452b4cfecff9e2c579bfd4016119d39614
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 13:28:00 2010 +0100
b43: N-PHY: init BPHY when needed
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a5d3598de086cd38f71fe2fec43ac3ca97bb24bb
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 13:27:59 2010 +0100
b43: N-PHY: fix some typos, conditions, set gain_boost
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c0f05b9879a324937f14270e4a14d661d2beca63
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 13:27:58 2010 +0100
b43: N-PHY: minor fixes to match specs
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 69a3229edcf0c354e1cd93a811843fba7b6e1472
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Nov 18 13:27:57 2010 +0100
b43: N-PHY: fix values for PHY regs in channel tables of 2055 radio
Additional comment by Larry Finger <Larry.Finger@xxxxxxxxxxxx>:
This change deserves a bit more explanation. You might include something like
"These tables came from reverse engineering the 5.10.56.46 version of the
Broadcom driver. Trace comparisons between b43 and the current Broadcom driver
(5.10.120.0) show byte reversals for the PHY register writes."
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e9c0268f02f8970149158a9b7ea1e5c1c45c819d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 16 19:56:49 2010 -0800
net/wireless: Use pr_<level> and netdev_<level>
No change in output for pr_<level> prefixes.
netdev_<level> output is different, arguably improved.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d7a066c92394f3e777351de0c903beeb8a08af76
Merge: ccb14354017272ddac002e859a2711610b6af174 e476a5a41ad67d0e2b4a652820c49a3923eb936b
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Nov 24 16:19:24 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit ccb14354017272ddac002e859a2711610b6af174
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Wed Nov 24 16:18:36 2010 -0500
Revert "nl80211/mac80211: Report signal average"
This reverts commit 86107fd170bc379869250eb7e1bd393a3a70e8ae.
This patch inadvertantly changed the userland ABI.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1d24eb4815d1e0e8b451ecc546645f8ef1176d4f
Author: Tom Herbert <therbert@xxxxxxxxxx>
Date: Sun Nov 21 13:17:27 2010 +0000
xps: Transmit Packet Steering
This patch implements transmit packet steering (XPS) for multiqueue
devices. XPS selects a transmit queue during packet transmission based
on configuration. This is done by mapping the CPU transmitting the
packet to a queue. This is the transmit side analogue to RPS-- where
RPS is selecting a CPU based on receive queue, XPS selects a queue
based on the CPU (previously there was an XPS patch from Eric
Dumazet, but that might more appropriately be called transmit completion
steering).
Each transmit queue can be associated with a number of CPUs which will
use the queue to send packets. This is configured as a CPU mask on a
per queue basis in:
/sys/class/net/eth<n>/queues/tx-<n>/xps_cpus
The mappings are stored per device in an inverted data structure that
maps CPUs to queues. In the netdevice structure this is an array of
num_possible_cpu structures where each structure holds and array of
queue_indexes for queues which that CPU can use.
The benefits of XPS are improved locality in the per queue data
structures. Also, transmit completions are more likely to be done
nearer to the sending thread, so this should promote locality back
to the socket on free (e.g. UDP). The benefits of XPS are dependent on
cache hierarchy, application load, and other factors. XPS would
nominally be configured so that a queue would only be shared by CPUs
which are sharing a cache, the degenerative configuration woud be that
each CPU has it's own queue.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR test
with 1 byte req. and resp.
bnx2x on 16 core AMD
XPS (16 queues, 1 TX queue per CPU) 1234K at 100% CPU
No XPS (16 queues) 996K at 100% CPU
Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3853b5841c01a3f492fe137afaad9c209e5162c6
Author: Tom Herbert <therbert@xxxxxxxxxx>
Date: Sun Nov 21 13:17:29 2010 +0000
xps: Improvements in TX queue selection
In dev_pick_tx, don't do work in calculating queue
index or setting
the index in the sock unless the device has more than one queue. This
allows the sock to be set only with a queue index of a multi-queue
device which is desirable if device are stacked like in a tunnel.
We also allow the mapping of a socket to queue to be changed. To
maintain in order packet transmission a flag (ooo_okay) has been
added to the sk_buff structure. If a transport layer sets this flag
on a packet, the transmit queue can be changed for the socket.
Presumably, the transport would set this if there was no possbility
of creating OOO packets (for instance, there are no packets in flight
for the socket). This patch includes the modification in TCP output
for setting this flag.
Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 22f4fbd9bd283ef85126e511171932a4af703776
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 24 11:41:56 2010 -0800
infiniband: remove dev_base_lock use
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Roland Dreier <rolandd@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bba14de98753cb6599a2dae0e520714b2153522d
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 23 14:09:15 2010 +0000
scm: lower SCM_MAX_FD
Lower SCM_MAX_FD from 255 to 253 so that allocations for scm_fp_list are
halved. (commit f8d570a4 added two pointers in this structure)
scm_fp_dup() should not copy whole structure (and trigger kmemcheck
warnings), but only the used part. While we are at it, only allocate
needed size.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 456b61bca8ee324ab6c18b065e632c9a8c88aa39
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 23 13:12:15 2010 +0000
ipv6: mcast: RCU conversion
ipv6_sk_mc_lock rwlock becomes a spinlock.
readers (inet6_mc_check()) now takes rcu_read_lock() instead of read
lock. Writers dont need to disable BH anymore.
struct ipv6_mc_socklist objects are reclaimed after one RCU grace
period.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2757a15f08adbed9480c30bdb4e9a0bbf2b6f33a
Author: Giuseppe CAVALLARO <peppe.cavallaro@xxxxxx>
Date: Wed Nov 24 02:38:17 2010 +0000
stmmac: update the driver version
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 874bd42d24c2a74f5dbd65e81e175982240fecd8
Author: Giuseppe CAVALLARO <peppe.cavallaro@xxxxxx>
Date: Wed Nov 24 02:38:11 2010 +0000
stmmac: convert to dev_pm_ops.
This patch updates the PM support using the dev_pm_ops
and reviews the hibernation support.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 293bb1c41b728d4aa248fe8a0acd2b9066ff5c34
Author: Giuseppe CAVALLARO <peppe.cavallaro@xxxxxx>
Date: Wed Nov 24 02:38:05 2010 +0000
stmmac: add init/exit callback in plat_stmmacenet_data struct
This patch adds in the plat_stmmacenet_data
the init and exit callbacks that can be used
for invoking specific platform functions.
For example, on ST targets, these call the
PAD manager functions to set PIO lines and
syscfg registers.
The patch removes the stmmac_claim_resource
only used on STM Kernels as well.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9dfeb4d953f914bd3bb56ce60e22ee84687399ce
Author: Giuseppe CAVALLARO <peppe.cavallaro@xxxxxx>
Date: Wed Nov 24 02:37:58 2010 +0000
stmmac: tidy-up stmmac_priv structure
This patch tidies-up the stmmac_priv structure
that had many fileds alredy defined in the
plat_stmmacenet_data structure.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b340007f79941297c44a7dfba4d3c587ff81590f
Author: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Date: Wed Nov 24 11:09:50 2010 -0800
bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev()
Move the interrupt mode configuration and NAPIs adding before a
register_netdev() call to prevent netdev->open() from running
before these functions are done.
Advance a driver version number.
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Reported-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e1210d127d11fc40d229648c9754aa60776ef796
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 24 03:45:10 2010 +0000
bnx2x: Disable local BHes to prevent a dead-lock situation
According to Eric's suggestion:
Disable local BHes to prevent a dead-lock situation between sch_direct_xmit()
(Soft_IRQ context) and bnx2x_tx_int (called by bnx2x_run_loopback() - syscall
context), as both are taking a netif_tx_lock().
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Vladislav Zolotarov <vladz@xxxxxxxxxxxx>
Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 37a118452cbc9c0cf0d23bfd16d3ca56058be754
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:54 2010 +0000
tg3: Remove tg3_config_info definition
This structure isn't used anywhere in the driver.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2e1e3291d4727e14c8f0f48df561afb1a5c26ffe
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:53 2010 +0000
tg3: Enable phy APD for 5717 and later asic revs
This patch enables the gphy autopowerdown feature in the phy for all
new devices that support it.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4bae65c892b4ff9a2797cbfa8526a5f9aaf1b2ed
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:52 2010 +0000
tg3: use dma_alloc_coherent() instead of pci_alloc_consistent()
Using dma_alloc_coherent() permits to use GFP_KERNEL allocations instead
of GFP_ATOMIC ones. Its better when a machine is out of memory, because
this allows driver to sleep to get its memory and succeed its init,
especially when allocating high order pages.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b92b9040f6e4997b895b7b9c655a158354d28964
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:51 2010 +0000
tg3: Reenable TSS for 5719
All TSS bugs have been fixed in the 5719. This patch reenables the
feature.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit deabaac8beeccdfee5358c0cd4c63258f28f3a74
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:50 2010 +0000
tg3: Enable mult rd DMA engine on 5719
The multiple DMA read engine bugs have been fixed on the 5719. This
patch reenables support for this feature.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 07ae8fc00bcc97d2f896b257da225a0789b0aa5d
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:49 2010 +0000
tg3: Reorg tg3_napi members
This patch reorders and realigns the tg3_napi members for a ~3-4%
performance improvement on small packet performance tests.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cf79003d598b1f82a4caa0564107283b4f560e14
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:48 2010 +0000
tg3: Fix 5719 internal FIFO overflow problem
Under load, there an internal FIFO can overflow on the 5719. The fix is
to scale back the PCIe maximum read request size based on the current
link speed and width.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d2394e6bb1aa636f3bd142cb6f7845a4332514b5
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:47 2010 +0000
tg3: Always turn on APE features in mac_mode reg
The APE needs certain bits in the mac_mode register to be enabled for
traffic to flow correctly. This patch changes the code to always enable
these bits in the presence of the APE.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b75cc0e4c1caac63941d96a73b2214e8007b934b
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:46 2010 +0000
tg3: Assign correct tx margin for 5719
Commit d309a46e42542223946d3a9e4e239fdc945cb53e, entitled
"tg3: 5719: Prevent tx data corruption", was supposed to contain the tx
margin adjustment but it looks like it somehow was omitted. This patch
fixes the problem.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5093eedc8bdfd7d906836a44a248f66a99e27d22
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Wed Nov 24 08:31:45 2010 +0000
tg3: Apply 10Mbps fix to all 57765 revisions
Commit a977dbe8445b8a81d6127c4aa9112a2c29a1a008, entitled
"tg3: Reduce 57765 core clock when link at 10Mbps" needs to be applied
to all revisions of the 57765 asic rev, not just the A0 revision.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Reviewed-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Wed Nov 24 17:37:17 2010 +0000
drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
Commit d09c23de intended to add a 30ms delay to give the ADD time to
detect any TVs connected. However, it used the sdvo->is_tv flag to do so
which is dependent upon the previous detection result and not whether the
output supports TVs.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 53c96dfdd0c0ccbba7aee84c60ce0f2aa466413f
Author: Zeng Zhaoming <zengzm.kernel@xxxxxxxxx>
Date: Fri Nov 19 00:46:19 2010 +0800
ACPI, hp-wmi: Fix memory leak in acpi query
Free acpi return memory after query.
Signed-off-by: Zeng Zhaoming <zengzm.kernel@xxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit a80e1cd70144fe7727f2e2d838611b6b8cf8a6d5
Author: Anisse Astier <anisse@xxxxxxxxx>
Date: Thu Nov 18 13:00:54 2010 +0100
msi-wmi: fix semantically incorrect use of keycode instead of scancode
I didn't know the difference between the two when IÂ wrote this code in
commit c30116c6f0d26cd6e46dfa578163d573ef4730b2.
Signed-off-by: Anisse Astier <anisse@xxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 92f61cbc614fb422759790739cbd3e5a68c9a6fc
Author: Anisse Astier <anisse@xxxxxxxxx>
Date: Thu Nov 18 13:00:53 2010 +0100
msi-wmi: Add mute key support
Add new MUTE key seen on Medion Akoya AIO PC P4010D using MSI motherboard
(Product Name: MS-7621)
Reported-and-tested-by: Mark Huijgen <mark.sf.net@xxxxxxxxxx>
Signed-off-by: Anisse Astier <anisse@xxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit ba1ff5be52163a97ac4ce8bc51beae2c96861a43
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date: Sun Nov 14 17:40:12 2010 +0100
asus-laptop: add wimax and wwan support
Asus UL30A has a 3G chip, but the radio is disabled by default.
The DSDT also reference a WIMAX device, which is not present on this model.
This patch adds two new files: wwan and wimax to control WWAN and
WIMAX devices. It does not use rfkill, because like WLED and BLED,
we don't know yet that the two ACPI functions will always control the
radio, they may control only the leds on some hardware.
We may add rfkill switchs later.
Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 67fa38ec097a3e270ab175636338185017b49fa7
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Wed Nov 3 11:14:01 2010 -0700
eeepc-wmi: fix compiler warning
This fixes the following:
CC [M] drivers/platform/x86/eeepc-wmi.o
drivers/platform/x86/eeepc-wmi.c:322: warning: initialization from incompatible pointer type
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit 1d37db77c1aa199ae9a4114af7c0412c8417e949
Author: Vernon Mauery <vernux@xxxxxxxxxx>
Date: Tue Nov 2 13:08:11 2010 -0700
ibm_rtl: _RTL_ is not available in UEFI mode
Some of the IBM servers that are supported by ibm_rtl
can run in both Legacy mode (BIOS) and in UEFI mode.
When running in UEFI mode, it is possible that the
EBDA table exists but cannot be mapped and reports
errors. We need to make sure that by default we don't
try to probe the machines if they are running in UEFI
mode.
Signed-off-by: Vernon Mauery <vernux@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit a2262260f9eaee4acd56b5624b5d2bf4be9bb38a
Author: Vernon Mauery <vernux@xxxxxxxxxx>
Date: Tue Nov 2 13:08:10 2010 -0700
ibm_rtl: Loosen the DMI criteria to all IBM machines
Allow all IBM machines to pass the DMI check so that we
don't have to add them one by one to the driver. Any IBM
machine that has the _RTL_ table in the EBDA will work.
Signed-off-by: Vernon Mauery <vernux@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit d41014b92d60a6b375aad9b6ebc52201ee58df70
Author: Julia Lawall <julia@xxxxxxx>
Date: Tue Oct 26 12:25:37 2010 +0200
drivers/platform/x86/thinkpad_acpi.c: delete double assignment
Delete successive assignments to the same location.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit e599ab2556006398ba9aad536a58eedad515e807
Author: Chris Bagwell <chris@xxxxxxxxxxxxxx>
Date: Mon Oct 25 21:08:39 2010 -0500
eeepc-wmi: add cpufv sysfs documentation
Based on cpufv text from sysfs-platform-eeepc-laptop that
has almost same behavior.
Signed-off-by: Chris Bagwell <chris@xxxxxxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
Acked-by: Corentin Chary <corentincj@xxxxxxxxxx>
commit a49010f53b723ed0711d645ec43bde498c6756dc
Author: Jon Dowland <jmtd@xxxxxxxxxx>
Date: Wed Oct 27 00:24:59 2010 +0100
toshiba_acpi.c: Add key_entry for a lone FN keypress
A lone FN key press on a Toshiba Portégé R700 without another key in
conjunction results in an ACPI event and a spurious error message on
the console.
Add a key entry to map this event to a KEY_FN keypress. This prevents
the console message.
Signed-off-by: Jon Dowland <jmtd@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit c72b844ed2f55c442b464e382a2eb2ecab5292a8
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Fri Oct 22 16:18:47 2010 -0700
ibm_rtl: fix printk format warning
Fix printk format warning:
drivers/platform/x86/ibm_rtl.c:305:warning: format '%#llx' expects type 'long long unsigned int', but argument 2 has type 'phys_addr_t'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Keith Mannthey <kmannth@xxxxxxxxxx>
Cc: Vernon Mauery <vernux@xxxxxxxxxx>
Cc: platform-driver-x86@xxxxxxxxxxxxxxx
Cc: Matthew Garrett <mjg@xxxxxxxxxx>
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
commit b66ff7a2cd411a2245c984793a7eb98ee91771f9
Author: Dinh Nguyen <Dinh.Nguyen@xxxxxxxxxxxxx>
Date: Mon Nov 15 11:30:00 2010 -0600
ARM: imx: Add mx53 support to common msl functions.
Add mx53 support to cpu.c and mm.c.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit c0abefd30b2c9db015df4914a95d268ecdb39b00
Author: Dinh Nguyen <Dinh.Nguyen@xxxxxxxxxxxxx>
Date: Mon Nov 15 11:29:59 2010 -0600
ARM: imx: Add core definitions for MX53
Add iomux, clocks, and memory map for Freescale's MX53 SoC.
Add cpu_is_mx53 function to common.h.
Add 3 more banks of gpio's to mxc_gpio_ports.
Add MX53 phys offset address.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 374daa4f9019f75da1addb3f31a22df1966a5baa
Author: Fabio Estevam <fabioestevam@xxxxxxxxx>
Date: Wed Nov 10 07:00:02 2010 -0800
mx51_babbage: Add SPI flash support
MX51 Babbage has an AT45DB321 SPI Flash connected to eCSPI1.
Add support for it.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 76586d35eb31192bf3f395c2e02cef8a57e3558c
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Thu Nov 4 23:09:18 2010 +0100
ARM i.MX27 pm: return gracefully on different socs
Code called from an initcall can be maybe called for
machines it's not intended for. So check for valid
machines and return gracefully if an incompatible machine
is found.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 92fcdc9d1054a630f224657dc675e03bf3bb62ed
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Thu Nov 4 23:08:17 2010 +0100
ARM i.MX51: return gracefully on different socs
Code called from an initcall can be maybe called for
machines it's not intended for. So check for valid
machines and return gracefully if an incompatible machine
is found.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 8bffb77e198df83224a6a258291bd41c05ab84d1
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Thu Nov 4 23:07:56 2010 +0100
ARM i.MX DMA: return gracefully on different socs
Code called from an initcall can be maybe called for
machines it's not intended for. So check for valid
machines and return gracefully if an incompatible machine
is found.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit ec4bb253fcc5c07519b5e701d2c87100aef0d2ba
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Fri Nov 5 09:47:21 2010 +0100
ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option
There's no point showing this option to the user. The correct
value will be selected anyway.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit c7259df3af03aee00985e9bb64fb2afa593f703f
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Fri Nov 5 09:37:22 2010 +0100
ARM i.MX irq: Compile avic irq code only on SoCs that need it
This patch adds a Kconfig option for the avic irq controller
and lets the SoCs that need it select this option.
Also, as we have two irq controllers for i.MX, irq.c is not
appropriate anymore, so rename it to avic.c
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 7608d7d2b4a146f560436f5b99b1b93d30049e4e
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Thu Nov 4 21:20:43 2010 +0100
ARM i.MX51 boards: Do not use PHYS_OFFSET
PHYS_OFFSET may become a variable once the runtime PHYS_OFFSET
patch is merged, so use MX51_PHYS_OFFSET for boot_params.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit db037126656fb75482c09fb8673d97a5b44bcbae
Author: Fabio Estevam <fabioestevam@xxxxxxxxx>
Date: Wed Nov 3 14:39:13 2010 -0700
mx51_3ds: Add esdhc support
Add support for esdhc on mx51_3ds board.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 28d6a7a2f37a349a2292e52a87d76f06f55dc9d8
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Nov 3 15:54:36 2010 +0100
imx: fix iomux v3
Commit "ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie"
(b705cb4d42e95a4a43a8945571c8613e71526c3d) introduced a typo which was
preventing my efikamx to boot. This patch is fixing that.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Tested-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit c2932bf47001697fc48e89f1d136532703ed4779
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:55 2010 +0200
efikamx: add reset
The efikamx board is using a gpio to reset the board so add support
for it
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit c6e34a4cbe8d4e126c3f603d11cce6979952cbb1
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:54 2010 +0200
efikamx: add spi nor support
On efikamx, uboot is stored on a nor spi flash. Add support for it
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 0dea1c74642fb46cb94282719dafe7c2a7d3068f
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:53 2010 +0200
imx51: fix gpio_4_24 and gpio_4_25 pad configuration
s/NO_PAD_CTRL/MX51_GPIO_PAD_CTRL/
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit fcbd0c5f20918c6db0c72d4e7546880833713f9c
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:52 2010 +0200
efikamx: add support for power key
This patch adds support for power key button of the efika mx. It's connected
on GPIO 2 31.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 9d2c0ef76f429c038de27e1b734d65a67dbc8088
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:51 2010 +0200
efikamx: add leds support
The efika mx a 3 leds (1 blue, 1 red, 1 green) connected on GPIOS 3 13/14/15.
Also, some special care is done for default trigger of blue led for mmc as
the mmc host used is different between hw revisions
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 82df68ad26c1cb4c31e1a2750c0020038dd77cc6
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:50 2010 +0200
imx51: add gpio mode for csi1 {h,v}sync
Add definitions for configuring CSI1_{H,V}SYNC as GPIO
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit a96eb148c74a09bc872b1490141d98811a3c7dbd
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:49 2010 +0200
efikamx: add mmc support
The efika mx is using a esdhc host for mmc support. Now that the sdhci
has support for it, enable it.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 0a7d48712f9a279464d2587e52e60fdc81f9a65a
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:48 2010 +0200
imx51: enhance iomux configuration for esdhc support
- add definition to configure pads as ESDHC{1,2} WP and CD
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit db9d42348f6f5b37ae658a506bf80fa935dc1b0a
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:47 2010 +0200
imx51: fix iomux configuration
- ALT0 is used to set GPIO mode of GPIO_1_{2,3,4,5,6,7,8,9} but it's ALT1
for GPIO_1_{0,1}.
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit f1dd361b679977d449b7d10ddc9b5fcdfa8c0ca9
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date: Wed Oct 27 14:40:46 2010 +0200
efikamx: read board id
read board id value from the GPIO3_16/17/11
Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit bd02a9e5eee6335f23f1fff52a1e5c8e1783c49e
Author: Fabio Estevam <fabioestevam@xxxxxxxxx>
Date: Wed Oct 27 10:31:06 2010 -0700
mx31_3ds: Add touchscreen support
On the mx31_3ds board the touchscreen feature is provided by MC13783 PMIC.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit 8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9
Author: Lothar WaÃ?mann <LW@xxxxxxxxxxxxxxxxxxx>
Date: Tue Oct 26 14:28:31 2010 +0200
ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie
The following patch is a first step to convert the 'struct pad_desc'
to a bitmapped cookie to facilitate adding platform specific pullup or
drive strength definitions to existing pad definitions without need to
rewrite the complete pad def.
The patch wraps 'struct pad_desc' in an opaque data type and
introduces macros to access the individual members.
This patch does not constitute any functional change!
Signed-off-by: Lothar WaÃ?mann <LW@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
commit cc840f77036fa0a141951967cd010014f088b5e0
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 23 22:36:42 2010 -0800
MAINTAINERS: INTEL DRM DRIVERS list (intel-gfx) is subscribers-only
Mark it so.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 2a85927c79634e89b9cd683dd2bae65966d9b216
Merge: 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 124bf94a9f9b52341562628cd56b252e7d820ee8
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date: Wed Nov 24 08:24:29 2010 +0100
Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38
commit c4d73e7d75a54451d6e073c118ba2b8d87bd350d
Merge: 0421860a5a75b59a76b7a864a172eb090e3d0785 fd34f85832550d419e8b70f284ad545cdde0664f 421b446abeec55bed1251fab80cb5c12be58b773
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 24 15:34:46 2010 +0900
Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest
commit fd34f85832550d419e8b70f284ad545cdde0664f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 24 15:22:09 2010 +0900
mailmap: Fix up Takashi YOSHII's attribution.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit aae0f73604ff4bf65d0e4f5d4a10f214a6c98282
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date: Wed Nov 24 05:03:33 2010 +0000
ARM: mach-shmobile: ag5evm: remove unused define
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8e67b22a13e53335657b595bc4e4c01a559f8845
Author: Yoshii Takashi <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Fri Nov 19 13:21:32 2010 +0000
ARM: mach-shmobile: ag5evm i2c_shmobile support.
Just add port multiplex settings to enable i2c modules.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b028f94b76319e1b86103b767ca1c22546a5e7e7
Author: Yoshii Takashi <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Fri Nov 19 13:20:45 2010 +0000
ARM: mach-shmobile: sh73a0 i2c_shmobile support.
Platform device resource/data definition for CPU, and clkdev entries
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2d22d486601b2eaedd1c8dd5dc1c4602cab896ef
Author: Yoshii Takashi <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Fri Nov 19 13:15:46 2010 +0000
ARM: mach-shmobile: ag5evm: scan keyboard support
This consists of platform device resources/data for the board, and
simple clvdev entry for MSTP bit for keysc module.
This support only 49 of 80 key-switches on the board.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0c1dab89ee0e483f382391d6aec77db4affb0931
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 23 22:37:01 2010 +0000
drm/i915/sdvo: Always fallback to querying the shared DDC line
On a few devices, like the Mac Mini, the CRT DDC pins are shared between
the analog connector and the digital connector. In this scenario, rely
on the EDID to determine if a digital panel is connected to the digital
connector.
Reported-and-tested-by: Tino Keitel <tino.keitel@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit bcf50e2775bbc3101932d8e4ab8c7902aa4163b4
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun Nov 21 22:07:12 2010 +0000
drm/i915: Handle pagefaults in execbuffer user relocations
Currently if we hit a pagefault when applying a user relocation for the
execbuffer, we bail and return EFAULT to the application. Instead, we
need to unwind, drop the dev->struct_mutex, copy all the relocation
entries to a vmalloc array (to avoid any potential circular deadlocks
when resolving the pagefault), retake the mutex and then apply the
relocations. Afterwards, we need to again drop the lock and copy the
vmalloc array back to userspace.
v2: Incorporate feedback from Daniel Vetter.
Reported-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
commit 2fe66ec242d3f76e3b0101f36419e7e5405bcff3
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 06:28:08 2010 +0000
SELinux: indicate fatal error in compat netfilter code
The SELinux ip postroute code indicates when policy rejected a packet and
passes the error back up the stack. The compat code does not. This patch
sends the same kind of error back up the stack in the compat code.
Based-on-patch-by: Paul Moore <paul.moore@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Reviewed-by: Paul Moore <paul.moore@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 04f6d70f6e64900a5d70a5fc199dd9d5fa787738
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 23 06:28:02 2010 +0000
SELinux: Only return netlink error when we know the return is fatal
Some of the SELinux netlink code returns a fatal error when the error might
actually be transient. This patch just silently drops packets on
potentially transient errors but continues to return a permanant error
indicator when the denial was because of policy.
Based-on-comments-by: Paul Moore <paul.moore@xxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Reviewed-by: Paul Moore <paul.moore@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 34a2d313c51f47cae50ccb89f4196462665f2c48
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:38:21 2010 +0100
hfsplus: flush disk caches in sync and fsync
Flush the disk cache in fsync and sync to make sure data actually is
on disk on completion of these system calls. There is a nobarrier
mount option to disable this behaviour. It's slightly misnamed now
that barrier actually are gone, but it matches the name used by all
major filesystems.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit e34947056076ca5467ee8256d2d9cbc594a79b37
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:38:15 2010 +0100
hfsplus: optimize fsync
Avoid doing unessecary work in fsync. Do nothing unless the inode
was marked dirty, and only write the various metadata inodes out if
they contain any dirty state from this inode. This is archived by
adding three new dirty bits to the hfsplus-specific inode which are
set in the correct places.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit b33b7921db14abcd10c30d0ccfc68e364f5ef7fe
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:38:13 2010 +0100
hfsplus: split up inode flags
Split the flags field in the hfsplus inode into an extent_state
flag that is locked by the extent_lock, and a new flags field
that uses atomic bitops. The second will grow more flags in the
next patch.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit eb29d66d4f2dc98a81ae590bbdddc8cfa8964d73
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:38:10 2010 +0100
hfsplus: write up fsync for directories
fsync is supposed to not just work on regular files, but also on
directories. Fortunately enough hfsplus_file_fsync works just fine
for directories, so we can just wire it up.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 281469766bdde2d14bc73e1fec347e6dd7f63319
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:38:06 2010 +0100
hfsplus: simplify fsync
Remove lots of code we don't need from fsync, we just need to call
->write_inode on the inode if it's dirty, for which sync_inode_metadata
is a lot more efficient than write_inode_now, and we need to write
out the various metadata inodes, which we now do explicitly instead
of by calling ->sync_fs.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit f02e26f8d90f8cde98314c72c2e890bc281a8346
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:38:02 2010 +0100
hfsplus: avoid useless work in hfsplus_sync_fs
There is no reason to write out the metadata inodes or volume headers
during a non-blocking sync, as we are almost guaranteed to dirty them
again during the inode writeouts.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 7dc4f001123f9ebe3b010a6c26acd18698ad205f
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:37:57 2010 +0100
hfsplus: make sure sync writes out all metadata
hfsplus stores all metadata except for the volume headers in special
inodes. While these are marked hashed and periodically written out
by the flusher threads, we can't rely on that for sync. For the case
of a data integrity sync the VM has life-lock avoidance code that
avoids writing inodes again that are redirtied during the sync,
which is something that can happen easily for hfsplus. So make sure
we explicitly write out the metadata inodes at the beginning of
hfsplus_sync_fs.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 358f26d52680cb150907302d4334359de7dd2d59
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:37:51 2010 +0100
hfsplus: use raw bio access for partition tables
Switch the hfsplus partition table reding for cdroms to use our bio
helpers. Again we don't rely on any caching in the buffer_heads, and
this gets rid of the last buffer_head use in hfsplus.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 52399b171dfaea02b6944cd6feba49b624147126
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:37:47 2010 +0100
hfsplus: use raw bio access for the volume headers
The hfsplus backup volume header is located two blocks from the end of
the device. In case of device sizes that are not 4k aligned this means
we can't access it using buffer_heads when using the default 4k block
size.
Switch to using raw bios to read/write all buffer headers. We were not
relying on any caching behaviour of the buffer heads anyway. Additionally
always read in the backup volume header during mount to verify that we
can actually read it.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 3b5ce8ae31e3c66655207907527476bbd3e5063b
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:37:43 2010 +0100
hfsplus: always use hfsplus_sync_fs to write the volume header
Remove opencoded writing of the volume header in hfsplus_fill_super
and hfsplus_put_super and offload it to hfsplus_sync_fs. In the
put_super case this means we only write the superblock once instead
of twice.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 6d1bbfc4c0458c514126ccf7d6ce9232d9dbc872
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Tue Nov 23 14:37:40 2010 +0100
hfsplus: silence a few debug printks
Turn a few noisy debug printks that show up during xfstests into
complied out debug print statements.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 5bb6b1ea67a73f0665a41726dd7138977b992c6c
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Fri Nov 19 21:11:09 2010 +0100
sched: Add some clock info to sched_debug
Add more clock information to /proc/sched_debug, Thomas wanted to see
the sched_clock_stable state.
Requested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 51a96c77815e7f139892a6e9c8275a50e9baebdf
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Fri Nov 19 20:37:53 2010 +0100
cpu: Remove incorrect BUG_ON
Oleg mentioned that there is no actual guarantee the dying cpu's
migration thread is actually finished running when we get there, so
replace the BUG_ON() with a spinloop waiting for it.
Reported-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2e01f4740a874b6085da6ebf541e7ffde9a72bf2
Author: Dhaval Giani <dhaval.giani@xxxxxxxxx>
Date: Thu Nov 18 15:44:54 2010 +0100
cpu: Remove unused variable
GCC warns us about:
kernel/cpu.c: In function â??take_cpu_downâ??:
kernel/cpu.c:200:15: warning: unused variable â??cpuâ??
This variable is unused since param->hcpu is directly
used later on in cpu_notify.
Signed-off-by: Dhaval Giani <dhaval_giani@xxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290091494.1145.5.camel@xxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 70caf8a6c13c2279b35f2ad6b644815533d6c476
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Sat Nov 20 00:53:51 2010 +0100
sched: Fix UP build breakage
The recent cgroup-scheduling rework caused a UP build problem.
Cc: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 28d0686cf7b14e30243096bd874d3f80591ed392
Author: Erik Gilling <konkers@xxxxxxxxxxx>
Date: Fri Nov 19 18:08:51 2010 -0800
sched: Make task dump print all 15 chars of proc comm
Signed-off-by: Erik Gilling <konkers@xxxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1290218934-8544-3-git-send-email-john.stultz@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6735329934e9acc1941a991ed6f6ad4be3e082a5
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Thu Nov 18 15:19:02 2010 +0200
wl12xx: Fix kernel crash related to hw recovery and interface shutdown
It is possible that the op_remove_interface function is invoked exactly at
the same time has hw recovery is started. In this case it is possible for the
interface to be already removed in the op_remove_interface call, which
currently leads to a kernel warning and a subsequent kernel crash.
Fix this by ignoring the op_remove_interface call if the interface is already
down at that point.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit bc15fde77fc5d9ec2eec6066a5ab554ea1266a0a
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date: Mon Nov 22 17:17:50 2010 -0800
xen: use default_idle
We just need the idle loop to drop into safe_halt, which default_idle()
is perfectly capable of doing. There's no need to duplicate it.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
commit c2d0879112825cddddd6c4f9b2645ff32acd6dc5
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date: Mon Nov 22 16:31:35 2010 -0800
xen: clean up "extra" memory handling some more
Make sure that extra_pages is added for all E820_RAM regions beyond
mem_end - completely excluded regions as well as the remains of partially
included regions.
Also makes sure the extra region is not unnecessarily high, and simplifies
the logic to decide which regions should be added.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
commit f8afa42b01c7a9f45b7cbaadb0481a0eeb96f18d
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Nov 22 18:26:51 2010 +0100
ath9k_htc: fix eeprom access
wireless-testing commit a05b5d45049d60a06a1b12976150572304a51928
ath9k: add support for reading eeprom from platform data on PCI devices
This change moved the initialization of the AH_USE_EEPROM flag from ath9k_hw
to ath9k. This needs to be added to ath9k_htc as well
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 02d2ebb2a0aa2cae0446289c8f927067aec06079
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Nov 22 15:39:39 2010 +0100
ath9k_hw: fix A-MPDU key search issues on AR9003
Under load, a large number of frames can produce decryption errors, even when
no key cache update is being done. Performing a key search for every single
frame in an A-MPDU improves reliability.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7253965a1cfbd22dd20f92b7a054e831777e284e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:39:03 2010 -0800
zd1211rw: Use const
Mark arrays const that are unmodified after initializations.
text data bss dec hex filename
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.old
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.new
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f4e16e41d62ddc75704a0344567a807ebb41a929
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:39:01 2010 -0800
rt2x00: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
40197 56 8336 48589 bdcd drivers/net/wireless/rt2x00/rt2800lib.o.new
40205 56 8336 48597 bdd5 drivers/net/wireless/rt2x00/rt2800lib.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 22288a5847df30fb8ba298914f144c3b1d6e1fbe
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:39:00 2010 -0800
rndis_wlan: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
41757 2205 9896 53858 d262 drivers/net/wireless/rndis_wlan.o.old
41653 2205 9880 53738 d1ea drivers/net/wireless/rndis_wlan.o.new
Changed functions rndis_set_oid and set_bssid to take const *'s.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ff273b91ff04e6f232234b70c45101074a0daa27
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:59 2010 -0800
ray_cs: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42607 3581 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.new
42603 3585 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 482e039f2a6546ee2ecf718ae6c02e84d1a7f00b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:58 2010 -0800
libertas: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
3650 56 704 4410 113a drivers/net/wireless/libertas/rx.o.new
3695 56 704 4455 1167 drivers/net/wireless/libertas/rx.o.old
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.new
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 20407ed8a5bb271dd8e8bd4678e1d3dadeb318bd
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:57 2010 -0800
iwlwifi: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
48644 57 12120 60821 ed95 drivers/net/wireless/b43/phy_n.o.new
48661 57 12120 60838 eda6 drivers/net/wireless/b43/phy_n.o.old
37906 86 7904 45896 b348 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.new
37937 86 7904 45927 b367 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.old
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.new
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.old
Changed b43_nphy_write_clip_detection to take a const u16 *
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5b4bc649e18539a5d5a5482670d77f3f72de0eea
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:56 2010 -0800
b43: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
5502 56 1336 6894 1aee drivers/net/wireless/b43/phy_common.o.new
5511 56 1336 6903 1af7 drivers/net/wireless/b43/phy_common.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3370a895454ad814d0fb5f50352cea4e51d7392f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:55 2010 -0800
atmel: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.old
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.new
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5653a63d85300dbed71b76ab7ada03808bdfb170
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:54 2010 -0800
carl9170: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.new
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.old
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 07b2fa5a2368accf0fe6cb16e7eca6d1150554ed
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:53 2010 -0800
ath9k: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11161 56 2136 13353 3429 drivers/net/wireless/ath/ath9k/ar9003_paprd.o.new
11167 56 2136 13359 342f drivers/net/wireless/ath/ath9k/ar9003_paprd.o.old
15428 56 3056 18540 486c drivers/net/wireless/ath/ath9k/eeprom_4k.o.old
15451 56 3056 18563 4883 drivers/net/wireless/ath/ath9k/eeprom_4k.o.new
14087 56 2560 16703 413f drivers/net/wireless/ath/ath9k/eeprom_9287.o.old
14036 56 2560 16652 410c drivers/net/wireless/ath/ath9k/eeprom_9287.o.new
10041 56 2384 12481 30c1 drivers/net/wireless/ath/ath9k/ani.o.new
10088 56 2384 12528 30f0 drivers/net/wireless/ath/ath9k/ani.o.old
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.new
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.old
16483 56 3432 19971 4e03 drivers/net/wireless/ath/ath9k/ar9003_phy.o.new
16517 56 3432 20005 4e25 drivers/net/wireless/ath/ath9k/ar9003_phy.o.old
18221 104 2960 21285 5325 drivers/net/wireless/ath/ath9k/rc.o.old
18203 104 2960 21267 5313 drivers/net/wireless/ath/ath9k/rc.o.new
19985 56 4288 24329 5f09 drivers/net/wireless/ath/ath9k/eeprom_def.o.new
20040 56 4288 24384 5f40 drivers/net/wireless/ath/ath9k/eeprom_def.o.old
23997 56 4984 29037 716d drivers/net/wireless/ath/ath9k/ar5008_phy.o.old
23846 56 4984 28886 70d6 drivers/net/wireless/ath/ath9k/ar5008_phy.o.new
24285 56 3184 27525 6b85 drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.old
24101 56 3184 27341 6acd drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.new
6834 56 1032 7922 1ef2 drivers/net/wireless/ath/ath9k/ar9002_phy.o.old
6780 56 1032 7868 1ebc drivers/net/wireless/ath/ath9k/ar9002_phy.o.new
36211 64 8624 44899 af63 drivers/net/wireless/ath/ath9k/hw.o.new
36401 64 8624 45089 b021 drivers/net/wireless/ath/ath9k/hw.o.old
9281 56 1496 10833 2a51 drivers/net/wireless/ath/ath9k/ar9003_calib.o.old
9150 56 1496 10702 29ce drivers/net/wireless/ath/ath9k/ar9003_calib.o.new
Use ARRAY_SIZE instead of a magic number.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8b22523b045858042c6700f556f840853de163ea
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:52 2010 -0800
ath5k: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11266 56 2464 13786 35da drivers/net/wireless/ath/ath5k/ani.o.old
11181 56 2464 13701 3585 drivers/net/wireless/ath/ath5k/ani.o.new
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 85be3d98dbc8d9cff9411c52c619c3752737b7b4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Nov 20 18:38:51 2010 -0800
ar9170: Use const
Mark an array const.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a9ab21133581580f6907abbc33fd3870e75dc935
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sat Nov 20 16:53:26 2010 +0100
carl9170: fix init-self regression
The commit: "carl9170: tx path review" introduced a regression.
gcc (with -Winit-self):
tx.c:1264: warning: â??superâ?? is used uninitialized in this function
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3b1d6dfaaf89694c2aa56fe9a6b0f0221b98a209
Author: Huang Weiyi <weiyi.huang@xxxxxxxxx>
Date: Sat Nov 20 20:06:02 2010 +0800
libertas: remove duplicated #include
Remove duplicated #include('s) in
drivers/net/wireless/libertas/cfg.c
Signed-off-by: Huang Weiyi <weiyi.huang@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e1566d1f322b41b1ac3acf33407a0cfe2a311b75
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Nov 20 03:08:46 2010 +0100
ath9k: fix recursive locking in the tx flush path
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Tested-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 33e808c383477e821163f133c2e3e671879c28b6
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Mon Nov 22 12:53:23 2010 -0800
Input: iforce - clean up Makefile
Use <module>-y notation to specify list of objects comprising iforce
module and conditionally pull in USB and RS232 support.
Also remove custom compiler flags and rely on general makefile rules
for enabling warnings.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit ebde50d5a49122c164f81958a03993e1c947c0b6
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Mon Nov 22 12:39:28 2010 -0800
Input: clean up Makefile (use input-core-y)
The proper way to specify multi-source object is to use <name>-y instead
of <name>-obj (which is deprecated) as it allows conditional inclusion
of modules in the list.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit b5bb2f2beb4d54597fd54075480fc4874a9c08dc
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu Nov 18 12:08:10 2010 -0800
iwlwifi: fix modular 3945 only build
If only 3945 is selected, and is a module, build
fails because iwl-legacy.c won't be compiled. Fix
this by adding it to the build correctly.
This doesn't happen for 4965 because it is a bool
option, not tristate, since it's built into the
AGN module.
Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Tested-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 18890d4b89d8507ad09289f6f57a71591c7e9e83
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Fri Nov 19 08:11:01 2010 +0100
mac80211: Disable hw crypto for GTKs on AP VLAN interfaces
When using AP VLAN interfaces, each VLAN interface should be in its own
broadcast domain. Hostapd achieves this by assigning different GTKs to
different AP VLAN interfaces.
However, mac80211 drivers are not aware of AP VLAN interfaces and as
such mac80211 sends the GTK to the driver in the context of the base AP
mode interface. This causes problems when multiple AP VLAN interfaces
are used since the driver will use the same key slot for the different
GTKs (there's no way for the driver to distinguish the different GTKs
from different AP VLAN interfaces). Thus, only the clients associated
to one AP VLAN interface (the one that was created last) can actually
use broadcast traffic.
Fix this by not programming any GTKs for AP VLAN interfaces into the hw
but fall back to using software crypto. The GTK for the underlying AP
interface is still sent to the driver.
That means, broadcast traffic to stations associated to an AP VLAN
interface is encrypted in software whereas broadcast traffic to
stations associated to the non-VLAN AP interface is encrypted in
hardware.
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b2e253cf300c5e33f49b7dd8b593bfc722177401
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Nov 17 21:46:09 2010 -0800
cfg80211: Fix regulatory bug with multiple cards and delays
When two cards are connected with the same regulatory domain
if CRDA had a delayed response then cfg80211's own set regulatory
domain would still be the world regulatory domain. There was a bug
on cfg80211's logic such that it assumed that once you pegged a
request as the last request it was already the currently set
regulatory domain. This would mean we would race setting a stale
regulatory domain to secondary cards which had the same regulatory
domain since the alpha2 would match.
We fix this by processing each regulatory request atomically,
and only move on to the next one once we get it fully processed.
In the case CRDA is not present we will simply world roam.
This issue is only present when you have a slow system and the
CRDA processing is delayed. Because of this it is not a known
regression.
Without this fix when a delay is present with CRDA the second card
would end up with an intersected regulatory domain and not allow it
to use the channels it really is designed for. When two cards with
two different regulatory domains were inserted you'd end up
rejecting the second card's regulatory domain request.
This fails with mac80211_hswim's regtest=2 (two requests, same alpha2)
and regtest=3 (two requests, different alpha2) module parameter
options.
This was reproduced and tested against mac80211_hwsim using this
CRDA delayer:
#!/bin/bash
echo $COUNTRY >> /tmp/log
sleep 2
/sbin/crda.orig
And these regulatory tests:
modprobe mac80211_hwsim regtest=2
modprobe mac80211_hwsim regtest=3
Reported-by: Mark Mentovai <mark@xxxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Tested-by: Mark Mentovai <mark@xxxxxxxxxxxx>
Tested-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b0e2880b0518ad11af20c7c93ec5cac93f9f03b0
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Nov 17 21:46:08 2010 -0800
cfg80211: move mutex locking to reg_process_pending_hints()
This will be required in the next patch and it makes the
next patch easier to review.
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Tested-by: Mark Mentovai <mark@xxxxxxxxxxxx>
Tested-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f333a7a2f49e2a9b46f8d18962bd750b18beeecd
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Nov 17 21:46:07 2010 -0800
cfg80211: move reg_work and reg_todo above
These will be used earlier in the next few patches.
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Tested-by: Mark Mentovai <mark@xxxxxxxxxxxx>
Tested-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 31e99729ae66d8b74316547c40eed15172f14ea8
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Nov 17 21:46:06 2010 -0800
cfg80211: put core regulatory request into queue
This will simplify the synchronization for pending requests.
Without this we have a race between the core and when we
restore regulatory settings, although this is unlikely
its best to just avoid that race altogether.
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Tested-by: Mark Mentovai <mark@xxxxxxxxxxxx>
Tested-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8ce469999552b0c3325350cd9b4be417f2bbfc23
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Wed Nov 17 22:14:37 2010 +0100
b43: rfkill: use HI enabled bit for all devices
Devices which use LO enabled bit are covered by b43legacy
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 176bfc44417544724e6df0831a7f576f4a56283d
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Tue Sep 7 13:33:05 2010 -0700
arm: kconfig: dis-allow hotplug on MSM
MSM doesn't support hotplug, so we prevent it from being
selected in Kconfig.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 89c3dedf477da9c8d42d3a63d16875e52f74108b
Author: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
Date: Mon Nov 22 12:35:41 2010 -0800
arm: kconfig: enable SMP for MSM targets
This just adds ARCH_MSM_SCORPIONMP to allow SMP selection for
MSM. MSM is unique in that it doesn't enable SCU or TWD.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 8933f90c777c5728822206a2313c9c1361f5274f
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Oct 14 22:58:58 2010 +0200
b43: N-PHY: add 2056 radio channels tables
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff
Merge: b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4 9e2e7422d059f9b98c3a0810df92a1ff660ade2f
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Nov 22 15:28:30 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit c89ad7372232b69fd37edf90d6f5d2a8d6381214
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date: Mon Nov 1 19:08:50 2010 +0000
Bluetooth: Fix not returning proper error in SCO
Return 0 in that situation could lead to errors in the caller.
Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
commit 09910509ebc74643e94fe6f3feb4c23b019aeb34
Author: Glenn Sommer <gsommer@xxxxxxxxxxxxxx>
Date: Mon Nov 22 12:00:05 2010 -0800
Input: usbtouchscreen - add support for LG Flatron T1710B
I've recently got my hands on a LG Flatron T1710B touchscreen.
As other LG products, this seems to use the ITM panel.
Signed-off-by: Glenn Sommer <gsommer@xxxxxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit eb06acdc85585f28864261f28659157848762ee4
Author: Sridhar Samudrala <sri@xxxxxxxxxx>
Date: Thu Oct 28 13:10:50 2010 +0000
macvlan: Introduce 'passthru' mode to takeover the underlying device
With the current default 'vepa' mode, a KVM guest using virtio with
macvtap backend has the following limitations.
- cannot change/add a mac address on the guest virtio-net
- cannot create a vlan device on the guest virtio-net
- cannot enable promiscuous mode on guest virtio-net
To address these limitations, this patch introduces a new mode called
'passthru' when creating a macvlan device which allows takeover of the
underlying device and passing it to a guest using virtio with macvtap
backend.
Only one macvlan device is allowed in passthru mode and it inherits
the mac address from the underlying device and sets it in promiscuous
mode to receive and forward all the packets.
Signed-off-by: Sridhar Samudrala <sri@xxxxxxxxxx>
-------------------------------------------------------------------------
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e5700c740da2cb9f5a3aa978cd1fa3a79916ba04
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:28 2010 +0000
Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fdb26195f494988fc155c204aab0f0953ba7ec6f
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:27 2010 +0000
Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9ed05ad3c0629f434b18d20c51162f9bbb4f5d31
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:26 2010 +0000
Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 094f2faaa2c4973e50979158f655a1d31a97ba98
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:25 2010 +0000
Net: rds: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.
Last but not least, took out if-conditionals.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 927a41f50c83b539fde5c01911f4968d717199bf
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:24 2010 +0000
Net: phonet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 64387df8da1e4f178a47d53930288a46a357a479
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:23 2010 +0000
Net: lapb: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 94ee288e94ab31cefe2c5af3b59c25a1374ca3e5
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:22 2010 +0000
Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cd30c62024904951392e21a200fe5427a6286736
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:21 2010 +0000
Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f91c4ae4989322ed5cd10b5247e1a7bd3868a84e
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:20 2010 +0000
Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4de58dfebe6882dc1e8e8dc5ec062e28e99623cd
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:19 2010 +0000
Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6b8ff8c517008d93a6da62b106072a12dea8cb7c
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:18 2010 +0000
Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cc0bdac399b1881626cd5512f292e396c9c96685
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:17 2010 +0000
Net: econet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 22674a24b44ac53f244ef6edadd02021a270df5a
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:16 2010 +0000
Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fa13bc3daa5954ce58f68fd34fb1611df6ea6e6f
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:15 2010 +0000
Net: ceph: Makefile: remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bac14e017830bd204b3a1bd55f42b0841c02e995
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:14 2010 +0000
Net: can: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a3106d032fb17283c96fa041f8285e6926ae074d
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:13 2010 +0000
Net: caif: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.
Last but not least, took out if-conditionals.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 87217502d4f45a9925c5eda5b2179f1220e87537
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 21 15:03:12 2010 +0000
Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Mon Nov 22 12:59:08 2010 +0200
wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc
On the disassociation event from the mac80211, the wl12xx driver does not
clear the chipset configuration related to the AP - i.e. it does not perform
a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not
unset the BSSID filter.
Often this is not a problem, as the above is performed upon entering idle
state. But if a scenario arises where a new association is attempted without
cycling through idle state, the new association will fail.
Fix this by resetting the firmware state on disassociation.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 68d069c45f73e8aeda0249891daec1f7e2f0e067
Author: Arik Nemtsov <arik@xxxxxxxxxx>
Date: Mon Nov 8 10:51:07 2010 +0100
wl1271: add support for HW TX fragmentation
Indicate to mac80211 we support HW fragmentation.
Support updates of the fragmentation threshold via the
set_frag_threshold callback.
Signed-off-by: Arik Nemtsov <arik@xxxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit fa97f46b30357a50f3ee193e6f82864f95bc55ec
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Wed Nov 10 11:27:20 2010 +0100
Revert "wl1271: Change supported channel order for a more optimal scan"
This reverts commit fa21c7a9e4be439e217fe72edbd39b643b643791.
The reverted patch caused more harm than benefit.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit b7417d930afdc214daa24299912d984e7f4f390a
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Wed Nov 10 11:27:19 2010 +0100
wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies
The wl1271 does not support radar detection. Hence, prevent ad-hoc and
active scanning on frequencies requiring DFS.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 91433029e42e58d8536299f32fa55cf589adff35
Author: Gery Kahn <geryk@xxxxxx>
Date: Sun Nov 7 10:04:20 2010 +0100
wl1271: cleanup unused code of calibration structures
The cleanup unused code for calibration procedures.
Signed-off-by: Gery Kahn <geryk@xxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 00d201001bd4e8a46e3d03c970abcb72256c368b
Author: Shahar Levi <shahar_levi@xxxxxx>
Date: Mon Nov 8 11:20:10 2010 +0000
wl1271: Change wl12xx Files Names
All files name prefix removed due to the fact that wl12xx driver supports
wl1271 and wl1273.
Also the definition in Kconfig and header files changed respectively.
Signed-off-by: Shahar Levi <shahar_levi@xxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 9a1f8b34aa539000da17a06235e4bec254d0bfb5
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Fri Sep 24 10:16:44 2010 -0300
[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions
The argument isn't used anymore by the functions, remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit aa2d8cbe169b7328eeabc9e2debccf5aee6f9199
Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Date: Sat Oct 23 09:13:37 2010 -0300
[media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
With the v4l2_i2c_new_subdev* functions now supporting loading modules
based on modaliases, replace the hardcoded module name passed to those
functions by NULL in the cafe-ccic, via-camera and s5p-fimc drivers.
All corresponding I2C modules have been checked, and all of them include
a module aliases table with names corresponding to what the drivers
modified here use.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 691513f70d3957939a318da970987b876c720861
Author: Lin Ming <ming.m.lin@xxxxxxxxx>
Date: Mon Nov 22 14:03:28 2010 +0100
x86: Resume trampoline must be executable
commit 5bd5a452(x86: Add NX protection for kernel data) marked the
trampoline area NX - which unsurprisingly breaks resume and cpu
hotplug.
Revert the portion of that commit, which touches the trampoline.
Originally-from: Lin Ming <ming.m.lin@xxxxxxxxx>
LKML-Reference: <1290410581.2405.24.camel@xxxxxxxxxxxxxxxxxxx>
Cc: Matthieu Castet <castet.matthieu@xxxxxxx>
Cc: Siarhei Liakh <sliakh.lkml@xxxxxxxxx>
Cc: Xuxian Jiang <jiang@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Tested-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 9b4320b77bab4031649c484da1c595f39c2e43cd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Tue Nov 9 14:29:05 2010 -0300
[media] Fix Kconfig errors due to two visible menus
Use the new visible Kconfig keyword to avoid producing error for two menus
that are visible only if Tuner/frontend customise options are enabled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit c38bd4ffc7f24a99a14f9c776276e816f5de2509
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sat Nov 6 18:30:27 2010 -0300
i2c/algos: convert Kconfig to use the menu's `visible' keyword
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 37e3273ee52fb995c1f531fa1d98d190cc35e1bc
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sat Nov 6 18:30:26 2010 -0300
media/video: convert Kconfig to use the menu's `visible' keyword
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit dfc518dd6b5c5e00f98906eaa5c7d716d856c098
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sat Nov 6 18:30:25 2010 -0300
Revert "i2c: Fix Kconfig dependencies"
This reverts commit 0a57274ea026c2b7670683947b6cc08b195148cf.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 09899c93b183870b122c94317f63344df43368e9
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sat Nov 6 18:30:24 2010 -0300
kconfig: regen parser
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit da79de97d254145dcb7c08c978b1093eac15ec9c
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 22 11:12:46 2010 +0000
drm/i915/sdvo: Only enable HDMI encodings only if the commandset is supported
As we conflated intel_sdvo->is_hdmi with both having HDMI support on the
ADD along with having HDMI support on the monitor, we would attempt to
use HDMI encodings even if the interface did not support those commands.
Reported-by: Simon Farnsworth <simon.farnsworth@xxxxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Tested-by: Simon Farnsworth <simon.farnsworth@xxxxxxxxxxxx>
Reviewed-by: Simon Farnsworth <simon.farnsworth@xxxxxxxxxxxx>
commit 86e187ff9bce9fbed7bfed92ae34f491cf1af50f
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date: Sat Nov 6 18:30:23 2010 -0300
kconfig: add an option to determine a menu's visibility
This option is aimed to add the possibility to control a menu's visibility
without adding dependency to the expression to all the submenu.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Tested-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 07a8cdd2bb17a4da68136d963b8bc71959bd31a5
Author: Anand Gadiyar <gadiyar@xxxxxx>
Date: Thu Nov 18 18:54:17 2010 +0530
usb: musb: do not use dma for control transfers
The Inventra DMA engine used with the MUSB controller in many
SoCs cannot use DMA for control transfers on EP0, but can use
DMA for all other transfers.
The USB core maps urbs for DMA if hcd->self.uses_dma is true.
(hcd->self.uses_dma is true for MUSB as well).
Split the uses_dma flag into two - one that says if the
controller needs to use PIO for control transfers, and
another which says if the controller uses DMA (for all
other transfers).
Also, populate this flag for all MUSB by default.
(Tested on OMAP3 and OMAP4 boards, with EHCI and MUSB HCDs
simultaneously in use).
Signed-off-by: Maulik Mankad <x0082077@xxxxxx>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
Cc: Oliver Neukum <oliver@xxxxxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: Praveena NADAHALLY <praveen.nadahally@xxxxxxxxxxxxxx>
Cc: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit bb324b08165d5656d221af013ed9994a54e455be
Author: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
Date: Mon Nov 22 14:22:41 2010 +0530
usb: musb: gadget: fix compilation warning
Fixes below compilation warning when musb driver is compiled for
PIO mode:
drivers/usb/musb/musb_gadget.c: In function 'musb_g_rx':
drivers/usb/musb/musb_gadget.c:840:
warning: label 'exit' defined but not used
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit e75df37165c639b06213ec88b4763c3e50a7f079
Author: Ming Lei <tom.leiming@xxxxxxxxx>
Date: Tue Nov 16 23:37:37 2010 +0800
usb: musb: clear RXCSR_AUTOCLEAR before PIO read
If RXCSR_AUTOCLEAR flag is not cleard before PIO reading, one packet
may be recieved by musb fifo, but no chance to notify
software, so cause packet loss, follows the detailed process:
- PIO read one packet
- musb fifo auto clear the MUSB_RXCSR_RXPKTRDY
- musb continue to recieve the next packet, and MUSB_RXCSR_RXPKTRDY
is set
- software clear the MUSB_RXCSR_RXPKTRDY, so there is no chance for
musb to notify software that the 2nd recieved packet.
The patch does fix the g_ether issue below:
- use fifo_mode 3 to enable double buffer
- 'ping -s 1024 IP_OF_BEAGLE_XM'
- one usb packet of 512 byte is lost, so ping failed,
which can be observed by wireshark
note:
Beagle xm takes musb rtl1.8 and may fallback to pio mode
for unaligned buffer.
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 92d2711f5dc15bf956546923a5718e74853f9912
Author: Hema Kalliguddi <hemahk@xxxxxx>
Date: Mon Nov 15 04:24:01 2010 -0600
usb: musb: unmap dma buffer when switching to PIO
Buffer is mapped to dma when dma channel is
allocated. If, for some reason, dma channel
programming fails, musb code will fallback
to PIO mode to transfer that request. In
that case, we need to unmap the buffer
back to CPU.
MUSB RTL1.8 and above cannot handle buffers
which are not 32bit aligned. That happens to
every request sent by g_ether gadget
driver. Since the buffer sent was unaligned,
we need to fallback to PIO.
Because of that, g_ether was failing due
to missing buffer unmapping.
With this patch and [1] g_ether works fine
with all MUSB revisions.
Verified with OMAP3630 board, which has
MUSB RTL1.8 using g_ether and g_zero.
[1] http://www.spinics.net/lists/linux-usb/msg38400.html
Signed-off-by: Hema HK <hemahk@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
commit 4ab0fbd3a29067e1540f05093ae4ed07645d18c8
Merge: f3c91c1deaf8493526d8216be94c33e963f00962 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Mon Nov 22 08:47:43 2010 +0000
Merge remote branch 'linus' into drm-intel-fixes
commit f09830ab15bfb7eb4e832e44189b5b5883309811
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Sun Nov 21 22:27:13 2010 -0800
Input: ct82c710 - remove a redundant serio_register_port()
We already call serio_register_port() in ct82c710_probe(),
thus remove a redundant serio_register_port() in ct82c710_init().
Looks like this bug is introduced by
916d83cfe5da1cda454d8b0ae233f06b58bd7f91
"Input: ct82c710 - convert to the new platform device interface"
[dtor@xxxxxxx: also move printk to where we register port]
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit ebcc019926269e7e123d55ec92ff00c2688ca343
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Sun Nov 21 22:27:09 2010 -0800
Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit
serio_unregister_port() will call put_device() to free the memory.
Thus remove kfree(ams_delta_serio) after
serio_unregister_port(ams_delta_serio).
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 0e86eb29def648664c2c0fa605f5b5bad84247cb
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Sun Nov 21 22:23:06 2010 -0800
Input: ps2mult - fix wrong kfree in ps2mult_connect error path
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit f24d86f1a49505cdea56728b853a5d0a3f8e3d11
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Fri Nov 19 23:27:04 2010 +0000
drm/radeon/kms: fix resume regression for some r5xx laptops
I had removed this when I switched the atom indirect io methods
to use the io bar rather than the mmio bar, but it appears it's
still needed.
Reported-by: Mark Lord <kernel@xxxxxxxxxxxx>
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 791cfe2684a74ed7155254816ff9e89e6064277c
Author: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Sun Nov 21 10:58:05 2010 -0500
drm/radeon/kms: fix regression in rs4xx i2c setup
typo in my last i2c rework.
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=23222
Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit 551eaff1b384cc107eab6332ba8424b3ca1f304b
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Nov 21 10:26:44 2010 -0800
pktgen: allow faster module unload
Unloading pktgen module needs ~6 seconds on a 64 cpus machine, to stop
64 kthreads.
Add a pktgen_exiting variable to let kernel threads die faster, so that
kthread_stop() doesnt have to wait too long for them. This variable is
not tested in fast path.
Note : Before exiting from pktgen_thread_worker(), we must make sure
kthread_stop() is waiting for this thread to be stopped, like its done
in kernel/softirq.c
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f
Author: Jan Engelhardt <jengelh@xxxxxxxxxx>
Date: Sat Nov 20 18:07:21 2010 +0000
netns: let net_generic take pointer-to-const args
This commit is same in nature as v2.6.37-rc1-755-g3654654; the network
namespace itself is not modified when calling net_generic, so the
parameter can be const.
Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bbce5a59e4e0e6e1dbc85492caaf310ff6611309
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sat Nov 20 07:31:54 2010 +0000
packet: use vzalloc()
alloc_one_pg_vec_page() is supposed to return zeroed memory, so use
vzalloc() instead of vmalloc()
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Neil Horman <nhorman@xxxxxxxxxxxxx>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9a2d09cf61c9d9f1b31998bec5363a583e4564a4
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Nov 21 09:55:10 2010 -0800
ixgbe: update version number for ixgbe
This will reflect addition of new X540 hardware
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f3c91c1deaf8493526d8216be94c33e963f00962
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun Nov 21 09:56:00 2010 +0000
drm/i915: Only save/restore cursor regs if !KMS
Under KMS, restoring the cursor is handled upon modeswitch in order to
avoid enabling an undefined set of registers. At the moment, the cursor
is restored before the aperture and modes are fully setup causing some
invalid access during resume, such as:
PGTBL_ER: 0x00040000
Invalid GTT entry during Cursor Fetch
Fix this by only performing cursor register save/restore under UMS where
it is done in the correct sequence.
Reported-by: Arkadiusz Miskiewicz <arekm@xxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit d1d788302e8c76e5138dfa61f4a5eee4f72a748f
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun Nov 21 09:23:48 2010 +0000
drm/i915: Prevent integer overflow when validating the execbuffer
Commit 2549d6c2 removed the vmalloc used for temporary storage of the
relocation lists used during execbuffer. However, our use of vmalloc was
being protected by an integer overflow check which we do want to
preserve!
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
commit 39de52104dd92bc0548a20201350111dc9317df9
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sat Nov 20 13:36:49 2010 -0800
Input: serio HIL MLC - don't deref null, don't leak and return proper error
While reviewing various users of kernel memory allocation functions I came
across drivers/input/serio/hil_mlc.c::hil_mlc_register() and noticed that:
- it calls kzalloc() but fails to check for a NULL return before use.
- it makes several allocations and if one fails it doesn't free the
previous ones.
- It doesn't return -ENOMEM in the failed memory allocation case (it just
crashes).
This patch corrects all of the above and also reworks the only caller of
this function that I could find
(drivers/input/serio/hp_sdc_mlc.c::hp_sdc_mlc_out()) so that it now checks
the return value of hil_mlc_register() and properly propagates it on
failure and I also restructured the code to remove some labels and goto's
to make it, IMHO nicer to read.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Tested-by: Helge Deller <deller@xxxxxx>
Acked-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit d9cf837ef9629ab34167bd6fc0141383ddb8813a
Author: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Date: Fri Nov 19 17:37:24 2010 -0800
perf stat: Change and clean up sys_perf_event_open error handling
This patch makes several changes to "perf stat":
- "perf stat" will no longer go ahead and run the application when one or
more of the specified events could not be opened.
- Use error() and die() instead of pr_err() so that the output is more
consistent with "perf top" and "perf record".
- Handle permission errors in a more robust way, and in a similar way to
"perf record" and "perf top".
In addition, the sys_perf_event_open() error handling of "perf top" and "perf
record" is made more consistent and adds the following phrase when an event
doesn't open (with something ther than an access or permission error):
"/bin/dmesg may provide additional information."
This is added because kernel code doesn't have a good way of expressing
detailed errors to user space, so its only avenue is to use printk's. However,
many users may not think of looking at dmesg to find out why an event is being
rejected.
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <fweisbec@xxxxxxxxx>
Cc: Ian Munsie <ianmunsi@xxxxxxxxxxx>
Cc: Michael Ellerman <michaele@xxxxxxxxxxx>
LKML-Reference: <1290217044-26293-1-git-send-email-cjashfor@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 9cdca869724e766eb48c061967cb777ddb436c76
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Sat Nov 20 10:37:05 2010 +0100
x86: platform: Move iris to x86/platform where it belongs
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit b21bded7c006a29ccda0b8515c4ae3b49e3b599b
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Fri Nov 19 15:10:39 2010 +0000
sst: log error returned by scu ipc read/write
scu ipc driver fails sometimes to read/write. This add logs with register
addr and ret code when these errors occur.
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 90abe60b32a4762fff9bef33295e08bc9bb355af
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Fri Nov 19 15:09:50 2010 +0000
sst: Firmware error codes force number values
To avoid mismatch in driver and firmware error codes assign specfic values
to each enum.
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6f6ffec188b5416642b20ef14034d40cfeb3256e
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Fri Nov 19 15:06:31 2010 +0000
sst: Change the SST driver PCM interface
The PCM interface in SST driver is cmds only, this patch changes the interface to open, close and cmd interface.
This allows SST driver to keep easy track of handles open
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4856ab33eb5c33bdf17a5a1bd8d720bffe5f6110
Author: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Date: Wed Nov 17 15:45:36 2010 -0800
Staging: sep: Introduce sep driver
This driver is for the Security Processor, a dedicated encryption
and decryption driver that is used on the Intel mobile platform.
This has been checked with checkpatch and there are four
warnings for lines over 80 charactors.
There is one compile warning. This is for a function that is
only used if the rar register driver is needed. There is an
ifdef in a header file that stubs out the rar register driver
if the rar register is not configured.
This driver does add a configuration, which is CONFIG_DX_SEP.
Signed-off-by: Mark Allyn <mark.a.allyn@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d948d5f96a4b5923599a7a657dbbd8660b0f9fa5
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Wed Nov 17 15:38:46 2010 -0800
staging: clearpad_tm1217 depends on INPUT
clearpad_tm1217 driver uses many input_() interfaces, so it should
depend on INPUT.
clearpad_tm1217.c:(.text+0xf19ac): undefined reference to `input_unregister_device'
clearpad_tm1217.c:(.text+0xf1b19): undefined reference to `input_event'
clearpad_tm1217.c:(.text+0xf1b31): undefined reference to `input_event'
clearpad_tm1217.c:(.text+0xf1bb4): undefined reference to `input_event'
clearpad_tm1217.c:(.text+0xf1bf2): undefined reference to `input_event'
drivers/built-in.o:clearpad_tm1217.c:(.text+0xf1c08): more undefined references to `input_event' follow
clearpad_tm1217.c:(.text+0xf1df3): undefined reference to `input_allocate_device'
clearpad_tm1217.c:(.text+0xf1eac): undefined reference to `input_set_abs_params'
clearpad_tm1217.c:(.text+0xf1ed1): undefined reference to `input_set_abs_params'
clearpad_tm1217.c:(.text+0xf1ed8): undefined reference to `input_register_device'
clearpad_tm1217.c:(.text+0xf2040): undefined reference to `input_unregister_device'
clearpad_tm1217.c:(.text+0xf204b): undefined reference to `input_free_device'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Ramesh Agarwal <ramesh.agarwal@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7716090be5603f1ad4df1379652b8d107c207f5c
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Thu Nov 18 09:49:09 2010 +0100
staging: ft1000: Fix compilation warning.
This patch fix following warning:
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c:67:22:
warning: â??pft1000infoâ?? may be used uninitialized in this function
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 24d6050b352aa76364bd344c41b3e3e0f51466cc
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Fri Nov 19 15:16:46 2010 +0100
staging: iio: dac: Cleanup style - no functional changes
Stick to the 80 character line limit at least for code
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ece30c15921f94c1d58c494507f528c9482db409
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Fri Nov 19 15:16:45 2010 +0100
staging: iio: dac: Use spi_device_id
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit df9cd1052079e5d0f88ed230276a17a49cc41045
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Fri Nov 19 15:16:44 2010 +0100
staging: iio: dac: Use spi_write() and handle return value
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 51f8ad36022e880019e79a9dea2351cc47c739d7
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Fri Nov 19 15:16:43 2010 +0100
staging: iio: dac: Update drivers to use new attribute naming
Remove depreciated macro from header
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5a7f4fddae8a50d076b5714f47936ea78e0c0858
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Fri Nov 19 13:32:38 2010 +0100
staging: iio: dac: more consistent DAC sysfs attributes naming
Align DAC sysfs attributes naming with the convention used by ADC
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 861f67031899b8ab909d672eaea85070317855c9
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:58 2010 -0800
staging: brcm80211: stragglers not handled by unifdef
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f9ec972793fb61f6ec612ecee5b1cc6efeacfbd6
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:57 2010 -0800
staging: brcm80211: unifdef -UBCMSDIO
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c73b9d6759993f521e3b0cb24abf74c4527469e3
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:56 2010 -0800
staging: brcm80211: remove bmac-only header files
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f3ce1ef2f80627c2b6339bfc96ee5c1b189cac06
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:55 2010 -0800
staging: brcm80211: unifdef -UWLC_SPLIT
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 501c09346ce74ec688113d5c6b8a321514935228
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:54 2010 -0800
staging: brcm80211: unifdef -DWLC_LOW
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 02db6b4769e2465b872a6cd87465a3e20d4573ce
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:53 2010 -0800
staging: brcm80211: unifdef -UWLC_LOW_ONLY
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 29efb1a9f450450e764d9901b434557349c3af53
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 19 14:30:52 2010 -0800
staging: brcm80211: unifdef -UWLC_HIGH_ONLY
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2cb8ada64f209c5c033f1821bbbc0e8d388cbf7f
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Thu Nov 18 20:46:44 2010 +0100
staging: brcm80211: replaced PKTSETLEN macro by native __skb_trim call
- removed PKTSETLEN macro and used __skb_trim call instead.
- removed unused macros PKTSETPOOL and PKTPOOL
Reviewed-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c303ecbda8b7c86975c4ba23f56b8cbe297cd060
Author: Arend van Spriel <arend@xxxxxxxxxxxx>
Date: Thu Nov 18 20:46:43 2010 +0100
staging: brcm80211: replace PKTPUSH and PKTPULL macros with native skbuff calls
Replacing PKTPUSH by skb_push() call and PKTPULL by skb_pull() call to make
it obvious what the operation is doing with the packet.
Reviewed-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 26361116d7c94984a5fbdc1b6a11555a9dc33cf0
Author: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Date: Wed Nov 17 10:00:00 2010 +0200
staging: brcm80211: brcmfmac: cleanup bcmsdh_(un)register
Signed-off-by: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5dc177da85a813ff73c35f2d9edfb0bc2fe8271c
Author: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Date: Wed Nov 17 09:58:46 2010 +0200
staging: brcm80211: brcmfmac: remove PCI SDIO controller binding
Signed-off-by: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4
Author: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Date: Tue Nov 16 15:58:52 2010 -0800
xhci: Don't let the USB core disable SuperSpeed ports.
Disabling SuperSpeed ports is a Very Bad Thing (TM). It disables
SuperSpeed terminations, which means that devices will never connect at
SuperSpeed on that port. For USB 2.0/1.1 ports, disabling the port meant
that the USB core could always get a connect status change later. That's
not true with USB 3.0 ports.
Do not let the USB core disable SuperSpeed ports. We can't rely on the
device speed in the port status registers, since that isn't valid until
there's a USB device connected to the port. Instead, we use the port
speed array that's created from the Extended Capabilities registers.
Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Tested-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit da6699ce4a889c3795624ccdcfe7181cc89f18e8
Author: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Date: Tue Oct 26 16:47:13 2010 -0700
xhci: Setup array of USB 2.0 and USB 3.0 ports.
An xHCI host controller contains USB 2.0 and USB 3.0 ports, which can
occur in any order in the PORTSC registers. We cannot read the port speed
bits in the PORTSC registers at init time to determine the port speed,
since those bits are only valid when a USB device is plugged into the
port.
Instead, we read the "Supported Protocol Capability" registers in the xHC
Extended Capabilities space. Those describe the protocol, port offset in
the PORTSC registers, and port count. We use those registers to create
two arrays of pointers to the PORTSC registers, one for USB 3.0 ports, and
another for USB 2.0 ports. A third array keeps track of the port protocol
major revision, and is indexed with the internal xHCI port number.
This commit is a bit big, but it should be queued for stable because the "Don't
let the USB core disable SuperSpeed ports" patch depends on it. There is no
other way to determine which ports are SuperSpeed ports without this patch.
Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Tested-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 7a3783efffc7bc2e702d774e47fad5b8e37e9ad1
Author: Paul Zimmerman <Paul.Zimmerman@xxxxxxxxxxxx>
Date: Wed Nov 17 16:26:50 2010 -0800
xhci: Fix reset-device and configure-endpoint commands
We have been having problems with the USB-IF Gold Tree tests when plugging
and unplugging devices from the tree. I have seen that the reset-device
and configure-endpoint commands, which are invoked from
xhci_discover_or_reset_device() and xhci_configure_endpoint(), will sometimes
time out.
After much debugging, I determined that the commands themselves do not actually
time out, but rather their completion events do not get delivered to the right
place.
This happens when the command ring has just wrapped around, and it's enqueue
pointer is left pointing to the link TRB. xhci_discover_or_reset_device() and
xhci_configure_endpoint() use the enqueue pointer directly as their command
TRB pointer, without checking whether it's pointing to the link TRB.
When the completion event arrives, if the command TRB is pointing to the link
TRB, the check against the command ring dequeue pointer in
handle_cmd_in_cmd_wait_list() fails, so the completion inside the command does
not get signaled.
The patch below fixes the timeout problem for me.
This should be queued for the 2.6.35 and 2.6.36 stable trees.
Signed-off-by: Paul Zimmerman <paulz@xxxxxxxxxxxx>
Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
commit 09c5088e5c5993be217a2c85dca088147ffc9b72
Author: Shreyas Bhatewara <sbhatewara@xxxxxxxxxx>
Date: Fri Nov 19 10:55:24 2010 +0000
net-next: Add multiqueue support to vmxnet3 driver
Add multiqueue support to vmxnet3 driver
This change adds multiqueue and thus receive side scaling support
to vmxnet3 device driver. Number of rx queues is limited to 1 in cases
where MSI is not configured or one MSIx vector is not available per rx
queue
Signed-off-by: Shreyas Bhatewara <sbhatewara@xxxxxxxxxx>
Reviewed-by: Bhavesh Davda <bhavesh@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 24912420e923d56461b400d83f250a31bed8a964
Merge: 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 0302b8622ce696af1cda22fcf207d3793350e896
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Nov 19 13:13:47 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
commit 124bf94a9f9b52341562628cd56b252e7d820ee8
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 19 21:03:33 2010 +0100
ARM: imx: fix name for functions adding sdhci-esdhc-imx devices
and restore alphabetic ordering.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit c496fa6bd5324ddce11e5e42670618ffb4d8f58d
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 16 23:24:21 2010 +0100
ARM: mx3/mx35_3ds: Add watchdog support
This bases on a patch by Fabio Estevam who added the device before it
was allocated dynamically.
Cc: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit d690b4c4778096cde018709efd005dfef9714297
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 16 21:27:33 2010 +0100
ARM: mx3: dynamically allocate imx-keypad devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 742269e2d971957c84f364c4e9f5c6439964ef01
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Nov 15 15:28:45 2010 +0100
ARM: mx3: dynamically allocate imx2-wdt devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 2d58de2805f93bdb8fa0608d98e1871bb28ec091
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Nov 15 11:57:49 2010 +0100
ARM: mx3: dynamically allocate mxc-ehci devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 9e1dde33876ba83ad586c336647fff133d0f5472
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 12 16:40:06 2010 +0100
ARM: mx3: dynamically allocate fsl-usb2-udc devices
While adapting the #defines for this I noticed that the offset
used for USB HS on i.MX35 differs from the documented offset.
I kept the working offset and commented that the documentation
differs.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit fed3d35b06bf3f6a3383c2637d054823c563200b
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 12 11:49:34 2010 +0100
ARM: mx3: dynamically allocate mxc_rnga devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 6a697e3d310d79ea0e385975c57084ce22b04b36
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 12 11:10:55 2010 +0100
ARM: mx3: dynamically register mxc-mmc devices
Compared to the static devices the dynamic have a DMA resource.
This should be save as it seems unused in the driver.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit a528bc87841d958bbd394abc9266aee9cdf45cb8
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 12 10:11:42 2010 +0100
ARM: mx3: introduce SOC_IMX31 and SOC_IMX35
Additionally convert some known to be good usages to the new
names.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 86f8efdaab49f5710f0aa3a3c1d76edc1d3d0df9
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 12 08:27:14 2010 +0100
ARM: mx3: use an MX35 constant in imx35 only code
... instead of MX3x
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit d7e0951f929513ced7c57882d2f95d49a546e002
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 18:50:50 2010 +0100
ARM: mx3: move registration of gpios to plat-mxc/gpio.c
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 972cc48207450ce6aeed416ac176fe4d0482a4a3
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 18:35:01 2010 +0100
ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC
Some usages of ARCH_MX25 are assuming that if it is
defined the other SoCs are undefined. Use SOC_IMX25 for the save
places.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 36a8cac9524bc67df2911cb3fbc349f87bcad37d
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 18:17:15 2010 +0100
ARM: imx: let the machines select SOC_IMX{21,27}
This prepares multi-SoC kernel support.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit fd2fa2e3238197ef10101277dff67da10e68a61b
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 18:11:29 2010 +0100
ARM: imx: let IMX_HAVE_PLATFORM_IMX_FB select HAVE_FB_IMX
This way FB_IMX can just depend on HAVE_FB_IMX and machines
just need to select IMX_HAVE_PLATFORM_IMX_FB without bothering
about HAVE_FB_IMX.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit e48ab1c16ff2af83e6a2a1228504710a5d339d08
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 18:06:17 2010 +0100
ARM: imx: move mx25 support to mach-imx
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 2a8bd56a382ec0e24249b1adaca4f38bd529e825
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 17:30:25 2010 +0100
ARM: mx25: remove now empty devices.h
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit bb4c853ff18fe3b0e2aec45053c318479e0c55e3
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 17:11:34 2010 +0100
ARM: mx25: dynamically allocate mx2-camera devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 00871505dcf15418aebc402db9f124dd2738fa2d
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 16:58:50 2010 +0100
ARM: mx25: dynamically allocate imx2-wdt devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit bc95df78c4566327086d44f1bfab984a70dc4d6b
Author: Rajeev Kumar <rajeev-dlh.kumar@xxxxxx>
Date: Fri Nov 19 12:41:19 2010 -0800
Input: add support for keyboards on ST SPEAr platform
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@xxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 18 13:21:35 2010 +0000
X25: remove bkl in routing ioctls
Routing doesn't use the socket data and is protected by x25_route_list_lock
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 54aafbd4989a684ca876e49bf3e6eb931654dc02
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 18 13:21:28 2010 +0000
X25: remove bkl in inq and outq ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 18 13:21:20 2010 +0000
X25: remove bkl in timestamp ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 70be998c2b44f942f11383496622500136816acb
Author: andrew hendry <andrew.hendry@xxxxxxxxx>
Date: Thu Nov 18 13:20:57 2010 +0000
X25: pushdown bkl in ioctls
Push down the bkl in the ioctls so they can be removed one at a time.
Signed-off-by: Andrew Hendry <andrew.hendry@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4aafd3f71a257a3522932944b5204262dfdff147
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Fri Nov 19 16:46:26 2010 -0200
perf tools: Change my maintainer address
Also remove old snail mail address from CREDITS, moved years ago.
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit a71123977eb3c72dd5a8bac723b13faf9cdd2828
Author: Robert Morell <rmorell@xxxxxxxxxx>
Date: Tue Nov 16 14:16:33 2010 -0800
perf tools: Remove hardcoded include paths for elfutils
This change removes the use of hardcoded absolute "/usr/include/elfutils" paths
from the perf build. The problem with hardcoded paths is that it prevents them
from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling
purposes).
Instead, just include the "elfutils/" subdirectory as a relative path when
files are needed from that directory.
Tested by building perf:
- Cross-compiled for ARM on x86_64
- Built natively on x86_64
- Built on x86_64 with /usr/include/elfutils moved to another location
and manually included in CFLAGS
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
LKML-Reference: <1289945793-31441-1-git-send-email-rmorell@xxxxxxxxxx>
Signed-off-by: Robert Morell <rmorell@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit f5b4a9c3ab53d544a540a6f3a5d17184e374d91a
Author: Stephane Eranian <eranian@xxxxxxxxxx>
Date: Tue Nov 16 11:05:01 2010 +0200
perf stat: Add no-aggregation mode to -a
This patch adds a new -A option to perf stat. If specified then perf stat does
not aggregate counts across all monitored CPUs in system-wide mode, i.e., when
using -a. This option is not supported in per-thread mode.
Being able to get a per-cpu breakdown is useful to detect imbalances between
CPUs when running a uniform workload than spans all monitored CPUs.
The second version corrects the missing cpumap[] support, so that it works when
the -C option is used.
The third version fixes a missing cpumap[] in print_counter() and removes a
stray patch in builtin-trace.c.
Examples on a 4-way system:
# perf stat -a -e cycles,instructions -- sleep 1
Performance counter stats for 'sleep 1':
9592808135 cycles
3490380006 instructions # 0.364 IPC
1.001584632 seconds time elapsed
# perf stat -a -A -e cycles,instructions -- sleep 1
Performance counter stats for 'sleep 1':
CPU0 2398163767 cycles
CPU1 2398180817 cycles
CPU2 2398217115 cycles
CPU3 2398247483 cycles
CPU0 872282046 instructions # 0.364 IPC
CPU1 873481776 instructions # 0.364 IPC
CPU2 872638127 instructions # 0.364 IPC
CPU3 872437789 instructions # 0.364 IPC
1.001556052 seconds time elapsed
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>
LKML-Reference: <4ce257b5.1e07e30a.7b6b.3aa9@xxxxxxxxxxxxx>
Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Fri Nov 19 09:30:18 2010 -0800
staging: fix winbond build, needs delay.h
winbond drivers use msleep() and delay(), so include linux/delay.h
in a common header file to prevent build errors.
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'
drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'
drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'
drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c26aed40f4fd18f86bcc6aba557cab700b129b73
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 18 22:04:46 2010 +0000
filter: use reciprocal divide
At compile time, we can replace the DIV_K instruction (divide by a
constant value) by a reciprocal divide.
At exec time, the expensive divide is replaced by a multiply, a less
expensive operation on most processors.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8c1592d68bc89248bfd0ee287648f41c1370d826
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 18 21:56:38 2010 +0000
filter: cleanup codes[] init
Starting the translated instruction to 1 instead of 0 allows us to
remove one descrement at check time and makes codes[] array init
cleaner.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4916a1083290edfb6cc53aa134f00597447de1ce
Author: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Date: Tue Nov 9 15:41:29 2010 +0530
msm: io: Export __msm_ioremap
This is required for modules to use ioremap()
Signed-off-by: Pavankumar Kondeti <pkondeti@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 93aaae2e01e57483256b7da05c9a7ebd65ad4686
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Nov 19 09:49:59 2010 -0800
filter: optimize sk_run_filter
Remove pc variable to avoid arithmetic to compute fentry at each filter
instruction. Jumps directly manipulate fentry pointer.
As the last instruction of filter[] is guaranteed to be a RETURN, and
all jumps are before the last instruction, we dont need to check filter
bounds (number of instructions in filter array) at each iteration, so we
remove it from sk_run_filter() params.
On x86_32 remove f_k var introduced in commit 57fe93b374a6b871
(filter: make sure filters dont read uninitialized memory)
Note : We could use a CONFIG_ARCH_HAS_{FEW|MANY}_REGISTERS in order to
avoid too many ifdefs in this code.
This helps compiler to use cpu registers to hold fentry and A
accumulator.
On x86_32, this saves 401 bytes, and more important, sk_run_filter()
runs much faster because less register pressure (One less conditional
branch per BPF instruction)
# size net/core/filter.o net/core/filter_pre.o
text data bss dec hex filename
2948 0 0 2948 b84 net/core/filter.o
3349 0 0 3349 d15 net/core/filter_pre.o
on x86_64 :
# size net/core/filter.o net/core/filter_pre.o
text data bss dec hex filename
5173 0 0 5173 1435 net/core/filter.o
5224 0 0 5224 1468 net/core/filter_pre.o
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e341af835fdf553820a1fa98341b93ab32ce466
Author: Rabin Vincent <rabin@xxxxxx>
Date: Sat Nov 6 23:03:53 2010 +0530
ARM: ftrace: enable function graph tracer
Add the options to enable the function graph tracer on ARM. Function
graph tracer support requires frame pointers, so exclude Thumb-2 and
also make sure FRAME_POINTER gets enabled when FUNCTION_GRAPH_TRACER is
used, since FUNCTION_TRACER doesn't "select FRAME_POINTER" when
ARM_UNWIND is used. Therefore, with GCC 4.4.0+, you get plain function
tracing without frame pointers, but you'll need them if you want
function graph tracing.
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
commit dd686eb13959e49a1112fd608c124ab711050582
Author: Rabin Vincent <rabin@xxxxxx>
Date: Sat Nov 6 23:03:21 2010 +0530
ARM: ftrace: graph tracer + dynamic ftrace
Support the graph tracer + dynamic ftrace combination on ARM.
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
commit 376cfa8730c08c0394d0aa1d4a80fd8c9971f323
Author: Tim Bird <tim.bird@xxxxxxxxxxx>
Date: Sat Oct 9 22:24:38 2010 +0530
ARM: ftrace: function graph tracer support
Cc: Tim Bird <tim.bird@xxxxxxxxxxx>
[rabin@xxxxxx: rebase on top of latest code,
keep code in ftrace.c instead of separate file,
check for ftrace_graph_entry also]
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
commit d3b9dc9dd2b994f396741f7086ffe7a48bacb165
Author: Rabin Vincent <rabin@xxxxxx>
Date: Thu Oct 7 17:39:47 2010 +0530
ARM: ftrace: use gas macros to avoid code duplication
Use assembler macros to avoid copy/pasting code between the
implementations of the two variants of the mcount call.
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
commit 61b5cb1c3bff8875d2fd289c7b6ac344f95261fa
Author: Rabin Vincent <rabin@xxxxxx>
Date: Thu Oct 7 20:51:58 2010 +0530
ARM: place C irq handlers in IRQ_ENTRY for ftrace
When FUNCTION_GRAPH_TRACER is enabled, place do_IRQ() and friends in the
IRQ_ENTRY section so that the irq-related features of the function graph
tracer work.
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
commit ec763f0de879fa1a64b7641098271107f5e32c67
Author: Rabin Vincent <rabin@xxxxxx>
Date: Fri Nov 19 21:11:02 2010 +0530
ARM: versatile: ensure sched_clock() is notrace
Include sched.h to ensure sched_clock() has the notrace
annotation.
Signed-off-by: Rabin Vincent <rabin@xxxxxx>
commit 042957801626465492b9428860de39a3cb2a8219
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Fri Nov 12 22:32:11 2010 -0500
tracing/events: Show real number in array fields
Currently we have in something like the sched_switch event:
field:char prev_comm[TASK_COMM_LEN]; offset:12; size:16; signed:1;
When a userspace tool such as perf tries to parse this, the
TASK_COMM_LEN is meaningless. This is done because the TRACE_EVENT() macro
simply uses a #len to show the string of the length. When the length is
an enum, we get a string that means nothing for tools.
By adding a static buffer and a mutex to protect it, we can store the
string into that buffer with snprintf and show the actual number.
Now we get:
field:char prev_comm[16]; offset:12; size:16; signed:1;
Something much more useful.
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit fe040be2fdc49a4132c5f64359c629aeeb8e4947
Merge: 2006920a18cc9f499e5cccf9e6f1aa9f6120705e 6722a4016d7f5f107a82ad71a3ee1ccec105532f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Nov 19 17:04:25 2010 +0900
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
commit 6722a4016d7f5f107a82ad71a3ee1ccec105532f
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Nov 17 06:44:54 2010 +0000
fbdev: sh_mipi_dsi: Allow LCDC board callbacks
Update the MIPI-DSI driver to make use of the
LCD panel callbacks in the LCDC platform data.
Without this patch MIPI panels cannot use board
specific LCDC callbacks to control power and/or
back light.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit deaba190188f1caa2317de4df6c9aaba501f9809
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Nov 17 09:53:25 2010 +0000
fbdev: sh_mipi_dsi: Require two I/O resources V2
This is V2 of the MIPI-DSI two resources patch.
The second I/O resource specifies the base address
for the link hardware block. The base address for
the link hardware block seems to vary with SoC
type. Using two I/O resources to describe the
MIPI-DSI hardware allows us to support both newer
and older SoCs.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5958d58a0e7699c791b9f4c99d76559a14770138
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Nov 17 06:44:35 2010 +0000
ARM: mach-shmobile: Extend AP4EVB MIPI-DSI resources
Update the AP4EVB board code to go from a single I/O
resource to two I/O resources for the MIPI-DSI driver.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 71b146c815ed6034bc20a0ec265445bdf4bad78c
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Nov 17 06:44:25 2010 +0000
fbdev: sh_mipi_dsi: Make use of register names
Keep MIPI-DSI registers in one place instead of
using magic values together with comments.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2006920a18cc9f499e5cccf9e6f1aa9f6120705e
Author: Arnd Hannemann <arnd@xxxxxxxxxx>
Date: Thu Nov 18 09:45:42 2010 +0000
fbdev: modedb: fix CEA modes
Some of the modes were missing the correct sync polarities.
This was causing a corrupt or left shifted picture on my TV.
Additionally format #35 had a wrong refresh rate and pixel clock.
This patch fixes those issues.
Signed-off-by: Arnd Hannemann <arnd@xxxxxxxxxx>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3256c789882281b2eac5978c7d38f6f0bbd16ed6
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Fri Nov 19 16:49:38 2010 +0900
ARM: mach-shmobile: ag5evm: use gpio.
Ag5evm board now uses gpio api to initialize pins and peripherals.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1cdf370244d5f0a4cf5ed672967cc2e16235908d
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date: Fri Nov 19 16:47:16 2010 +0900
ARM: mach-shmobile: Add sh73a0 pinmux support
PFC definitions for sh73a0 to support GPIO and pinmux handling.
Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 226291aa4641fa13cb5dec3bcb3379faa83009e2
Author: dann frazier <dann.frazier@xxxxxxxxxxxxx>
Date: Thu Nov 18 15:03:09 2010 -0700
ocfs2_connection_find() returns pointer to bad structure
If ocfs2_live_connection_list is empty, ocfs2_connection_find() will return
a pointer to the LIST_HEAD, cast as a ocfs2_live_connection. This can cause
an oops when ocfs2_control_send_down() dereferences c->oc_conn:
Call Trace:
[<ffffffffa00c2a3c>] ocfs2_control_message+0x28c/0x2b0 [ocfs2_stack_user]
[<ffffffffa00c2a95>] ocfs2_control_write+0x35/0xb0 [ocfs2_stack_user]
[<ffffffff81143a88>] vfs_write+0xb8/0x1a0
[<ffffffff8155cc13>] ? do_page_fault+0x153/0x3b0
[<ffffffff811442f1>] sys_write+0x51/0x80
[<ffffffff810121b2>] system_call_fastpath+0x16/0x1b
Fix by explicitly returning NULL if no match is found.
Signed-off-by: dann frazier <dann.frazier@xxxxxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 45677454dd6d128608117abe7dcd2bdfdd7cdf72
Author: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Date: Thu Oct 28 00:24:34 2010 +0800
ftrace: Speed up recordmcount
cmd_record_mcount is used to locate the _mcount symbols in the object
files, only the files compiled with -pg has the _mcount symbol, so, it
is only needed for such files, but the current cmd_record_mcount is used
for all of the object files, so, we need to fix it and speed it up.
Since -pg may be removed by the method used in kernel/trace/Makefile:
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
Or may be removed by the method used in arch/x86/kernel/Makefile:
CFLAGS_REMOVE_file.o = -pg
So, we must check the last variable stores the compiling flags, that is
c_flags(Please refer to cmd_cc_o_c and rule_cc_o_c defined in
scripts/Makefile.build) and since the CFLAGS_REMOVE_file.o is already
filtered in _c_flags(Please refer to scripts/Makefile.lib) and _c_flags
has less symbols, therefore, we only need to check _c_flags.
---------------
Changes from v1:
o Don't touch Makefile for CONFIG_FTRACE_MCOUNT_RECORD is enough
o Use _c_flags intead of KBUILD_CFLAGS to cover CONFIG_REMOVE_file.o = -pg
(feedback from Steven Rostedt <rostedt@xxxxxxxxxxx>)
Acked-by: Michal Marek <mmarek@xxxxxxx>
Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
LKML-Reference: <3dc8cddf022eb7024f9f2cf857529a15bee8999a.1288196498.git.wuzhangjin@xxxxxxxxx>
[ changed if [ .. == .. ] to if [ .. = .. ] to handle dash environments ]
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
commit a2a2f55291918f6cf9287d7beaecc7bc007a9f1c
Author: Milton Miller <miltonm@xxxxxxx>
Date: Wed Nov 17 22:20:11 2010 -0600
ocfs2: char is not always signed
Commit 1c66b360fe262 (Change some lock status member in ocfs2_lock_res
to char.) states that these fields need to be signed due to comparision
to -1, but only changed the type from unsigned char to char. However, it
is a compiler option if char is a signed or unsigned type. Change these
fields to signed char so the code will work with all compilers.
Signed-off-by: Milton Miller <miltonm@xxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 1989a80a60d2f620bad99196d6c1801c2afd7c71
Author: Tristan Ye <tristan.ye@xxxxxxxxxx>
Date: Mon Nov 15 21:39:09 2010 +0800
Ocfs2: Stop tracking a negative dentry after dentry_iput().
I suddenly hit the problem during 2.6.37-rc1 regression test, which was
introduced by commit '5e98d492406818e6a94c0ba54c61f59d40cefa4a'(Track
negative entries v3), following scenario reproduces the issue easily:
Node A Node B
================ ============
$touch testfile
$ls testfile
$rm -rf testfile
$touch testfile
$ls testfile
ls: cannot access testfile: No such file or directory
This patch stops tracking the dentry which was negativated by a inode deletion,
so as to force the revaliation in next lookup, in case we'll touch the inode
again in the same node.
It didn't hurt the performance of multiple lookup for none-existed files anyway,
while regresses a bit in the first try after a file deletion.
Signed-off-by: Tristan Ye <tristan.ye@xxxxxxxxxx>
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 1cf257f511918ba5b2eabd64d9acd40f1d7866ef
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Sat Nov 6 10:06:52 2010 +0100
ocfs2: fix memory leak
Stanse found that o2hb_heartbeat_group_make_item leaks some memory on
fail paths. Fix the paths by adding a new label and jump there.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <joel.becker@xxxxxxxxxx>
Cc: ocfs2-devel@xxxxxxxxxxxxxx
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: linux-fsdevel@xxxxxxxxxxxxxxx
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit a48a982a6bd3896274dd643397c72da9258411e2
Author: David Sterba <dsterba@xxxxxxx>
Date: Tue Nov 2 23:36:02 2010 +0100
fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
coccinelle check scripts/coccinelle/locks/call_kern.cocci found that
in fs/ocfs2/dlm/dlmdomain.c an allocation with GFP_KERNEL is done
with locks held:
dlm_query_region_handler
spin_lock(dlm_domain_lock)
dlm_match_regions
kmalloc(GFP_KERNEL)
Change it to GFP_ATOMIC.
Signed-off-by: David Sterba <dsterba@xxxxxxx>
CC: Joel Becker <joel.becker@xxxxxxxxxx>
CC: Mark Fasheh <mfasheh@xxxxxxxx>
CC: ocfs2-devel@xxxxxxxxxxxxxx
--
Exists in v2.6.37-rc1 and current linux-next.
Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>
commit 5ca9afdb9f6a5267927b54de3f42c756e8af7fcd
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Thu Nov 18 21:16:45 2010 +0300
x86, mrst: Check platform_device_register() return code
platform_device_register() may fail, if so propagate the return
code from mrst_device_create().
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
LKML-Reference: <1290104207-31279-1-git-send-email-segoon@xxxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit 0a80410dc53cf68e56456bef1ca66949b87412f9
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 14:06:25 2010 +0000
can: EG20T PCH: use BIT(X)
Replace bit assignment value to BIT(X).
For easy to readable/identifiable, replace all bit assigned macros to BIT(X)
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 086b5650dcdaae7c4aa60a5d0724f775e733610e
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 01:13:16 2010 +0000
can: EG20T PCH: add prefix to macro
For easy to readable/identifiable, add prefix "PCH_" to all of #define macros.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Acked-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 30dfe2c05037fbc021121c037872c09956938c2f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Nov 18 11:49:25 2010 -0800
atm: fore200e: Fix build warning.
GCC (rightfully) complains that:
drivers/atm/fore200e.c:614:5: warning: operation on 'cmdq->head' may be undefined
This is due to the FORE200E_NEXT_ENTRY macro, which essentially
evaluates to:
i = ++i % m
Make it what's explicitly intended here which is:
i = (i + 1) % m
and the warning goes away.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a3a972a053010bfd61c13cfa4ce688d4eebd9a19
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: line6: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Markus Grabner <grabner@xxxxxxxxxxxxx>
Cc: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a3d13107012ea614184d3c58bb7b579905d5da11
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: zram: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 926c11151e3b82e4facbf2bd2bea15f0ca0ac6f9
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: udlfb: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Bernie Thompson <bernie@xxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4d7bc388b44e42a1feafa35e50eef4f24d6ca59d
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c9e51d9e4bee3da47623622884f4828e079a0581
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Barry Song <Barry.Song@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2a767fda5d0d8dcff465724dfad6ee131489b3f2
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: frontier: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: David Taht <d@xxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 515b4987ccd097cdf5416530b05fdf9e01afe95a
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Jakub Schmidtke <sjakub@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a76a574ca9ce7c05791cee42f000f2a42c687837
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Wed Nov 17 19:52:13 2010 +0100
ssb: drop BCM4328 hack for SPROM revision
This hacks leads to incorrect SPROM parsing for me and reading for example MAC
as: 00:00:00:54:00:00. Michael G. who introduced this confirmed it is not
needed anymore.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Tested-by: Michael Gerdau <mgd@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aaa13ca2428789b3c8096b5edc175d4d78b5f504
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Nov 17 04:19:47 2010 +0100
ath9k_hw: support reading calibration data from flash on AR9003
Embedded boards do not have compressed EEPROM data, they use the
struct ar9003_eeprom layout, with little endian fields, so copying
the raw data to the eeprom buffer is enough.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a05b5d45049d60a06a1b12976150572304a51928
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Nov 17 04:25:33 2010 +0100
ath9k: add support for reading eeprom from platform data on PCI devices
Some embedded boards store platform data for connected PCIe AR92xx
chips in the system flash instead of a separate EEPROM chip.
Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 458fafdd579dcb58c8288c55c9cd92d6816ba094
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Tue Nov 16 16:49:08 2010 -0500
rndis_wlan: avoid uninitialized var warning in rndis_wlan_craft_connected_bss
CC [M] drivers/net/wireless/rndis_wlan.o
drivers/net/wireless/rndis_wlan.c: In function â??rndis_wlan_craft_connected_bssâ??:
drivers/net/wireless/rndis_wlan.c:2542:2: warning: â??retâ?? may be used uninitialized in this function
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Acked-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
commit 8befba6f2262a6e31d6e3bcf7d07ff46da444ec0
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Tue Nov 16 16:08:56 2010 -0500
iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids
CC [M] drivers/net/wireless/iwmc3200wifi/commands.o
drivers/net/wireless/iwmc3200wifi/commands.c: In function â??iwm_scan_ssidsâ??:
drivers/net/wireless/iwmc3200wifi/commands.c:911:15: warning: operation on â??iwm->scan_idâ?? may be undefined
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 86107fd170bc379869250eb7e1bd393a3a70e8ae
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Nov 16 10:58:48 2010 +0900
nl80211/mac80211: Report signal average
Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.
This uses the recently added generic EWMA library function.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit eef39befaae2a1559efe197d795c376a317af2af
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Nov 16 10:58:43 2010 +0900
ath5k: Use generic EWMA library
Remove ath5k's private moving average implementation in favour of the generic
library version.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c5485a7e7569ab32eea240c850198519e2a765ef
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Nov 16 10:58:37 2010 +0900
lib: Add generic exponentially weighted moving average (EWMA) function
This adds generic functions for calculating Exponentially Weighted Moving
Averages (EWMA). This implementation makes use of a structure which keeps the
EWMA parameters and a scaled up internal representation to reduce rounding
errors.
The original idea for this implementation came from the rt2x00 driver
(rt2x00link.c). I would like to use it in several places in the mac80211 and
ath5k code and I hope it can be useful in many other places in the kernel code.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ae51ce9061b1ddc0fde363913c932bee5b9bc5fd
Merge: 072b198a4ad48bd722ec6d203d65422a4698eae7 423478cde453eebdfcfebf4b8d378d8f5d49b853
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Nov 18 20:07:12 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
commit 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 16 20:36:42 2010 +0000
igmp: refine skb allocations
IGMP allocates MTU sized skbs. This may fail for large MTU (order-2
allocations), so add a fallback to try lower sizes.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4c3710afbc333c33100739dec10662b4ee64e219
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Tue Nov 16 20:28:24 2010 +0000
net: move definitions of BPF_S_* to net/core/filter.c
BPF_S_* are used internally, should not be exposed to the others.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Hagen Paul Pfeifer <hagen@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cba328fc5ede9091616e7296483840869b615a46
Author: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 16 15:19:51 2010 +0000
filter: Optimize instruction revalidation code.
Since repeating u16 value to u8 value conversion using switch() clause's
case statement is wasteful, this patch introduces u16 to u8 mapping table
and removes most of case statements. As a result, the size of net/core/filter.o
is reduced by about 29% on x86.
Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9e50e3ac5a5bbb1fd2949bdd57444ad1b93e5f41
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 16 19:12:28 2010 +0000
net: add priority field to pktgen
Add option to set skb priority to pktgen. Useful for testing
QOS features. Also by running pktgen on the vlan device the
qdisc on the real device can be tested.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f72f2f4cdeb67bc262d80a6d474292f00182a4dc
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Thu Nov 18 09:37:07 2010 -0800
dccp ccid-2: whitespace fix-up
This fixes whitespace noise introduced in commit "dccp ccid-2: Algorithm to
update buffer state", 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a, 14 Nov 2010.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 18 09:33:19 2010 -0800
bonding: IGMP handling cleanup
Instead of iterating in_dev->mc_list from bonding driver, its better
to call a helper function provided by igmp.c
Details of implementation (locking) are private to igmp code.
ip_mc_rejoin_group(struct ip_mc_list *im) becomes
ip_mc_rejoin_groups(struct in_device *in_dev);
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit edd2126aa8aab8a87db7cc480d5047e9280d7acf
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Thu Nov 18 16:28:43 2010 +0100
HID: wacom: make sysfs permissions more strict
It's not really dangerous in this driver, but it's against general
practice and worth fixing.
Wacom uses the attribute for changing the reporting speed of the
tablet (and this actually requires poking the device in the
background) (still I wouldn't consider it a security issue though).
udev is a proper place to handle this.
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit c311598b29f09c5092747a2603700f96a7daec2a
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Thu Nov 18 16:27:07 2010 +0100
HID: prodikeys: make sysfs permissions more strict
It's not really dangerous in this driver, but it's against general
practice and worth fixing.
Proper place for handling this correctly is udev.
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit f658bcfb2607bf0808966a69cf74135ce98e5c2d
Author: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
Date: Fri Oct 29 17:14:32 2010 +0200
x86, cacheinfo: Cleanup L3 cache index disable support
Adaptions to the changes of the AMD northbridge caching code: instead
of a bool in each l3 struct, use a flag in amd_northbridges.flags to
indicate L3 cache index disable support; use a pointer to the whole
northbridge instead of the misc device in the l3 struct; simplify the
initialisation; dynamically generate sysfs attribute array.
Signed-off-by: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 9653a5c76c8677b05b45b3b999d3b39988d2a064
Author: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
Date: Fri Oct 29 17:14:31 2010 +0200
x86, amd-nb: Cleanup AMD northbridge caching code
Support more than just the "Misc Control" part of the northbridges.
Support more flags by turning "gart_supported" into a single bit flag
that is stored in a flags member. Clean up related code by using a set
of functions (amd_nb_num(), amd_nb_has_feature() and node_to_amd_nb())
instead of accessing the NB data structures directly. Reorder the
initialization code and put the GART flush words caching in a separate
function.
Signed-off-by: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit eec1d4fa00c6552ae2fdf71d59f1eded7c88dd89
Author: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
Date: Fri Oct 29 17:14:30 2010 +0200
x86, amd-nb: Complete the rename of AMD NB and related code
Not only the naming of the files was confusing, it was even more so for
the function and variable names.
Renamed the K8 NB and NUMA stuff that is also used on other AMD
platforms. This also renames the CONFIG_K8_NUMA option to
CONFIG_AMD_NUMA and the related file k8topology_64.c to
amdtopology_64.c. No functional changes intended.
Signed-off-by: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 423478cde453eebdfcfebf4b8d378d8f5d49b853
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Nov 18 02:21:26 2010 +0100
tracing: Remove useless syscall ftrace_event_call declaration
It is defined right after, which makes the declaration completely
useless.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
commit 53cf810b1934f08a68e131aeeb16267a778f43df
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Nov 18 02:11:42 2010 +0100
tracing: Allow syscall trace events for non privileged users
As for the raw syscalls events, individual syscall events won't
leak system wide information on task bound tracing. Allow non
privileged users to use them in such workflow.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
commit fe5542030dce3b951f9eaf3ecb9a7bc5fa7bfed1
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Nov 18 01:52:06 2010 +0100
tracing: Allow raw syscall trace events for non privileged users
This allows non privileged users to use the raw syscall trace events
for task bound tracing in perf.
It is safe because raw syscall trace events don't leak system wide
informations.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
commit 1ed0c5971159974185653170543a764cc061c857
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Nov 18 01:46:57 2010 +0100
tracing: New macro to set up initial event flags value
This introduces the new TRACE_EVENT_FLAGS() macro in order
to set up initial event flags value.
This macro must simply follow the definition of a trace event
and take the event name and the flag value as parameters:
TRACE_EVENT(my_event, .....
....
);
TRACE_EVENT_FLAGS(my_event, 1)
This will set up 1 as the initial my_event->flags value.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
commit 61c32659b12c44e62de32fbf99f7e4ca783dc38b
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Thu Nov 18 01:39:17 2010 +0100
tracing: New flag to allow non privileged users to use a trace event
This adds a new trace event internal flag that allows them to be
used in perf by non privileged users in case of task bound tracing.
This is desired for syscalls tracepoint because they don't leak
global system informations, like some other tracepoints.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
commit 9c0729dc8062bed96189bd14ac6d4920f3958743
Author: Soeren Sandmann Pedersen <sandmann@xxxxxxxxxx>
Date: Fri Nov 5 05:59:39 2010 -0400
x86: Eliminate bp argument from the stack tracing routines
The various stack tracing routines take a 'bp' argument in which the
caller is supposed to provide the base pointer to use, or 0 if doesn't
have one. Since bp is garbage whenever CONFIG_FRAME_POINTER is not
defined, this means all callers in principle should either always pass
0, or be conditional on CONFIG_FRAME_POINTER.
However, there are only really three use cases for stack tracing:
(a) Trace the current task, including IRQ stack if any
(b) Trace the current task, but skip IRQ stack
(c) Trace some other task
In all cases, if CONFIG_FRAME_POINTER is not defined, bp should just
be 0. If it _is_ defined, then
- in case (a) bp should be gotten directly from the CPU's register, so
the caller should pass NULL for regs,
- in case (b) the caller should should pass the IRQ registers to
dump_trace(),
- in case (c) bp should be gotten from the top of the task's stack, so
the caller should pass NULL for regs.
Hence, the bp argument is not necessary because the combination of
task and regs is sufficient to determine an appropriate value for bp.
This patch introduces a new inline function stack_frame(task, regs)
that computes the desired bp. This function is then called from the
two versions of dump_stack().
Signed-off-by: Soren Sandmann <ssp@xxxxxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>,
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>,
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>,
LKML-Reference: <m3oc9rop28.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
commit 23ce17adb7fc33a4353abe4b57a03f555cced57b
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Tue Oct 12 11:58:02 2010 +0530
spi: davinci: kconfig: add manufacturer name to prompt string
Add manufacturer name to the Kconfig prompt string and move
the controller name to the begining of the prompt.
This helps locate the driver easily among the list of existing
drivers.
While at it, also add information about being able to build
the driver as module.
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 212d4b69652171d4474bc9dfc08e829737264632
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Mon Oct 11 10:41:39 2010 +0530
spi: davinci: shorten variable names
Shorten names of local variables and structure members where
possible.
Local variables:
* 'davinci_spi' is being renamed 'dspi'
* 'davinci_spi_dma' is being renamed 'dma'
Structure members:
* 'dma_{tx|rx}_channel' is being renamed '{tx|rx}_channel'
since the structure containing them is already called
'davinci_spi_dma'
* 'davinci_spi_dma' in 'davinci_spi' structure is being
renamed 'dma'
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 0e0eae4d1cdff5fa6608bcc6f6990774dec2527d
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Fri Oct 8 14:04:22 2010 +0530
spi: davinci: remove unnecessary private data member 'region_size'
Remove unnecesary private data member 'region_size'
being used to store the size of SPI memory region.
Instead, get the memory resource size directly from
the platform data.
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 43abb11ba540e21346c6e7ab3211b48928501ea6
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Oct 6 18:34:47 2010 +0530
spi: davinci: add EF Johnson Technologies copyright
Add copyright for EF Johnson Technologies since the driver
has been majorly overhauled by Brian.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 035540f6ea2394bdd9675552d31e1125cd0e402e
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Oct 6 18:32:40 2010 +0530
spi: davinci: add additional comments
Add comments describing the platform data members
and per-chip-select SPI configuration structure.
Also, add some comments describing the what happens
during the driver probe.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit d8c174cdeb6511aa307e6058468b68a9cc3990e4
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Oct 6 18:47:16 2010 +0530
spi: davinci: setup the driver owner
Setup the owner member of the platform driver to THIS_MODULE
instead of leaving it NULL.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 3f27b57c1684efbe11fcc9449df898b1d0feb753
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Oct 6 18:25:43 2010 +0530
spi: davinci: enable and power-up SPI only when required
Enable SPI only when active transfers are in progress. Keep
it in local low power when not in use.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 3409e408ab0d7171ae81d198110a1f293852959f
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Oct 6 18:13:31 2010 +0530
spi: davinci: remove non-useful "clk_internal" platform data
The "clk_internal" platform data member which contols the
CLKMOD bit in Global Control Register 1 is not useful
since CLKMOD needs be set to 1 *always* to ensure master
mode operation.
Remove this platform data.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 87467bd9052725283b9a9f4b1b310fed8744fb1e
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Oct 6 17:03:10 2010 +0530
spi: davinci: let DMA operation be specified on per-device basis
Let DMA operation be specified on a per-device basis instead
of selecting it once during probe.
A side effect of this is the need to combine the PIO and DMA buffer
txrx_bufs routine. This is good since they anyway share some common
functionality.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 6dbd29b27bd2627ba0025a6cff14381e69512cdf
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Tue Oct 5 15:43:08 2010 +0530
spi: davinci: remove usage of additional completion variables for DMA
The DMA code does not use the existing completion variable 'done'
which is being used for interrupt mode transfers. Instead it uses
two different completion variables specific to DMA mode transfers.
Eliminate the usage of new completion variables for DMA mode and
use the existing completion variable.
[nsekhar@xxxxxx: To make this process easy, eliminate the two
different DMA completion callback functions for tx and rx and
use a single callback function instead]
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 9b189fd7584a1d8c68334dd1bc47b363877b314e
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Tue Oct 5 11:38:41 2010 +0530
spi: davinci: handle DMA completion errors correctly
Do not simply clean the DMA channel on a DMA completion
error. Instead, use wcount and rcount members of davinci_spi
to detecion non-completion of DMA and signal EIO to the
application.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 523c37e7006522e778a1fd0aea2746ceb788572f
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Mon Oct 4 17:35:34 2010 +0530
spi: davinci: fix EDMA CC errors at end of transfers
Use a dummy param slot linked to itself to take care of the
extra "sync event" that gets sent to EDMA controller after
the last byte has been transferred.
The dummy PaRAM slot that is linked to the actual DMA PaRAM
slot "absorbs" this event and prevents a EDMA CC error to
be asserted.
Without this provision, the EDMA CC error would be asserted
because the channel PaRAM would be empty after the transfer
and EDMA would not know what to make out of the extra sync
event.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 903ca25b219e28e3513ca4c2ff379fcdf19e057e
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Fri Oct 1 14:51:40 2010 +0530
spi: davinci: do not allocate DMA channels during SPI device setup
Do not allocate (and de-allocate) SPI DMA channels during setup
(and cleanup) for each SPI device. Instead, allocate the DMA
channels once duing probe and use them for the life time of
the driver.
This makes sense since there are dedicated DMA channels meant
for SPI use.
This also helps remove the unnecessary DMA "sync_dev" variables
being used to store DMA channel information.
Also, the "use_dma" platform variable is now eliminated since
it is possible to check if the platform supports DMA or not
based upon whether DMA resources can be found or not.
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit a4f4497b86a689aa8c827d4ebe0d00c4eba66f76
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Oct 1 14:00:48 2010 +0530
spi: davinci: fix DMA event generation stoppage
Do not stop SPI DMA event generation in either transmit or
receive DMA event call back because the single setting affects
both transmit and receive event generation.
Depending on the order in which the callbacks happen, transmit
or receive events can get unintentionally stalled.
Instead, disable event generation once after both the transmit
and receive DMA completes.
While at it, remove the largely under-used function to set or
clear DMA event generation.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 49fc3f497d7d409e9b0dc384fe7c173bccd3b1a1
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Oct 1 11:22:23 2010 +0530
spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot
Currently a series of EDMA API calls are being made to setup
various aspects of EDMA PaRAM slots for receive and transmit.
Instead setup the PaRAM using a local structure and write once
to the hardware using edma_write_slot()
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit e91c659bbcf2f47519260182a75f64ede34df3ca
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Oct 1 10:29:29 2010 +0530
spi: davinci: always start receive DMA
In keeping with the full duplex nature of the SPI bus. Always
start receive DMA along with transmit DMA.
If there is no receive buffer provided with the transfer, use
a temporary buffer to receive the data to be thrown away.
[michael.williamson@xxxxxxxxxxxxxxxx: receive DMA size should
be same as transfer length to avoid hang-up when transfer length
is smaller than temporary rx buffer size (rx buffer not provided)]
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit d3f7141cbf4580b2f18f93940df29cf0c15e7ef5
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Wed Sep 29 12:31:54 2010 +0530
spi: davinci: do not use temporary buffer if no transmit data provided
Remove usage of temporary buffer when no transmit data is provided.
Instead, use the transmit register itself as the source of data.
By choosing the transmit register itself as the source of data, this
patch helps remove unnecessary accesses to memory when no real data
is being transmitted.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit c29e3c60e75d1cc1262ac8af379738b6fd851f33
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Tue Sep 28 13:59:26 2010 +0530
spi: davinci: always start transmit DMA
Due to the full duplex nature of the SPI bus, the SPI master
on DaVinci needs transmit to be active even if the tranfer is
only meant to collect receive data.
The current code achieves this by using a temporary zeroed buffer
to provide DMA data in case the transfer does not have a transmit
buffer provided.
However, the transmit DMA is started only if transmit buffer is
provided rendering the temporary buffer unused. Instead the code
relies on a write to SPIDAT1 register to trigger transmit operation.
This however only sends two bytes of data.
Fix this by starting transmit DMA always.
This changes exposes a bug on DM355 where the CSHOLD bit in
SPIDAT1 needs to be written to in between transfers. Handle
that by introducing a "cshold_bug" platform data which is
set to true for DM355.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 96fd881f22b44fc14772316a6b9231012393cda8
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Mon Sep 27 22:23:23 2010 +0530
spi: davinci: do not store DMA channel information per chip select
Do not store DMA channel related information per chip-select since
that information does not depend on the chip select.
The same DMA channels can be used for transfers on all chip-selects
since the transfer happens one-at-a-time.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit b23a5d4691043e97bbfde8c2fb5b8fecdc400308
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Sep 24 18:53:32 2010 +0530
spi: davinci: remove unnecessary call to davinci_spi_setup_transfer()
Remove unnecessary call to davinci_spi_setup_transfer() at the end
of davinci_spi_setup().
davinci_spi_setup_transfer() is registered as the setup_transfer
callback for the bitbang layer and is called independently by
the bitbang layer to setup the transfer before it begins.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit be88471b96cf3a0d7aea72d5ca9c6a95fb54bade
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Sep 3 12:15:28 2010 +0530
spi: davinci: remove unnecessary function davinci_spi_bufs_prep()
The function davinci_spi_bufs_prep() is doing stuff that
davinci_spi_setup() is doing. Eliminate it and move the work
to davinci_spi_setup()
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit f34bd4cc68fb4548536cac56798d3fad41806724
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Sep 3 11:56:35 2010 +0530
spi: davinci: configure the invariable bits in spipc0 only once
Configure the data-in, data-out and clock functionality pins
in SPIPC0 register only once during probe. No need to set these
bits for each transfer.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit e0d205e9914476e96596c5339fa440fb314ef03b
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Sep 2 16:52:06 2010 +0530
spi: davinci: add support for interrupt mode
Add support for SPI interrupt mode operation.
Define a per chip-select "io type" variable which
specifies if the transfers on this chip-select should
happen in interrupt mode or polled mode.
Introduce a new function davinci_spi_process_events()
to help consolidate the code between interrupt mode
processing and polled mode processing.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 839c996ca8dd56f9ea80d7fc0c8b18b01394c82a
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Mon Aug 23 16:39:19 2010 +0530
spi: davinci: simplify poll mode transfers
Use the fact that the get_tx and get_rx can now cope with
NULL buffer pointers to simplify the poll mode transfer
code.
While at it, check for SPI errors every transfer rather than
at the end of the whole transfer.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit cf90fe73504764cbcc2552c7ea69b1866059db30
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Aug 20 17:02:49 2010 +0530
spi: davinci: remove non-useful interrupt mode support
The interrupt mode support as it stands is another version
of poll mode. Even when interrupt mode is selected, the code
tight loops on interrupt status register, rendering it totally
useless. A completion variable is initialized, but never used.
Remove this fake interrupt mode since users can anyway use
poll mode with no functional difference. A usefully implemented
interrupt mode support can be added later.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 47f44671c0dc92e2b77ff3dd843f742d12510477
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Mon Aug 23 16:34:13 2010 +0530
spi: davinci: remove unnecessary completion variable initialization
The completion variable 'done' is unnecessarly initialized by
the function davinci_spi_bufs_dma() where as it is not used
for DMA transfers at all.
Remove the unnecessary initialization.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 134e32b979f3f3987e84dcd5cc42040e21252e53
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Fri Aug 20 16:27:08 2010 +0530
spi: davinci: do not treat Tx interrupt being set as error
In davinci_spi_check_error(), Tx interrupt being set is
treated as error. This function is only meant to flag
bus error conditions and Tx interrupt being set at that
point is not a bus error but rather a driver bug.
Stop checking for Tx interrupt and flagging that as an
IO error.
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit f2bf4e849315c1573f996d082c53c6b686054da7
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Aug 20 15:28:23 2010 +0530
spi: davinci: remove unnecessary 'count' variable in driver private data
The variable count in DaVinci SPI driver's private data is
largely unused and its minor use can easily be eliminated.
Remove the variable.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit fab89ea330cabdaf29d82151de6d8f2369cc4da9
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Aug 20 14:53:47 2010 +0530
spi: davinci: remove unnecessary disable of SPI
In the davinci_spi_bufs_dma() function, SPI is briefly disabled
before enabling it immediately back again.
Remove this unnecessary disable.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 53d454a170e86594af1d27be820e678a582af751
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 17:04:25 2010 +0530
spi: davinci: check for NULL buffer pointer before using it
In the davinci_spi_{tx|rx}_u{8|16}() functions, check for
buffer pointer being valid before using it. While providing
for better error checking, this change will help simplify
code in the caller.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit b7ab24a0da96c8fc6d551ea87e82692299df6ac6
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 16:42:42 2010 +0530
spi: davinci: simplify calculation of edma acount value
The EDMA acount (called data_type in davinci_spi_bufs_dma())
is simply the bytes_per_word obtained in the transfer setup
function. The current code calculates the acount value from
bytes_per_word in a convoluted manner. Simplify the code.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 6321be60edac6037ea76e9beef375c6ae2961765
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 16:38:20 2010 +0530
spi: davinci: eliminate unnecessary update of davinci_spi->count
The count member of davinci_spi is internal to the driver and
is not shared with framework. Eliminate its unnecessary update.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit cda987ebb86dfc757320bfa5c7b2afcd9d3ed30f
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 16:16:28 2010 +0530
spi: davinci: eliminate the single member structure davinci_spi_slave
The struct davinci_spi_slave has a single member. Eliminate it
and store the per-chipselect data in struct davinci_spi directly.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit b6c4eeac5bc6a6bf769d7f170c507a1b78fd120a
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 15:41:41 2010 +0530
spi: davinci: remove unused members of davinci_spi_slave
Several members of struct davinci_spi_slave are unused in code.
Remove such members.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 7abbf23c5903e14b0cff1cdeab906eab164be767
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 15:07:38 2010 +0530
spi: davinci: add support for wait enable timeouts
Just enabling WAITENA in SPIFMTn register waits for the
enable signal from the slave indefinitely. Allow support
for finite waiting by adding support for c2e delay
(maximum time for addressed slave to respond) and t2e
delay (maximum time for slave to respond after transmit
data finished).
While at it, modify the T2C and C2T defines by prepending
the register name as is the convention followed for other
register field elsewhere in the driver.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit fd764463fe28ac53371565f851240e74775fb1aa
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 12:44:31 2010 +0530
spi: davinci: setup chip-select timers values only if timer enabled
Setup chip-select timers values only if timer is enabled
(timer_disbled in spi configuration is false).
As a nice side effect, this patch removes code duplicated in
davinci_spi_bufs_pio() and davinci_spi_bufs_dma().
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 25f33512f6ae7e37d7b3d353d57d4d6d066033ce
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 19 12:15:22 2010 +0530
spi: davinci: consolidate setup of SPIFMTn in one function
Consolidate the setup of SPIFMTn register under
davinci_spi_setup_transfer() simplifying the code
and avoiding unnecessary reads and writes to the
register.
The two inline functions {set|clear}_fmt_bits() can
be eliminated because of this.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 53a31b07c5aea4001bbb36ddd5ef2addffc7ccbd
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Mon Aug 16 15:05:51 2010 +0530
spi: davinci: make chip-slect specific parameters really chip-select specific
Some chip-select specific paramterers like wdelay, parity, usage of
chip-select timers (and the actual timer values) are included in
platform data forcing the same behaviour across all chip-selects.
Create a new davinci_spi_config data structure which can be passed
along using controller_data member of spi_device data structure
on a per-device basis.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 472880c73da124b6cb5cbc31a36754aa62935afe
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Mon Aug 16 10:28:53 2010 +0530
spi: davinci: remove 'wait_enable' platform data member
The SPI_READY bit of struct spi_device:mode serves the purpose
of letting the SPI master know if the slave can signal if it is
ready for transfer or not.
The 'wait_enable' platform data was duplicating this functionality.
Use the framework provided method of indicating this capability.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 7fe0092b1f55f58a749d68ace3a3597e8a2a9163
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Aug 13 13:27:23 2010 +0530
spi: davinci: simplify prescalar calculation
Simplify pre-scalar calculation and move it into a seprate
function.
Refuse to correct invalid pre-scalar values silently as this
might lead to unexpected bugs and lower performance. Instead
an error will force users to dig into the root-cause of the
issue.
While at it, remove some device specific checks on the maximum
SPI frequency. As the driver supports the SPI interface
implemented on various devices, it should only take care of core
SPI limitations and leave the device specific handling to platform
code.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 23853973d9b76eb8b3cf46157689bc6187e141d9
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Aug 13 10:57:44 2010 +0530
spi: davinci: enable GPIO lines to be used as chip selects
Sometimes, the chip selects provided by SPI module are
muxed with other functionality and cannot be used in
some designs. In such cases, it becomes convenient to use
an available GPIO line as chip select.
This patch enables the DaVinci SPI driver to treat specific
GPIO lines as chip selects based on information provided in
platform data.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit cfbc5d1d8fda9d337e912a03502cf77d29870a8e
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 12 12:27:33 2010 +0530
spi: davinci: remove unnecessary data transmit on CS disable
On TI DaVinci's SPI controller, the SPIDAT1 register which
controls the chip slect status, also has data transmit register
in the lower 16 bits. Writing to the whole 32-bits triggers
an additional data transmit every time the chip select is disabled.
While most SPI slaves cope-up with this, some cannot. This
patch fixes this by doing a 16-bit write on the upper half
of the SPIDAT1 register
While at it, group the SPIGCR1 register related defines seperately
from SPIDAT1 register defines.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 7978b8c385a86f0b5b9304e81a1dfb5dcaf21528
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Aug 13 10:11:03 2010 +0530
spi: davinci: enable both activation and deactivation of chip-selects
Let davinci_spi_chipselect() perform both activation and
deactivation of chip selects. This lets spi_bitbang fully
control chip select activation, as intended by the SPI API.
With this change, the chip select activation code need not
be duplicated in davinci_spi_bufs_{pio|dma}().
Also, keeping chip select active control is removed as a
platform data and simply controlled using information from
spi_bitbang on whether chip slect should be activated or
de-activated.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 843a713bc53d04f8fac46ddd8693a2cc0422ca5e
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Thu Aug 12 12:49:05 2010 +0530
spi: davinci: set chip-select mode in SPIDEF only once
Quit writing the same constant value determining the chip-select
mode when no transmissions are in progress in davinci_spi_chipelect().
Instead just setup the SPIDEF register once during probe.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 50356dd7c1f6338588af6a745649a718f16fe453
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Fri Oct 8 15:27:26 2010 +0530
spi: davinci: remove unnecessary typecast
The typecasting of SPI base address to davinci_spi_reg is
unused.
Remove it.
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 8e206f1cbd0d1387bf7d5e463ca880b43458e2ea
Author: Sekhar Nori <nsekhar@xxxxxx>
Date: Fri Aug 20 16:20:49 2010 +0530
spi: davinci: removed unused #defines
Remove unused defines from code which should help
in easy reading of code.
Also, use the opportuinity to keep the SPIGCR1
register defines together.
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Tested-By: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit c3c475c2353f6d13a5c77c3b6203c0240339da7d
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Sep 3 16:19:09 2010 +0530
spi: davinci: remove unused variable 'pdata'
The 'pdata' variable is unused in couple of routines.
Remove such occurences.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 778e261ed678c3654386fc38bc6c50353ce04cc7
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Sep 3 15:15:06 2010 +0530
spi: davinci: whitespace cleanup
Cleanup unnecessary white space from various
parts of the file.
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 3b740b10e9424f7ffb9baab1e6a3ff361cbf8ce3
Author: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Date: Fri Sep 3 14:50:07 2010 +0530
spi: davinci: fix checkpatch errors
Fix the following checkpatch error:
WARNING: unnecessary whitespace before a quoted newline
+ dev_info(&pdev->dev, "Controller at 0x%p \n", davinci_spi->base);
Signed-off-by: Brian Niebuhr <bniebuhr@xxxxxxxxxxxxx>
Tested-By: Michael Williamson <michael.williamson@xxxxxxxxxxxxxxxx>
Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
commit 84e1c6bb38eb318e456558b610396d9f1afaabf0
Author: matthieu castet <castet.matthieu@xxxxxxx>
Date: Tue Nov 16 22:35:16 2010 +0100
x86: Add RO/NX protection for loadable kernel modules
This patch is a logical extension of the protection provided by
CONFIG_DEBUG_RODATA to LKMs. The protection is provided by
splitting module_core and module_init into three logical parts
each and setting appropriate page access permissions for each
individual section:
1. Code: RO+X
2. RO data: RO+NX
3. RW data: RW+NX
In order to achieve proper protection, layout_sections() have
been modified to align each of the three parts mentioned above
onto page boundary. Next, the corresponding page access
permissions are set right before successful exit from
load_module(). Further, free_module() and sys_init_module have
been modified to set module_core and module_init as RW+NX right
before calling module_free().
By default, the original section layout and access flags are
preserved. When compiled with CONFIG_DEBUG_SET_MODULE_RONX=y,
the patch will page-align each group of sections to ensure that
each page contains only one type of content and will enforce
RO/NX for each group of pages.
-v1: Initial proof-of-concept patch.
-v2: The patch have been re-written to reduce the number of #ifdefs
and to make it architecture-agnostic. Code formatting has also
been corrected.
-v3: Opportunistic RO/NX protection is now unconditional. Section
page-alignment is enabled when CONFIG_DEBUG_RODATA=y.
-v4: Removed most macros and improved coding style.
-v5: Changed page-alignment and RO/NX section size calculation
-v6: Fixed comments. Restricted RO/NX enforcement to x86 only
-v7: Introduced CONFIG_DEBUG_SET_MODULE_RONX, added
calls to set_all_modules_text_rw() and set_all_modules_text_ro()
in ftrace
-v8: updated for compatibility with linux 2.6.33-rc5
-v9: coding style fixes
-v10: more coding style fixes
-v11: minor adjustments for -tip
-v12: minor adjustments for v2.6.35-rc2-tip
-v13: minor adjustments for v2.6.37-rc1-tip
Signed-off-by: Siarhei Liakh <sliakh.lkml@xxxxxxxxx>
Signed-off-by: Xuxian Jiang <jiang@xxxxxxxxxxx>
Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Reviewed-by: James Morris <jmorris@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Cc: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <4CE2F914.9070106@xxxxxxx>
[ minor cleanliness edits, -v14: build failure fix ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9437178f623a19af5951808d880a8599f66ac150
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:10 2010 -0800
sched: Update tg->shares after cpu.shares write
Formerly sched_group_set_shares would force a rebalance by overflowing domain
share sums. Now that per-cpu averages are maintained we can set the true value
by issuing an update_cfs_shares() following a tg->shares update.
Also initialize tg se->load to 0 for consistency since we'll now set correct
weights on enqueue.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx?>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234938.465521344@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d6b5591829bd348a5fbe1c428d28dea00621cdba
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:09 2010 -0800
sched: Allow update_cfs_load() to update global load
Refactor the global load updates from update_shares_cpu() so that
update_cfs_load() can update global load when it is more than ~10%
out of sync.
The new global_load parameter allows us to force an update, regardless of
the error factor so that we can synchronize w/ update_shares().
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234938.377473595@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3b3d190ec3683d568fd2ebaead5e1ec7f97b6e37
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:08 2010 -0800
sched: Implement demand based update_cfs_load()
When the system is busy, dilation of rq->next_balance makes lb->update_shares()
insufficiently frequent for threads which don't sleep (no dequeue/enqueue
updates). Adjust for this by making demand based updates based on the
accumulation of execution time sufficient to wrap our averaging window.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234938.291159744@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c66eaf619c0c7937e9ded160ae83b5a7a6b19b56
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:07 2010 -0800
sched: Update shares on idle_balance
Since shares updates are no longer expensive and effectively local, update them
at idle_balance(). This allows us to more quickly redistribute shares to
another cpu when our load becomes idle.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234938.204191702@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a7a4f8a752ec734b2eab904fc863d5dc873de338
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:06 2010 -0800
sched: Add sysctl_sched_shares_window
Introduce a new sysctl for the shares window and disambiguate it from
sched_time_avg.
A 10ms window appears to be a good compromise between accuracy and performance.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234938.112173964@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 67e86250f8ea7b8f7da53ac25ea73c6bd71f5cd9
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:05 2010 -0800
sched: Introduce hierarchal order on shares update list
Avoid duplicate shares update calls by ensuring children always appear before
parents in rq->leaf_cfs_rq_list.
This allows us to do a single in-order traversal for update_shares().
Since we always enqueue in bottom-up order this reduces to 2 cases:
1) Our parent is already in the list, e.g.
root
\
b
/\
c d* (root->b->c already enqueued)
Since d's parent is enqueued we push it to the head of the list, implicitly ahead of b.
2) Our parent does not appear in the list (or we have no parent)
In this case we enqueue to the tail of the list, if our parent is subsequently enqueued
(bottom-up) it will appear to our right by the same rule.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234938.022488865@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e33078baa4d30ad1d0e46d1f62b9e5a63a3e6ee3
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:04 2010 -0800
sched: Fix update_cfs_load() synchronization
Using cfs_rq->nr_running is not sufficient to synchronize update_cfs_load with
the put path since nr_running accounting occurs at deactivation.
It's also not safe to make the removal decision based on load_avg as this fails
with both high periods and low shares. Resolve this by clipping history after
4 periods without activity.
Note: the above will always occur from update_shares() since in the
last-task-sleep-case that task will still be cfs_rq->curr when update_cfs_load
is called.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234937.933428187@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f0d7442a5924a802b66eef79b3708f77297bfb35
Author: Paul Turner <pjt@xxxxxxxxxx>
Date: Mon Nov 15 15:47:03 2010 -0800
sched: Fix load corruption from update_cfs_shares()
As part of enqueue_entity both a new entity weight and its contribution to the
queuing cfs_rq / rq are updated. Since update_cfs_shares will only update the
queueing weights when the entity is on_rq (which in this case it is not yet),
there's a dependency loop here:
update_cfs_shares needs account_entity_enqueue to update cfs_rq->load.weight
account_entity_enqueue needs the updated weight for the queuing cfs_rq load[*]
Fix this and avoid spurious dequeue/enqueues by issuing update_cfs_shares as
if we had accounted the enqueue already.
This was also resulting in rq->load corruption previously.
[*]: this dependency also exists when using the group cfs_rq w/
update_cfs_shares as the weight of the enqueued entity changes
without the load being updated.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234937.844900206@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9e3081ca61147b29f52fddb4f7c6b6b82ea5eb7a
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Mon Nov 15 15:47:02 2010 -0800
sched: Make tg_shares_up() walk on-demand
Make tg_shares_up() use the active cgroup list, this means we cannot
do a strict bottom-up walk of the hierarchy, but assuming its a very
wide tree with a small number of active groups it should be a win.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234937.754159484@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 3d4b47b4b040c9d77dd68104cfc1055d89a55afd
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Mon Nov 15 15:47:01 2010 -0800
sched: Implement on-demand (active) cfs_rq list
Make certain load-balance actions scale per number of active cgroups
instead of the number of existing cgroups.
This makes wakeup/sleep paths more expensive, but is a win for systems
where the vast majority of existing cgroups are idle.
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234937.666535048@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2069dd75c7d0f49355939e5586daf5a9ab216db7
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Mon Nov 15 15:47:00 2010 -0800
sched: Rewrite tg_shares_up)
By tracking a per-cpu load-avg for each cfs_rq and folding it into a
global task_group load on each tick we can rework tg_shares_up to be
strictly per-cpu.
This should improve cpu-cgroup performance for smp systems
significantly.
[ Paul: changed to use queueing cfs_rq + bug fixes ]
Signed-off-by: Paul Turner <pjt@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <20101115234937.580480400@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 48c5ccae88dcd989d9de507e8510313c6cbd352b
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date: Sat Nov 13 19:32:29 2010 +0100
sched: Simplify cpu-hot-unplug task migration
While discussing the need for sched_idle_next(), Oleg remarked that
since try_to_wake_up() ensures sleeping tasks will end up running on a
sane cpu, we can do away with migrate_live_tasks().
If we then extend the existing hack of migrating current from
CPU_DYING to migrating the full rq worth of tasks from CPU_DYING, the
need for the sched_idle_next() abomination disappears as well, since
idle will be the only possible thread left after the migration thread
stops.
This greatly simplifies the hot-unplug task migration path, as can be
seen from the resulting code reduction (and about half the new lines
are comments).
Suggested-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <1289851597.2109.547.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 92fd4d4d67b945c0766416284d4ab236b31542c4
Merge: fe7de49f9d4e53f24ec9ef762a503f70b562341c e53beacd23d9cb47590da6a7a7f6d417b941a994
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Nov 18 13:22:14 2010 +0100
Merge commit 'v2.6.37-rc2' into sched/core
Merge reason: Move to a .37-rc base.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5bd5a452662bc37c54fb6828db1a3faf87e6511c
Author: Matthieu Castet <castet.matthieu@xxxxxxx>
Date: Tue Nov 16 22:31:26 2010 +0100
x86: Add NX protection for kernel data
This patch expands functionality of CONFIG_DEBUG_RODATA to set main
(static) kernel data area as NX.
The following steps are taken to achieve this:
1. Linker script is adjusted so .text always starts and ends on a page bound
2. Linker script is adjusted so .rodata always start and end on a page boundary
3. NX is set for all pages from _etext through _end in mark_rodata_ro.
4. free_init_pages() sets released memory NX in arch/x86/mm/init.c
5. bios rom is set to x when pcibios is used.
The results of patch application may be observed in the diff of kernel page
table dumps:
pcibios:
-- data_nx_pt_before.txt 2009-10-13 07:48:59.000000000 -0400
++ data_nx_pt_after.txt 2009-10-13 07:26:46.000000000 -0400
0x00000000-0xc0000000 3G pmd
---[ Kernel Mapping ]---
-0xc0000000-0xc0100000 1M RW GLB x pte
+0xc0000000-0xc00a0000 640K RW GLB NX pte
+0xc00a0000-0xc0100000 384K RW GLB x pte
-0xc0100000-0xc03d7000 2908K ro GLB x pte
+0xc0100000-0xc0318000 2144K ro GLB x pte
+0xc0318000-0xc03d7000 764K ro GLB NX pte
-0xc03d7000-0xc0600000 2212K RW GLB x pte
+0xc03d7000-0xc0600000 2212K RW GLB NX pte
0xc0600000-0xf7a00000 884M RW PSE GLB NX pmd
0xf7a00000-0xf7bfe000 2040K RW GLB NX pte
0xf7bfe000-0xf7c00000 8K pte
No pcibios:
-- data_nx_pt_before.txt 2009-10-13 07:48:59.000000000 -0400
++ data_nx_pt_after.txt 2009-10-13 07:26:46.000000000 -0400
0x00000000-0xc0000000 3G pmd
---[ Kernel Mapping ]---
-0xc0000000-0xc0100000 1M RW GLB x pte
+0xc0000000-0xc0100000 1M RW GLB NX pte
-0xc0100000-0xc03d7000 2908K ro GLB x pte
+0xc0100000-0xc0318000 2144K ro GLB x pte
+0xc0318000-0xc03d7000 764K ro GLB NX pte
-0xc03d7000-0xc0600000 2212K RW GLB x pte
+0xc03d7000-0xc0600000 2212K RW GLB NX pte
0xc0600000-0xf7a00000 884M RW PSE GLB NX pmd
0xf7a00000-0xf7bfe000 2040K RW GLB NX pte
0xf7bfe000-0xf7c00000 8K pte
The patch has been originally developed for Linux 2.6.34-rc2 x86 by
Siarhei Liakh <sliakh.lkml@xxxxxxxxx> and Xuxian Jiang <jiang@xxxxxxxxxxx>.
-v1: initial patch for 2.6.30
-v2: patch for 2.6.31-rc7
-v3: moved all code into arch/x86, adjusted credits
-v4: fixed ifdef, removed credits from CREDITS
-v5: fixed an address calculation bug in mark_nxdata_nx()
-v6: added acked-by and PT dump diff to commit log
-v7: minor adjustments for -tip
-v8: rework with the merge of "Set first MB as RW+NX"
Signed-off-by: Siarhei Liakh <sliakh.lkml@xxxxxxxxx>
Signed-off-by: Xuxian Jiang <jiang@xxxxxxxxxxx>
Signed-off-by: Matthieu CASTET <castet.matthieu@xxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Cc: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <4CE2F82E.60601@xxxxxxx>
[ minor cleanliness edits ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 64edc8ed5ffae999d8d413ba006850e9e34166cb
Author: matthieu castet <castet.matthieu@xxxxxxx>
Date: Tue Nov 16 22:30:27 2010 +0100
x86: Fix improper large page preservation
This patch fixes a bug in try_preserve_large_page() which may
result in improper large page preservation and improper
application of page attributes to the memory area outside of the
original change request.
More specifically, the problem manifests itself when set_memory_*()
is called for several pages at the beginning of the large page and
try_preserve_large_page() erroneously concludes that the change can
be applied to whole large page.
The fix consists of 3 parts:
1. Addition of "required" protection attributes in
static_protections(), so .data and .bss can be guaranteed to
stay "RW"
2. static_protections() is now called for every small
page within large page to determine compatibility of new
protection attributes (instead of just small pages within the
requested range).
3. Large page can be preserved only if attribute change is
large-page-aligned and covers whole large page.
-v1: Try_preserve_large_page() patch for Linux 2.6.34-rc2
-v2: Replaced pfn check with address check for kernel rw-data
Signed-off-by: Siarhei Liakh <sliakh.lkml@xxxxxxxxx>
Signed-off-by: Xuxian Jiang <jiang@xxxxxxxxxxx>
Reviewed-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Cc: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <4CE2F7F3.8030809@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit e9229faf920aba47dd1ba6940b3ca138024543d3
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sun Nov 7 09:46:28 2010 -0500
HID: usbhid: Clean up makefile (-y instead of -objs)
Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit d47d612459300510215fc54bf1283f81710745df
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Thu Nov 18 10:42:30 2010 +0100
HID: Clean up makefile (-y instead of -objs)
Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 82148d1d0b2f369851f2dff5088f7840f9f16abf
Author: Shérab <Sebastien.Hinderer@xxxxxxxxxxxx>
Date: Sat Sep 25 06:06:57 2010 +0200
x86/platform: Add Eurobraille/Iris power off support
The Iris machines from Eurobraille do not have APM or ACPI support
to shut themselves down properly. A special I/O sequence is
needed to do so. This modle runs this I/O sequence at
kernel shutdown when its force parameter is set to 1.
Signed-off-by: Shérab <Sebastien.Hinderer@xxxxxxxxxxxx>
Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
[ did minor coding style edits ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 79250af2d5953b69380a6319b493862bf4ece972
Author: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Date: Tue Nov 16 10:10:04 2010 -0800
x86: Fix included-by file reference comments
Adjust the paths for files that are including verify_cpu.S.
Reported-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
LKML-Reference: <1289931004-16066-1-git-send-email-kees.cook@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0421860a5a75b59a76b7a864a172eb090e3d0785
Merge: cf655c36fad7b6488a56f18ab56f7d608ca6552b 89ba4d12fca24d373e1b10fce498d68157bafaf0
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 18 17:35:56 2010 +0900
Merge branch 'rmobile/ag5' into rmobile-latest
commit c44f242064093e640a068741b05ee6acdd49bc22
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Mon Nov 15 01:39:57 2010 -0800
Input: gameport - convert to use common workqueue instead of a thread
Instead of creating an exclusive thread to handle gameport events (which
happen rarely), let's switch to common workqueue. With the arrival
of concurrency-managed workqueue infrastructure we are not concerned
that our callers or callees also using workqueue (no deadlocks anymore)
and it should reduce total number of threads in the system.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 8ee294cd9def0004887da7f44b80563493b0a097
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Mon Nov 15 01:39:57 2010 -0800
Input: serio - convert to common workqueue instead of a thread
Instead of creating an exclusive thread to handle serio events (which
happen rarely), let's switch to using common workqueue. With the arrival
of concurrency-managed workqueue infrastructure we are not concerned
that our callers or callees also using workqueue (no deadlocks anymore)
and it should reduce total number of threads in the system.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit ce16a474f6305dd631c885ba970d5746e4d5c803
Author: Chris Leech <christopher.leech@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 23:59:54 2010 -0800
Input: qt602240_ts - fix wrong sizeof in object table allocation
The kcalloc call for the object table is using sizeof(struct qt602240_data)
when it should be using sizeof(struct qt6602240_object), resulting in a larger
allocation than is required.
Signed-off-by: Chris Leech <christopher.leech@xxxxxxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 8b5fce06f8795d9a7f8d1f03f743fc8befa66b3b
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Nov 18 00:14:03 2010 -0800
Input: qt602240_ts - convert to using dev_pm_ops
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit e3f0f0a6c11b049f1be603dcfec82d2a8643f5fd
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Wed Nov 17 23:59:34 2010 -0800
Input: xpad - ensure xpad->bulk_out is initialized before submitting urb
As pointed out by Oliver Neukum:
xpad->irq_in is currently submitted before xpad->bulk_out is allocated.
That however is a race, because the callback for irq_in can call
xpad360w_process_packet(), which will in turn submit the bulk URB.
This patch moves initialization for xpad->bulk_out earlier, so we can
ensure xpad->bulk_out is initialized before submitting urb.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 072b198a4ad48bd722ec6d203d65422a4698eae7
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Fri Nov 12 11:22:24 2010 -0500
x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog
Now that the bulk of the old nmi_watchdog is gone, remove all
the stub variables and hooks associated with it.
This touches lots of files mainly because of how the io_apic
nmi_watchdog was implemented. Now that the io_apic nmi_watchdog
is forever gone, remove all its fingers.
Most of this code was not being exercised by virtue of
nmi_watchdog != NMI_IO_APIC, so there shouldn't be anything to
risky here.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
Cc: gorcunov@xxxxxxxxxx
LKML-Reference: <1289578944-28564-3-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date: Fri Nov 12 11:22:23 2010 -0500
x86, nmi_watchdog: Remove the old nmi_watchdog
Now that we have a new nmi_watchdog that is more generic and
sits on top of the perf subsystem, we really do not need the old
nmi_watchdog any more.
In addition, the old nmi_watchdog doesn't really work if you are
using the default clocksource, hpet. The old nmi_watchdog code
relied on local apic interrupts to determine if the cpu is still
alive. With hpet as the clocksource, these interrupts don't
increment any more and the old nmi_watchdog triggers false
postives.
This piece removes the old nmi_watchdog code and stubs out any
variables and functions calls. The stubs are the same ones used
by the new nmi_watchdog code, so it should be well tested.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
Cc: gorcunov@xxxxxxxxxx
LKML-Reference: <1289578944-28564-2-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 89ba4d12fca24d373e1b10fce498d68157bafaf0
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 18 16:47:02 2010 +0900
ARM: mach-shmobile: Add ag5evm defconfig.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 45bbaae0dcddc275594e23f108cb68869eae7433
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 18 16:07:27 2010 +0900
ARM: mach-shmobile: Split out entry-macros in to GIC and INTC variants.
Presently the entry macros are all globbed together, this simply splits
them out in to their insular variants. Future work such as the GIC
generalization will replace some of these and tidy the abstraction up
further.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6d9598e24d50a8c72f48a3864327484a30aaee44
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date: Wed Nov 17 10:59:31 2010 +0000
ARM: mach-shmobile: Initial AG5 and AG5EVM support
This patch adds initial support for Renesas SH-Mobile AG5.
At this point the AG5 CPU support is limited to the ARM
core, SCIF serial and a CMT timer together with L2 cache
and the GIC. The AG5EVM board also supports Ethernet.
Future patches will add support for GPIO, INTCS, CPGA
and platform data / driver updates for devices such as
IIC, LCDC, FSI, KEYSC, CEU and SDHI among others.
The code in entry-macro.S will be cleaned up when the
ARM IRQ demux code improvements have been merged.
Depends on the AG5EVM mach-type recently registered but
not yet present in arch/arm/tools/mach-types.
As the AG5EVM board comes with 512MiB memory it is
recommended to turn on HIGHMEM.
Many thanks to Yoshii-san for initial bring up.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b2c0710c464ede15e1fc52fb1e7ee9ba54cea186
Author: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Date: Thu Sep 9 13:40:39 2010 -0700
rcu: move TINY_RCU from softirq to kthread
If RCU priority boosting is to be meaningful, callback invocation must
be boosted in addition to preempted RCU readers. Otherwise, in presence
of CPU real-time threads, the grace period ends, but the callbacks don't
get invoked. If the callbacks don't get invoked, the associated memory
doesn't get freed, so the system is still subject to OOM.
But it is not reasonable to priority-boost RCU_SOFTIRQ, so this commit
moves the callback invocations to a kthread, which can be boosted easily.
Signed-off-by: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit 6b6e39a6a8da7234c538d14c43d3583da8875f9c
Author: Kay Sievers <kay.sievers@xxxxxxxx>
Date: Mon Nov 15 23:13:18 2010 +0100
driver-core: merge private parts of class and bus
As classes and busses are pretty much the same thing, and we want to
merge them together into a 'subsystem' in the future, let us share the
same private data parts to make that merge easier.
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 14c05aa399e30f343f25158c9adfc44631378a96
Merge: 319684b1cd15f24120b9513b38a949539c0b7938 e53beacd23d9cb47590da6a7a7f6d417b941a994
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Wed Nov 17 13:47:26 2010 -0800
Driver core: Merge 2.6.37-rc2 into driver-core-next
This resolves some build issues that were present in the older -rc1
tree that kept bothering me.
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4f6838436915fdc281173bfd5bef6d8ab5cb1a7f
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Wed Nov 17 07:43:09 2010 -0800
USB: ce4100: Add support for CE4100 EHCI IP block to EHCI driver
This patch adds support for the EHCI IP block present on the Intel
CE4100.
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
CC: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2f15744c1d90ee2e82f8ae5724b44b1cdf31715c
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Wed Nov 17 10:56:01 2010 -0500
USB: fix leftover references to udev->autosuspend_delay
This patch (as1436) takes care of leftover references to
udev->autosuspend_delay that didn't get removed during the earlier
conversion to the runtime-PM autosuspend API.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit aa02f172ac85f144d0baa248e27e34e165963f94
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Wed Nov 17 17:09:47 2010 +0100
usb: gadget: g_fs: Fix compilation warning
This commit fixes warning in f_fs.c introduced by "usb:
gadget: f_fs: remove custom printk() wrappers":
In file included from drivers/usb/gadget/g_ffs.c:64:
drivers/usb/gadget/f_fs.c:30:1: warning: "pr_fmt" redefined
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 50a9432daeece6fc1309bef1dc0a7b8fde8204cb
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 16 11:50:28 2010 -0800
mac80211: fix powersaving clients races
The code to handle powersaving stations has a race:
when the powersave flag is lifted from a station,
we could transmit a packet that is being processed
for TX at the same time right away, even if there
are other frames queued for it. This would cause
frame reordering. To fix this, lift the flag only
under the appropriate lock that blocks TX.
Additionally, the code to allow drivers to block a
station while frames for it are on the HW queue is
never re-enabled the station, so traffic would get
stuck indefinitely. Fix this by clearing the flag
for this appropriately.
Finally, as an optimisation, don't do anything if
the driver unblocks an already unblocked station.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4bce22b9b84032c77c7e038b07b24fcc706dfc10
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Tue Nov 16 11:49:58 2010 -0800
mac80211: defines for AC numbers
In many places we've just hardcoded the
AC numbers -- which is a relic from the
original mac80211 (d80211). Add constants
for them so we know what we're talking
about.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Tue Nov 16 19:20:28 2010 +0100
ath9k_hw: add support for reading EEPROM data from the internal OTP ROM
Some of the new AR9003 cards do not come with an external EEPROM chip
anymore. Calibration data on these cards is stored in the OTP ROM on
the chip.
This patch adds support for reading this data, and also adds support
for different EEPROM chip sizes (512 bytes instead of 1K).
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2d42efc44e38d3a8b2bf30e34559036bb6541672
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:13 2010 +0100
ath9k: store frame information used by aggregation inside the skb tx info
Since the pointers after the rates in the tx info cannot be used anymore
after frames have been queued, this area can be used to store information
that was previously stored in the ath_buf. With these changes, we can delay
the ath_buf assignment in the aggregation code until aggregates are formed.
That will not only make it possible to simplify DMA descriptor setup to
do less rewriting of uncached memory, but will also make it easier to
move aggregation out of the core of the ath9k tx path.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:12 2010 +0100
ath9k: more tx setup cleanups
- remove the BUF_HT flag, and instead check for IEEE80211_TX_CTL_AMPDU
before calling ath_tx_send_ampdu.
- remove a few unused variables
- calculate frame length before adding the frame padding
- merge the misnamed ath_tx_start_dma function into ath_tx_start
- remove an unused argument for assign_aggr_tid_seqno
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 71a3bf3e94b745467fc4c3451a294910f0369555
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:11 2010 +0100
ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set
This makes further tx path cleanups easier
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 28d167086227969fd6586953ee4ac682a3c394ff
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:10 2010 +0100
ath9k: clean up code duplication around ath_tx_start
Merge initial processing for the CAB queue and regular tx.
Also move ath_tx_cabq() to beacon.c and make it static.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c5992618259598ade82c386aa1595bf105e92d1f
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:09 2010 +0100
ath9k: remove bf_tx_aborted from struct ath_buf
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 76e4522177de81ac89ade01a394aeb3704a66f1b
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:08 2010 +0100
ath9k: remove bfs_frmlen from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b572d0335fcb26e526f6ae087a9a09371b22e739
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:07 2010 +0100
ath9k: remove bfs_nframes from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 269c44bc8415ad78fb4dc3de25e6de3420332e9f
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:06 2010 +0100
ath9k: remove bfs_al from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3017047f564d5101009c8318b94bdacd3ca3312e
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:05 2010 +0100
ath9k: remove bfs_keyix from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 82259b77f6e55c5b81f5f4a2852f6216c196ef30
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:04 2010 +0100
ath9k: remove bfs_paprd_timestamp from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 952cd693718d8ac796d5323fe7876241cf15ecfa
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:03 2010 +0100
ath9k: remove bfs_keytype from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5daefbd061d9509644058b6886abe2b6672ee386
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:02 2010 +0100
ath9k: remove bfs_tidno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2d3bcba0827013dfc60f727e7370dea00bc0638a
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 15:20:01 2010 +0100
ath9k: remove bfs_seqno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9a6b82706317333a1fab5dcafa2c33b91253a7a2
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 14 00:03:01 2010 +0100
ath9k: fix PA predistortion training frame setup
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c5d0855acfa4d6801c4c45bc02ddddd959262050
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Nov 13 20:22:41 2010 +0100
ath9k_hw: set default values for radar pulse detection
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 387e68846413f3dcfc5a5afca9841430057e3340
Author: RA-Jay Hung <Jay_Hung@xxxxxxxxxxxxxx>
Date: Sat Nov 13 19:13:53 2010 +0100
rt2x00: Modify rt2x00queue_remove_l2pad to make skb->data two-byte alignment
When send out skb data to mac80211, orignal code will cause mac80211
unaligned access, so modify code to make mac80211 can natural access.
Signed-off-by: RA-Jay Hung <jay_hung@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a
Author: RA-Jay Hung <Jay_Hung@xxxxxxxxxxxxxx>
Date: Sat Nov 13 19:12:54 2010 +0100
rt2x00: Fix header_length in rt2x00lib_txdone
Put the assignment of header_length after pull out extra tx headroom
Signed-off-by: RA-Jay Hung <jay_hung@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b43d63bd69ae5464a52bf1796e84097607917b2f
Author: RA-Jay Hung <Jay_Hung@xxxxxxxxxxxxxx>
Date: Sat Nov 13 19:11:46 2010 +0100
rt2x00: Fix rt2800 USB TX Path DMA issue
rt2800usb chips need to add 1~3 bytes zero padding after each 802.11 header & payload,
and at the end need to add 4 bytes zero padding whether doing TX bulk aggregation or not,
TXINFO_W0_USB_DMA_TX_PKT_LEN in TXINFO must include 1-3 bytes padding after 802.11 header & payload
but do not include 4 bytes end zero padding.
In rt2800usb_get_tx_data_len do not consider multiple of the USB packet size case, sometimes this will
cause USB DMA problem.
Signed-off-by: RA-Jay Hung <jay_hung@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ef8397cfb3a385bc57a32213d0e4a5b7903a9dc6
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Sat Nov 13 19:11:22 2010 +0100
rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR.
Make the code a bit more portable to architectures that do not support
KSEG1ADDR.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Tested-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 72c7296e03e381b49958809915105b18b09fa7a3
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Sat Nov 13 19:10:54 2010 +0100
rt2x00: Remove unneccessary internal Kconfig symbols.
CONFIG_RT2800PCI_PCI and CONFIG_RT2800PCI_SOC are strictly not needed
as we can check the dependent symbols directly in the rest of Kconfig
and the code, so clean up the Kconfig namespace a bit.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a6a8d66ebaea1e78d779af221bd6f01c5cbe71f5
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Sat Nov 13 19:10:31 2010 +0100
rt2x00: Remove RT30XX Kconfig variables.
Enabling of RT30xx devices via Kconfig variables was introduced when these
devices weren't properly supported yet.
Now that that they are properly supported and functional, we can remove these
Kconfig variables for RT30xx devices and simply enable them whenever rt2800pci
and/or rt2800usb is enabled.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 46af584d2ea86518c4cdf521903cd93ba6de2ec0
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Sat Nov 13 19:10:10 2010 +0100
rt2x00: Clean up Kconfig for RT2800 devices.
General clean up of the Kconfig part for RT28XX devices.
Also remove the indications of non functional support for rt27xx/rt28xx/rt30xx
devices, as this is no longer true. They just work fine.
Finally, remove the experimental indications for rt27xx/rt28xx/rt30xx devices
as that is no longer true. Keep the experimental indications for rt33xx/rt35xx
devices, though.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f93bc9b3ce379800b30b3c2f4fc945ae35a80039
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date: Sat Nov 13 19:09:50 2010 +0100
rt2x00: Add initial support for RT3370/RT3390 devices.
Modified from Eddy's patch by adding the RT3370 USB support as well.
Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Cc: Eddy Tsai <Eddy_Tsai@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ae4ecb9f8f01eb9deffb5bd837dc90f4e646cd2d
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Sat Nov 13 19:08:14 2010 +0100
rt2x00: Increase REGISTER_BUSY_COUNT
For some hardware the REGISTER_BUSY_COUNT isn't sufficient,
increase the REGISTER_BUSY_COUNT to 100 to catch most
devices which have more problems with accessing the registers.
For normal operating devices nothing would change as they will
exit the loop early anyway.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 24aee93c37fe7fa2aa2381d3017be478e9c55c47
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Wed Nov 17 15:57:57 2010 +0000
sst: remove rest of aava bits and aava related code
This removes the remaining bit of aava dependent and related bits from driver
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 63fcf10db218a89cbd1e34c47540c3e28706cff1
Author: Yong Wang <yong.y.wang@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 22:09:54 2010 +0800
staging: spectra: asynchronous init
The spectra nand driver takes quite some time to initialize because
it needs to scan the whole nand disk to find the latest block table.
This patch initializes the spectra nand driver asynchronously so that
other things in the kernel can initialize in parallel to the scanning
operation.
Signed-off-by: Yong Wang <yong.y.wang@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6f5a416216fe2c39171326897e074d417df1082b
Author: Yong Wang <yong.y.wang@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 22:08:28 2010 +0800
staging: spectra: move all init logic into nand_pci_probe
Currently there are some driver initialization logic that
is not part of nand_pci_probe function. This will result in
that part of driver initialization code executing even on
platforms without the corresponding hardware which is always
dangerous.
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@xxxxxxxxx>
Signed-off-by: Yong Wang <yong.y.wang@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 237a1a1aef91ab654988cb459d783ac0ee09d2ea
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Wed Nov 17 11:54:35 2010 +0300
Staging: ft1000-usb: freeing uninitialized pointer
GCC complains that if (info->CardReady) is false we kfree() an
uninitialized pointer.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 93760716840a3feada381786f2defbd47a8099de
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 16 17:41:15 2010 -0800
staging: brcm80211: nicpci.c: replace osl based PCI calls with native linux pci calls
Get rid of the private PCI access routines and replace with standard calls from linux/pci.h in nicpci.c
(The private versions are still used in siutils.c... for now)
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e69284f24320e2589dbd78bf531ffa18d097ae4c
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 16 15:45:48 2010 -0800
staging: brcm80211: s/osl_t/struct osl_info/g
Do the substitution (and then fix all the dang lines that were pushed past 80 columns.)
Some of the touched lines triggered checkpatch warnings for completely unrelated
reasons that were already there. Those will have to be addressed later.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e6a12a07d0b06f8e614a212e26002e62071242e8
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 16 13:16:59 2010 -0800
staging: brcm80211: completely remove osl_pubinfo_t typedef
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1070137de3e3b0f3fdfedc420a06a43d05a6e705
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Nov 16 13:16:58 2010 -0800
staging: brcm80211: expose osl contents and start combining osl and pub_osl.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dda0b38692a7298f433b92b1329867b1ecabb4bb
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date: Sun Nov 14 07:06:08 2010 +0000
net: ipv4: tcp_probe: cleanup snprintf() use
snprintf() returns number of bytes that were copied if there is no overflow.
This code uses return value as number of copied bytes. Theoretically format
string '%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n' may be expanded
up to 163 bytes. In reality tv.tv_sec is just few bytes instead of 20, 2 ports
are just 5 bytes each instead of 10, length is 5 bytes instead of 10. The rest
is an unstrusted input. Theoretically if tv_sec is big then copy_to_user() would
overflow tbuf.
tbuf was increased to fit in 163 bytes. snprintf() is used to follow return
value semantic.
Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9ea19481db31d614f729f346bdcf28e4e60ff14a
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 16 06:31:39 2010 +0000
net: zero kobject in rx_queue_release
netif_set_real_num_rx_queues() can decrement and increment
the number of rx queues. For example ixgbe does this as
features and offloads are toggled. Presumably this could
also happen across down/up on most devices if the available
resources changed (cpu offlined).
The kobject needs to be zero'd in this case so that the
state is not preserved across kobject_put()/kobject_init_and_add().
This resolves the following error report.
ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX
kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong.
Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169
Call Trace:
[<ffffffff8121c940>] kobject_init+0x3a/0x83
[<ffffffff8121cf77>] kobject_init_and_add+0x23/0x57
[<ffffffff8107b800>] ? mark_lock+0x21/0x267
[<ffffffff813c6d11>] net_rx_queue_update_kobjects+0x63/0xc6
[<ffffffff813b5e0e>] netif_set_real_num_rx_queues+0x5f/0x78
[<ffffffffa0261d49>] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe]
[<ffffffffa0262509>] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe]
[<ffffffffa0274596>] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe]
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5811662b15db018c740c57d037523683fd3e6123
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Fri Nov 12 18:43:55 2010 +0000
net: use the macros defined for the members of flowi
Use the macros defined for the members of flowi to clean the code up.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dd68ad2235b4625e0dc928b2b4c614d265f976d3
Author: Philippe De Muyter <phdm@xxxxxxxxx>
Date: Sat Nov 13 08:43:29 2010 +0000
net: more Kconfig whitespace cleanup
indentation for TSI108_ETH entry was too big.
Signed-off-by: Philippe De Muyter <phdm@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b1323c8fa153f63e20d5a7fc0be72073c3beb05b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 12 11:37:59 2010 +0000
drivers/net/can/sja1000: Use printf extension %pR for struct resource
Using %pR standardizes the struct resource output.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d8ee707114bc3615fd7be90eb942eba2dbe668ed
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 10:13:58 2010 +0000
drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a31ff3880578c37fd5c71ee863c23897dacfa9f8
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 10:13:57 2010 +0000
drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 73e1cc4a4a02cfd2d520355de56ce1dafa11dd59
Author: Yong Wang <yong.y.wang@xxxxxxxxxxxxxxx>
Date: Wed Nov 17 21:02:13 2010 +0800
staging: spectra: fix build error
blk_queue_ordered() has been deprecated and replaced with
blk_queue_flush() by Tejun. However, use of blk_queue_ordered()
in spectra nand driver has not been converted yet and thus results
in the following build error.
drivers/staging/spectra/ffsport.c: In function SBD_setup_device:
drivers/staging/spectra/ffsport.c:659: error: implicit declaration of function blk_queue_ordered
drivers/staging/spectra/ffsport.c:659: error: QUEUE_ORDERED_DRAIN_FLUSH undeclared (first use in this function)
drivers/staging/spectra/ffsport.c:659: error: (Each undeclared identifier is reported only once
drivers/staging/spectra/ffsport.c:659: error: for each function it appears in.)
Signed-off-by: Yong Wang <yong.y.wang@xxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 802aa9c058f2046f0a5683f04d7755c362734010
Author: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Date: Tue Nov 16 14:09:06 2010 +0000
qlcnic: Bumped up driver version to 5.0.12
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 706f23ada68746ed475488e7d2e2ca392fc4f731
Author: Sony Chacko <sony.chacko@xxxxxxxxxx>
Date: Tue Nov 16 14:08:46 2010 +0000
qlcnic: lro off message log from set rx checsum
Log LRO off message while disabling rx checksum only when
LRO is already enabled.
Signed-off-by: Sony Chacko <sony.chacko@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2679a135e6452359cd807754617db0d05ad404e5
Author: Sritej Velaga <sritej.velaga@xxxxxxxxxx>
Date: Tue Nov 16 14:08:23 2010 +0000
qlcnic: Add description for CN1000Q adapter
Add description for CN1000Q adapter
Signed-off-by: Sritej Velaga <sritej.velaga@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c21fd48c22bd1a9c4a5286963086f246c782e47e
Author: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Date: Tue Nov 16 14:08:06 2010 +0000
qlcnic: Fix for kdump
In case of kdump environment the function may be in unknown state.
Reset the function using PCI FLR before initializing it.
Signed-off-by: Rajesh Borundia <rajesh.borundia@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2abea2f0a5ab161facd865356d2e59b23204414e
Author: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Date: Tue Nov 16 14:07:53 2010 +0000
qlcnic: Allow minimum bandwidth of zero
Allow minimum bandwidth to be set zero
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b382b191ea9e9ccefc437433d23befe91f4a8925
Author: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Date: Tue Nov 16 04:33:57 2010 +0000
ipv6: AF_INET6 link address family
IPv6 already exposes some address family data via netlink in the
IFLA_PROTINFO attribute if RTM_GETLINK request is sent with the
address family set to AF_INET6. We take over this format and
reuse all the code.
Signed-off-by: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Cc: YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9f0f7272ac9506f4c8c05cc597b7e376b0b9f3e4
Author: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Date: Tue Nov 16 04:32:48 2010 +0000
ipv4: AF_INET link address family
Implements the AF_INET link address family exposing the per
device configuration settings via netlink using the attribute
IFLA_INET_CONF.
The format of IFLA_INET_CONF differs depending on the direction
the attribute is sent. The attribute sent by the kernel consists
of a u32 array, basically a 1:1 copy of in_device->cnf.data[].
The attribute expected by the kernel must consist of a sequence
of nested u32 attributes, each representing a change request,
e.g.
[IFLA_INET_CONF] = {
[IPV4_DEVCONF_FORWARDING] = 1,
[IPV4_DEVCONF_NOXFRM] = 0,
}
libnl userspace API documentation and example available from:
http://www.infradead.org/~tgr/libnl/doc-git/group__link__inet.html
Signed-off-by: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ca7479ebbd9f7621646bf2792cb7143647f035bb
Author: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Date: Tue Nov 16 04:31:20 2010 +0000
inet: Define IPV4_DEVCONF_MAX
Define IPV4_DEVCONF_MAX to get rid of MAX - 1 notation.
Signed-off-by: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f8ff182c716c6f11ca3061961f5722f26a14e101
Author: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Date: Tue Nov 16 04:30:14 2010 +0000
rtnetlink: Link address family API
Each net_device contains address family specific data such as
per device settings and statistics. We already expose this data
via procfs/sysfs and partially netlink.
The netlink method requires the requester to send one RTM_GETLINK
request for each address family it wishes to receive data of
and then merge this data itself.
This patch implements a new API which combines all address family
specific link data in a new netlink attribute IFLA_AF_SPEC.
IFLA_AF_SPEC contains a sequence of nested attributes, one for each
address family which in turn defines the structure of its own
attribute. Example:
[IFLA_AF_SPEC] = {
[AF_INET] = {
[IFLA_INET_CONF] = ...,
},
[AF_INET6] = {
[IFLA_INET6_FLAGS] = ...,
[IFLA_INET6_CONF] = ...,
}
}
The API also allows for address families to implement a function
which parses the IFLA_AF_SPEC attribute sent by userspace to
implement address family specific link options.
Signed-off-by: Thomas Graf <tgraf@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d67ef35fff67845c64d806c033cc7c569ccebfff
Author: Jeremy Eder <jeder@xxxxxxxxxx>
Date: Mon Nov 15 05:41:31 2010 +0000
clarify documentation for net.ipv4.igmp_max_memberships
This patch helps clarify documentation for
net.ipv4.igmp_max_memberships by providing a formula for
calculating the maximum number of multicast groups that can be
subscribed to, plus defining the theoretical limit.
Signed-off-by: Jiri Pirko <jpirko@xxxxxxxxxx>
Signed-off-by: Jeremy Eder <jeder@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9920239c90d5f6dadfb44325abf3568a5e3fd827
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Nov 10 18:54:58 2010 +0000
drivers/isdn/hisax: Add printf format/argument verification and fix fallout
Add __attribute__((format... to several functins
Make formats and arguments match.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1f1aaf82825865a50cef0b4722607abb12aeee52
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 16 11:52:57 2010 +0000
SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error
The SELinux netfilter hooks just return NF_DROP if they drop a packet. We
want to signal that a drop in this hook is a permanant fatal error and is not
transient. If we do this the error will be passed back up the stack in some
places and applications will get a faster interaction that something went
wrong.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ee58681195bf243bafc44ca53f3c24429d096cce
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 16 11:52:49 2010 +0000
network: tcp_connect should return certain errors up the stack
The current tcp_connect code completely ignores errors from sending an skb.
This makes sense in many situations (like -ENOBUFFS) but I want to be able to
immediately fail connections if they are denied by the SELinux netfilter hook.
Netfilter does not normally return ECONNREFUSED when it drops a packet so we
respect that error code as a final and fatal error that can not be recovered.
Based-on-patch-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit da6836500414ae734cd9873c2d553db594f831e9
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Nov 16 11:52:38 2010 +0000
netfilter: allow hooks to pass error code back up the stack
SELinux would like to pass certain fatal errors back up the stack. This patch
implements the generic netfilter support for this functionality.
Based-on-patch-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 37d668004289d202f71dc5bfdadf6c18b34577a2
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:33 2010 +0000
net/atm: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ece49153b601d95bcebd45a6394e370972f0b0a0
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:31 2010 +0000
drivers/net: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:30 2010 +0000
drivers/net/vxge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8739cfef1ab8bc02e1bf38c02399afe62f3a7800
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:29 2010 +0000
drivers/net/usb: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:28 2010 +0000
drivers/net/qlge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4dd151876b6b81040121708ebc23c6cd1a3d5be8
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:27 2010 +0000
drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a887e220760c12e00b0591d67987e26f6e270d71
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:26 2010 +0000
drivers/net/pcmcia: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c04914af6861d62df303aeedbbe554972ce4e736
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:25 2010 +0000
drivers/net/bonding: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a17531fa4c951f32ca4f90b04ca42cfb11924098
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 11:12:24 2010 +0000
drivers/isdn/i4l: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 91921fef7c658b12de53376b312d071d757f7770
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Nov 17 10:22:56 2010 -0800
sparc: Do not export prom_nb{get,put}char().
Never used outside of console_{32,64}.c
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a1082bfe7d2d88d9626f5542dda9c0781394e91f
Merge: 9d1e5e40d6cac4bf7008e04c202d71918455ca11 147b2c8cb4f3e16aafc87096365a913d01ee3a21
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Nov 17 09:56:04 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
commit d3e1884bc585a43674d2cb0d3f0aeeb0ae43bc04
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Wed Nov 17 12:11:24 2010 +0000
x86, mrst: Add explanation for using 1960 as the year offset for vrtc
Explain the reason for the apparently odd choice of year offset so we don't
get more questions about it.
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101117121050.9998.89348.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit ad02519a0d27da4a0a50cbc696e810c94e27c28e
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Mon Nov 15 10:14:06 2010 -0800
x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"
commit b9fc71f47 (x86, mrst: The shutdown for MRST requires the SCU
IPC mechanism) introduced the following warning:
warning: (X86_MRST && PCI && PCI_GOANY && X86_32 &&
X86_EXTENDED_PLATFORM && X86_IO_APIC) selects INTEL_SCU_IPC which has
unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_MRST)
which is due to the hierarchical menu structure.
Select X86_PLATFORM_DEVICES as well.
Originally-from: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <20101115101406.77e072ef.randy.dunlap@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
commit b9fc71f47dc060c588e5099638242fad44eeecbc
Author: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 17:31:19 2010 +0000
x86, mrst: The shutdown for MRST requires the SCU IPC mechanism
Fix the build failure reported by Randy.
Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101115173110.6877.83958.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 032a6424aeea7333a8dafc8cc05dd10b09c62680
Author: Dan Murphy <dmurphy@xxxxxx>
Date: Mon Nov 15 09:50:50 2010 -0600
OMAP: mux: Add __func__ macro to pr_xxx macros
Removed mux: and added the __func__ macro to make debugging
easier.
Signed-off-by: Dan Murphy <dmurphy@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
commit fc63de829bbfa3945ffd6327bd3dc88f4e643642
Author: sricharan <r.sricharan@xxxxxx>
Date: Mon Nov 8 19:26:11 2010 +0530
OMAP4: pandaboard: Select CBL & CBS package and initialize mux
The mux framework allows the change of pad configuration by drivers
when needed. Prior to this the mux framework has to be initialised
with all the mux parameters specific to the board. The mux init is
already present in the board file for SDP. Adding the mux init
for panda boards.
Signed-off-by: sricharan <r.sricharan@xxxxxx>
Acked-by: Anand Gadiyar <gadiyar@xxxxxx>
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
commit 6fea7b0a7ad9b79aca09df4c42773927db6934ed
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Mon Sep 27 10:50:33 2010 +0200
OMAP4: sdp4430: Select CBS package for ES2
Select the CBS package if SDP4430 is enabled during config.
Use the proper package (CBL or CBS) based on chip revision.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Anand Gadiyar <gadiyar@xxxxxx>
commit a7722d8796c3431163943c30af7a90d87c43180a
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Fri Sep 24 16:56:59 2010 +0200
OMAP4: mux: Add CBS package data for OMAP4430 ES2
Please note that the full muxmodes are re-defined for ES2 instead
of using the subset. There are 81 differences among 204 pins.
The subset fixup will have to iterate over the whole list for each
subset entry, which can lead to an important number of iteration.
On the other hand, it will take much more memory at boot time.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Anand Gadiyar <gadiyar@xxxxxx>
commit fb6bf6320e33af5bd6ac788f27245f9162bc5215
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Aug 10 17:43:15 2010 +0200
OMAP4: sdp4430: Select CBL package for ES1 and initialize mux
Select the CBL package if SDP4430 is enabled during config.
Initialize the mux framework during the board init.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit a041a52c4d2b82e25de2267bce5f4dc3d2179b2a
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Aug 10 17:27:48 2010 +0200
OMAP4: mux: Add CBL package data for OMAP4430 ES1
Add data for OMAP4430 generated from HW pinout & register database.
The data set is split in two partitions for both core and wkup.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 112485e9c543b17fc08daea56c7a558b415d06af
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Mon Aug 16 10:55:35 2010 +0200
OMAP: mux: Add support for control module split in several partitions
Starting on OMAP4, the pin mux configuration is located in two
different partitions of the control module (CODE_PAD and WKUP_PAD).
The first one is inside the core power domain whereas the second
one is inside the wakeup.
- Add the capability to add any number of partition during board init
time depending of Soc partitioning.
- Add some init flags as well in order to avoid explicit Soc version
check inside the mux core code.
- Add a comment with mux0 mode on top of omap_mux/board/<partition>
if the current mux mode is not the default one.
Thanks to Tony Lindgren <tony@xxxxxxxxxxx> for the following improvements:
- Add omap_mux_get for getting the partition data so platform level
device code can use it.
- Fix the rx51 board code to use the new API.
- Do not store the partition for each mux entry. Look up the partition
for debugfs instead.
Thanks to Dan Murphy <dmurphy@xxxxxx> for testing on OMAP4 and reporting
a couple of bugs.
Thanks to Anand Gadiyar <gadiyar@xxxxxx> for testing on OMAP3 zoom and
bug report.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Tested-by: Murphy Dan <dmurphy@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Anand Gadiyar <gadiyar@xxxxxx>
commit 1cbb3a9a132969ed1ffeaecff2f910619d4470ae
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Aug 10 17:33:01 2010 +0200
OMAP: mux: Replace printk with pr_xxx macros
Replace all the printk(KERN_XXX... with pr_xxx macros.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 194ee8e89cc02d8bea8a0b837271f79ca0c72873
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 15:32:21 2010 +0100
ARM: mx25: dynamically allocatate imx-fb devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit e7c74b343091e0c6b7bb67c12f9f7fb345aa6a50
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 11:57:21 2010 +0100
ARM: mx25: dynamically allocate imxdi_rtc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit ab9cee4b2167f8bf01d85b537df5b9cbe342c780
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 11:35:33 2010 +0100
ARM: mx25: dynamically allocate imx-keypad devices
The mxc-keypad device seems to be the result of an early and partial
merge of the keypad driver. It's unused and there is no corresponding
driver available, so just remove it.
Cc: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit d485c7e71675abdd6133128e596b41284c2ee7b5
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 11 10:52:33 2010 +0100
ARM: mx25: move registration of gpios to plat-mxc/gpio.c
To use common macros to define the gpio ports for imx{1,21,25,27} the
existing ones had to made more general and a few more base address defines
were necessary.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 5f3d1092a949b33d01c95b7f5e5a83672629f131
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 22:15:45 2010 +0100
ARM: mx25: dynamically allocate mxc_pwm devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 224b8c83641c2f31e3efc9bc5956636cc42cadf7
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 21:50:07 2010 +0100
ARM: mx25: dynamically allocate fsl-usb2-udc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 2c20b9f19add2248dc867f1f78dcef1eb0944543
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 21:27:55 2010 +0100
ARM: mx25: dynamically allocate mxc-ehci devices
According to the reference manual of the i.MX25 the host controller uses an
offset of 0x200 not 0x400 as was specified in the resources for mxc_usbh2.
Needs-Testing: yes
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit e9f0bafb4f3d32d0bc0ea7e946d667a68bae59ce
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 10:51:38 2010 +0100
ARM: imx: move registration of gpios to plat-mxc/gpio.c
This finally gets rid of mach-imx/devices.c.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 3a6f52a79fc0ce1c8b950c628bcf101f8652e957
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 10:22:02 2010 +0100
ARM: imx: remove now empty devices.h
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 9f871469893a6d87c6cddf412f82ebf588fd4eca
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 10:11:23 2010 +0100
ARM: imx: dynamically allocate imx21-hcd devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 3f880141b8d12cdbb5faf0b9941ee50ac515ea1e
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Wed Nov 10 09:58:56 2010 +0100
ARM: imx: dynamically allocate imx-keypad devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit bd455ed36c487b949068182bfee478b785ee090b
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 9 17:52:14 2010 +0100
ARM: imx: dynamically allocate fsl-usb2-udc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 2eb42d5c287f5e883a4b3ebe668ba880caa351e5
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 5 18:52:09 2010 +0100
ARM: imx: dynamically allocate mxc-ehci devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 9d3d945a8d5be2c915f646e8dff8422486a77030
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 5 17:26:09 2010 +0100
ARM: imx: dynamically register mxc-mmc devices
... plus a trivial simplification of mx21ads_sdhc_init()
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit c194daad0e0de94ed5e03aa723eb56b4a3ae9738
Author: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Date: Mon Nov 1 18:00:03 2010 +0100
ARM: mx3/mach-pcm037_eet: Fix section mismatch for eet_init_devices()
This function should be marked as __init because it is used only
in the init phase.
This fix the compiler warning:
LD arch/arm/mach-mx3/built-in.o
WARNING: arch/arm/mach-mx3/built-in.o(.text+0x1328): Section mismatch in reference from the function eet_init_devices() to the (unknown reference) .init.rodata:(unknown)
The function eet_init_devices() references
the (unknown reference) __initconst (unknown).
This is often because eet_init_devices lacks a __initconst
annotation or the annotation of (unknown) is wrong.
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit bf182bcc6e726cce2f02b699bd0fba787734554f
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 5 15:01:16 2010 +0100
ARM: imx: dynamically allocate mxc_pwm devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit c06246576a6e71b72ecc6b4b39a5c8eaf45dc2ed
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Nov 5 11:22:37 2010 +0100
ARM: mx3: enable SPI_IMX for better compile coverage
SPI_IMX defaults to m for i.MX machines. So enabling SPI is enough.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit ad851bffba6afd6468f96a6180cc4a14e9ebee38
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 4 17:07:48 2010 +0100
ARM: imx: dynamically register imx-fb devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit fc40d0191943fa995f5359b5c23aa7c3dea69d7b
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 4 12:02:35 2010 +0100
ARM: imx: change the way flexcan devices are registered
Group soc specific data in a global struct instead of repeating it for each
call to imxXX_add_flexcanX. The structs holding the actual data are placed
in .init.constdata and so don't do much harm. Compared to the previous
approach this reduces code size to call imx_add_flexcan.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit e0a1961df8ad898b661cf0adcf3519254f135a44
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Thu Nov 4 10:09:10 2010 +0100
ARM: imx: dynamically allocate imx2-wdt devices
Currently there is no platform data used in the driver. In case this
changes and for consistency NULL is passed unused to the soc specific
functions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit b2997cb12b302ee6d233808e32214d00afdcf128
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 2 17:50:55 2010 +0100
ARM: imx: dynamically allocate mx2-camera device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 3bde75b5370bd69fd7f07a8e254bef05b1b5b219
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 2 16:42:27 2010 +0100
ARM: imx/gpio: remove some useless casts
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 9bb39b3f600101b09cbb35e0a0deb9d56c4fe67f
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 2 11:59:08 2010 +0100
ARM: imx: dynamically allocate mx1-camera device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 6332c1071811a1d588cfc93330d87a57a7460a1b
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 2 11:56:54 2010 +0100
ARM: imx: allow specifying a dma mask when creating a platform device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit e08300043ee4e2df10be551b76e126d6c02f26cc
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Nov 2 10:03:51 2010 +0100
ARM: imx: dynamically allocate imx_udc device
This is only available for mx1 machines with no in-tree user.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 300f86da1787c680598ea441aaa602a1664fba86
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Oct 29 11:50:36 2010 +0200
ARM: imx: remove unused devices
all these don't have a driver and are not added in any machine file.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit ae71a5622253708aa08df231e6415fe7a1e96b10
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Oct 29 10:56:07 2010 +0200
ARM: imx: dynamically allocate mxc_w1 devices
Currently there is no platform data used in the driver. In case this
changes NULL is passed unused to the soc specific functions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit d96801b2ca47cfeddadede7a1998e1fe0eab095c
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Oct 22 09:20:52 2010 +0200
ARM: imx: remove deprecated symbols as all users are gone now
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit ac401427c05a6a371950a1cdfaec75f72bffb9b5
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Oct 26 09:42:54 2010 +0200
ARM: imx/debug-macro: rework using the new io mapping macro
This gets rid of the last user of IMX_NEEDS_DEPRECATED_SYMBOLS.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit a99631489bbd1b4647b82d0822b6a3942e2dd731
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Oct 25 15:44:25 2010 +0200
ARM: imx: change static io mapping to use a function
Now only the virtual addresses [0xf4000000, 0xf5ffffff] are used for
static per-SoC mappings. The few mappings of whole chip selects are
moved accordingly.
The now wrong defines for virtual base addresses are removed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit cf3a6aba2f8402d4e45f7f263a0e69f779cd1bdc
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Oct 25 15:54:58 2010 +0200
ARM: imx: remove last explicit users of virtual base address defines
This allows changing the mapping without the need to adapt all users.
While at it remove some unneeded casts to void __iomem *, this is already
taken care for in the IO_ADDRESS macros
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 08ff97b5214143c3bd47add6ec49097cb848120a
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Oct 25 15:38:09 2010 +0200
ARM: imx: use MXxy_IO_P2V macros to setup static mappings
This makes less code rely on the virtual constants.
To further simplify code and reduce the needed boilerplate when
defining the static mappings a new helper macro is defined in
mach/hardware.h.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit f5d7a13b18706c3328c6aac3bf782a13cabf255a
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Oct 25 11:40:30 2010 +0200
ARM: imx: refactor the io mapping macro
This makes it more assembler friendly and allows it to be used in situation
that need an unsigned long and not a pointer. Also the naming is
clearer. IOMEM is introduced without IMX_ prefix as it is used this way
in more than one ARM subarch and it might become globally available
soon.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 9651b7db59893e796dfdd170485543b9863be9d8
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri Oct 22 14:49:45 2010 +0200
ARM: mx3: fix the last users of IMX_NEEDS_DEPRECATED_SYMBOLS
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
commit 147b2c8cb4f3e16aafc87096365a913d01ee3a21
Author: Dongdong Deng <dongdong.deng@xxxxxxxxxxxxx>
Date: Tue Nov 16 19:50:15 2010 -0800
e1000e: add netpoll support for MSI/MSI-X IRQ modes
With enabling CONFIG_PCI_MSI, e1000e could work in MSI/MSI-X IRQ mode,
and netpoll controller didn't deal with those IRQ modes on e1000e.
This patch add the handling MSI/MSI-X IRQ modes to netpoll controller,
so that netconsole could work with those IRQ modes.
Signed-off-by: Dongdong Deng <dongdong.deng@xxxxxxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 1b98c2bb63a4b415d8d894d001b6d0256409e0d9
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Tue Nov 16 19:50:14 2010 -0800
e1000e: 82574 intermittently fails to initialize with manageability f/w
The driver can fail initializing the hardware when manageability firmware
is performing concurrent MDIO operations because the hardware semaphore
scheme to prevent concurrent operations between software and firmware is
incorrect for 82574/82583. Instead of using the SWSM register, the driver
should be using the EXTCNF_CTRL register. A software mutex is also added
to prevent simultaneous software threads from performing similar concurrent
accesses.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit d478eb44f7a6b53256ae399fa7e597525b4034ee
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date: Tue Nov 16 19:50:13 2010 -0800
e1000e: 82571 SerDes link handle null code word from partner
SerDes Link detection on certain 82571 mezzanine cards can fail when the
link is forced, the link partner does not recognize forced link and the
link partner sends null code words. Detect the null code words and return
to auto-negotiation state which causes the link partner to begin responding
with valid code words. Within a reasonable interval the link will finally
settle as forced by both partners.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit b1d670f10e8078485884f0cf7e384d890909aeaa
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Tue Nov 16 19:41:36 2010 -0800
Remove extra struct page member from the buffer info structure
declaration.
Reported-by: Andi Kleen <andi@xxxxxxxxxxxxxx>
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit eca2a33c985eb19dd0ca4b37d66c7fb5d8b76308
Author: Julian Stecklina <jsteckli@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 16 19:41:36 2010 -0800
igbvf: Remove some dead code in igbvf
Removed unused variable in igbvf.
Signed-off-by: Julian Stecklina <jsteckli@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Greg Rose <greg.v.rose@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 2c20ebbaed7f3f21506629ee931941a9bba199ab
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Tue Nov 16 19:41:35 2010 -0800
igbvf: Update version and Copyright
Update version string and copyright notice
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Tue Nov 16 19:27:19 2010 -0800
ixgbevf: Fix Oops
The driver is calling netif_carrier_off and netif_tx_stop_all_queues
before the netdevice is registered which causes an Oops. Move call
to netif_carrier_off after the netdevice is registered and remove
call to netif_tx_stop_all_queues because there aren't any TX
queues yet.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit e2ddeba95c09d0d44719ff005e915dc06ff46571
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 16 19:27:18 2010 -0800
ixgbe: refactor ixgbe_alloc_queues()
I noticed ring variable was initialized before allocations, and that
memory node management was a bit ugly. We also leak memory in case of
ring allocations error.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit b93a22260f6f4bcf6c92c54de8530a97d3e921f0
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Tue Nov 16 19:27:17 2010 -0800
ixgbe: add support for x540 MAC
This patch adds support for the x540 MAC which is the next MAC in the
82598/82599 line.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit fe15e8e1c78521e0b4e375d6ed415b82265419c9
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Tue Nov 16 19:27:16 2010 -0800
ixgbe: add MAC and PHY support for x540
Adds the new x540.c file and Aquantia 1202 PHY for X540 support.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit a391f1d51244b8274920a33c5d11aeebec3aa68f
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Tue Nov 16 19:27:15 2010 -0800
ixgbe: make silicon specific functions generic
The new MAC type X540 shares much of the same functionality of
some silicon specific functions. To reduce duplicate code,
made these functions generic.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Tested-by: Stephen Ko <stephen.s.ko@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 9b55bb038468a7b504ccdc1d956952598ae1b85b
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 16 19:27:14 2010 -0800
ixgbe: make sure FCoE DDP user buffers are really released by the HW
When invalidating the DDP context is invalidated, the HW may not be done
with the user buffer right away. In which case, we poll the FCBUFF register
to check if the buffer valid bit is cleared or not, if not, we wait for max
100us that is guaranteed by the HW.
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 8ca371e484e2e5ceb9b90fdb83d8d251017d852b
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 16 19:27:13 2010 -0800
ixgbe: invalidate FCoE DDP context when no error status is available
The hw automatically invalidates the context if DDP is successful or there is
error detected. In case there is no error status available from the hw,
initializing the per context error status to be 1 allows the DDP context to be
still invalidated via the upper layer call to ddp_put().
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit a41c059741570779c0254a3a1aa4da3baa463d7c
Author: Yi Zou <yi.zou@xxxxxxxxx>
Date: Tue Nov 16 19:27:13 2010 -0800
ixgbe: avoid doing FCoE DDP when adapter is DOWN or RESETTING
There is no point to allow incoming DDP requests from the upper layer stack if
the adapter is going down or being reset.
Signed-off-by: Yi Zou <yi.zou@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit c84d324c770dc81acebc1042163da33c8ded2364
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 16 19:27:12 2010 -0800
ixgbe: rework Tx hang detection to fix reoccurring false Tx hangs
The Tx hang logic has been known to detect false hangs when
the device is receiving pause frames or has delayed processing
for some other reason.
This patch makes the logic more robust and resolves these
known issues. The old logic checked to see if the device
was paused by querying the HW then the hang logic was
aborted if the device was currently paused. This check was
racy because the device could have been in the pause state
any time up to this check. The other operation of the
hang logic is to verify the Tx ring is still advancing
the old logic checked the EOP timestamp. This is not
sufficient to determine the ring is not advancing but
only infers that it may be moving slowly.
Here we add logic to track the number of completed Tx
descriptors and use the adapter stats to check if any
pause frames have been received since the previous Tx
hang check. This way we avoid racing with the HW
register and do not detect false hangs if the ring is
advancing slowly.
This patch is primarily the work of Jesse Brandeburg. I
clean it up some and fixed the PFC checking.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit e3de4b7bdfd2c06884c95cfb4ad4d64be046595e
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:11 2010 -0800
ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber
This change resolves some null function pointer accesses on 82598 when a
multi-speed fiber module is inserted into the adapter.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 2274543f15133165b855b9a4a1503b2c1268c6cf
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:10 2010 -0800
ixgbe: populate the ring->q_vector pointer during ring mapping
The q_vector back pointer was not being set in the rings so it would not
have been possible to determine the parent q_vector of the ring.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit d0759ebb051972f8557a19aa13cf02fc314856e9
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:09 2010 -0800
ixgbe: cleanup ixgbe_map_rings_to_vectors
This change cleans up some of the items in ixgbe_map_rings_to_vectors.
Specifically it merges the two for loops and drops the unnecessary vectors
parameter.
It also moves the vector names into the q_vectors themselves.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 125601bf03a13e24d3785ccbc3a25ad401c92772
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:08 2010 -0800
ixgbe: simplify math and improve stack use of ixgbe_set_itr functions
This change is meant to improve the stack utilization and simplify the math
used in ixgbe_set_itr_msix.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit bf29ee6c4819a86ba0209281550b230889b8ebe6
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:07 2010 -0800
ixgbe: cleanup unclear references to reg_idx
There are a number of places where we use the variable j to contain the
register index of the ring. Instead of using such a non-descriptive
variable name it is better that we name it reg_idx so that it is clear what
the variable contains.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 9d6b758f428d2ad9ca4208d5c4d4cdbd4261b0d8
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:06 2010 -0800
ixgbe: cleanup unnecessary return value in ixgbe_cache_ring_rss
This change is just to cleanup some confusing logic in ixgbe_cache_ring_rss
which can be simplified by adding a conditional with return to the start of
the call.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 673ac60461082e07be58b23f237d651c2605ce60
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:05 2010 -0800
ixgbe: Cleanup DCB logic, whitespace, and comments in ixgbe_ethtool.c
This change address a few whitespace issues in DCB #ifdefs, adds a comment
calling out the DCB specific registers, and nests an if statement inline
with a number of if statements related to flow control.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 50d6c681d0c38208e494f0c6302ef13d21dababa
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:05 2010 -0800
ixgbe: add WOL support for backplane adapters
This change adds support for certain 82599 based Mezzanine adapters.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit e2b4e216b7e9da09175c76887c754489681533b9
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:04 2010 -0800
ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration
This change makes it so that we always disable SCTP regardless of mac type
since we shouldn't need to check mac type before disabling a feature that
isn't supported on a given piece of hardware.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit bd50817859e7e82ba6e4adc75ebd8ac19459d8a4
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:03 2010 -0800
ixgbe: change mac_type if statements to switch statements
This change replaces a number of if/elseif/else statements with switch
statements to support the addition of future devices to the ixgbe driver.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit aa80175a539a47fd11e2fbf1696a29f7a2652930
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:02 2010 -0800
ixgbe: cleanup use of ixgbe_rsc_count and RSC_CB
This change cleans up the use of rsc_count and changes it to a boolean since
the actual numerical value is used nowhere in the Rx cleanup path. I am
also moving the skb count into the RSC_CB path since it is much easier to
track it there than when it is passed as a parameter to various function
calls.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit ee9e0f0b40c4fb4ad71d677c094d518db42f7076
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:01 2010 -0800
ixgbe: cleanup ATR filter setup function
This change cleans up the ixgbe_atr filter setup function so that it uses
fewer items from the stack. Since the code is only applicable to IPv4 w/
TCP it makes sense to just use the pointers based on the headers themselves
instead of copying them to temp variables and then writing those to the
filters.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit c267fc166a3308c45c7f0ad2ddd6fc696caaeb80
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:27:00 2010 -0800
ixgbe: cleanup ixgbe_clean_rx_irq
The code for ixgbe_clean_rx_irq was much more tangled up than it needed to
be in terms of logic statements and unused variables. This change
untangles much of that and drops several unused variables such as cleaned
which was being returned but never checked.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 32aa77a4fc06bd1116f83c25bf0389a3e9b80533
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:59 2010 -0800
ixgbe: change vector numbering so that queues end up on correct CPUs
This changes the numbering scheme slightly. Previously the ordering was
coming out like this:
Rx-2
Rx-1
Rx-0
TxRx-0
Which would drop two queues on CPU 0. This change makes it so that the
ordering is like this:
Rx-3
Rx-2
Rx-1
TxRx-0
This means that each CPU will have it's own Rx queue, and only CPU 0 will
have the Tx queue.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit b953799ee29075afd30afe4c0fb65f278b088f69
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:58 2010 -0800
ixgbe: reorder Tx cleanup so that if adapter will reset we don't rearm
The code as it existed could re-arm the queues when it was requesting a HW
reset due to a TX hang. Instead of doing that this change makes it so that
we will just exit if the hardware is believed to be hung.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 80fba3f4341b1c98430bee620b507d3f5b7086cd
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:57 2010 -0800
ixgbe: Disable RSC when ITR setting is too high to allow RSC
RSC will flush its descriptors every time the interrupt throttle timer
expires. In addition there are known issues with RSC when the rx-usecs
value is set too low. As such we are forced to clear the RSC_ENABLED bit
and reset the adapter when the rx-usecs value is set too low.
However we do not need to clear the NETIF_F_LRO flag because it is used to
indicate that the user wants to leave the LRO feature enabled, and in fact
with this change we will now re-enable RSC as soon as the rx-usecs value is
increased and the flag is still set.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 73c4b7cdd25a8a769baf6dae5bc498400a9ddd93
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:57 2010 -0800
ixgbe: cleanup race conditions in link setup
This change makes it so that we perform link setup with interrupts
disabled. If the SFP has not been detected previously we will schedule the
SFP detection task to run in order to detect link. By doing this we avoid
the possibility of interrupts firing in the middle of our link setup during
ixgbe_up_complete.
In addition this change makes it so that the multi-speed fiber setup and SFP
setup are not mutually exclusive. The addresses issues seen in which a
link would only come up at 1G on some multi-speed fiber modules.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 7d637bcc8f461f19e1d018078792ec0cd9b07b1d
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:56 2010 -0800
ixgbe: add a state flags to ring
This change adds a set of state flags to the rings that allow them to
independently function allowing for features like RSC, packet split, and
TX hang detection to be done per ring instead of for the entire device.
This is accomplished by re-purposing the flow director reinit_state member
and making it a global state instead since a long for a single bit flag is
a bit wasteful.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 33cf09c9586a0dce472ecd2aac13e8140c9ed1a1
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:55 2010 -0800
ixgbe: move CPU variable from ring into q_vector, add ring->q_vector
This is the start of work to sort out what belongs in the rings and what
belongs in the q_vector. Items like the CPU variable for make much more
sense in the q_vector since the CPU is a per-interrupt thing rather than a
per ring thing.
I also added a back-pointer from the ring to the q_vector.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit c60fbb00f0400792adf873dbacd431885653b77d
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:54 2010 -0800
ixgbe: move adapter into pci_dev driver data instead of netdev
This change moves an adapter pointer into the private portion of the
pci_dev instead of a pointer to the netdev. The reason for this change is
because in most cases we just want the adapter anyway. In addition as we
start moving toward multiple netdevs per port we may want to move the
adapter pointer out of the netdevs entirely.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 01fa7d905fe9a5b045615fbde19e6c0f78063206
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:53 2010 -0800
ixgbe: remove residual code left over from earlier combining of TXDCTL
Missed some code that was left floating around in the DCB configuration
for the TXDCTL register. As a result the register was being messed with in
two different spots when we only needed to do the change once.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:52 2010 -0800
ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state
The main reason for this change is to keep the suspend/resume logic matched
up. The clear_interrupt_scheme function will disable MSI-X which will
effect the PCIe configuration space. Therefore we will want to do it before
we save state to avoid having the interrupt state restored by
pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via
ixgbe_setup_interrupt_scheme.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:51 2010 -0800
ixgbe: add a netdev pointer to the ring structure
This change places a netdev pointer directly into the ring structure. This
way we can avoid having to determine which netdev we are supposed to be
using and can just access the one on the ring directly.
As a result of this change further collapse of the code is possible by
dropping the adapter from ixgbe_alloc_rx_buffers, and the netdev pointer
from ixgbe_xmit_frame_ring_adv and ixgbe_maybe_stop_tx.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 5b7da51547cc3ab5461e45a8ee0ca73051416fda
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:50 2010 -0800
ixgbe: combine some stats into a union to allow for Tx/Rx stats overlap
This change moved some of the RX and TX stats into separate structures and
them placed those structures in a union in order to help reduce the size of
the ring structure.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit b6ec895ecd32c0070c3b2b17918c030275cd834d
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:49 2010 -0800
ixgbe: move device pointer into the ring structure
This change is meant to simplify DMA map/unmap by providing a device
pointer. As a result the adapter pointer can be dropped from many of
the calls.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 84ea2591e4a24775c2735511a1cc3cf88edd249d
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:49 2010 -0800
ixgbe: drop ring->head, make ring->tail a pointer instead of offset
This change drops ring->head since it is not used in any hot-path and can
easily be determined using IXGBE_[RT]DH(ring->reg_idx).
It also changes ring->tail into a true pointer so we can avoid unnecessary
pointer math to find the location of the tail.
In addition I also dropped the setting of head and tail in
ixgbe_clean_[rx|tx]_ring. The only location that should be setting the head
and tail values is ixgbe_configure_[rx|tx]_ring and that is only while the
queue is disabled.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit d5f398ed73522b9f76861af6553775c5851de0d0
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:48 2010 -0800
ixgbe: cleanup ixgbe_alloc_rx_buffers
This change re-orders alloc_rx_buffers to make better use of the packet
split enabled flag. The new setup should require less branching in the
code since now we are down to fewer if statements since we either are
handling packet split or aren't.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 8ad494b0e59950e2b4e587c32cb67a2452795ea0
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:47 2010 -0800
ixgbe: move GSO segments and byte count processing into ixgbe_tx_map
This change simplifies the work being done by the TX interrupt handler and
pushes it into the tx_map call. This allows for fewer cache misses since
the TX cleanup now accesses almost none of the skb members.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 4c0ec6544a0cd5e3eed08df2c14cf98185098abe
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Tue Nov 16 19:26:46 2010 -0800
ixgbe: remove unnecessary re-init of adapter on Rx-csum change
There is no need to reset the adapter when changing the Rx checksum
settings. Since the only change is a software flag we can disable it
without needing to reset the entire adapter.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 80ab193dce048e7b7afa43c99e69f508167e29ab
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 16 19:26:45 2010 -0800
ixgbe: DCB: credit max only needs to be gt TSO size for 82598
The maximum credits per traffic class only needs to be greater
then the TSO size for 82598 devices. The 82599 devices do not
have this requirement so only do this test for 82598 devices.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 16b61beb39f2446460f93c08d4d263dc24f22dd8
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Tue Nov 16 19:26:44 2010 -0800
ixgbe: DCB set PFC high and low water marks per data sheet specs
Currently the high and low water marks for PFC are being set
conservatively for jumbo frames. This means the RX buffers
are being underutilized in the default 1500 MTU. This patch
fixes this so that the water marks are set as described in
the data sheet considering the MTU size.
The equation used is,
RTT * 1.44 + MTU * 1.44 + MTU
Where RTT is the round trip time and MTU is the max frame size
in KB. To avoid floating point arithmetic FC_HIGH_WATER is
defined
((((RTT + MTU) * 144) + 99) / 100) + MTU
This changes how the hardware field fc.low_water and
fc.high_water are used. With this change they are no longer
storing the actual low water and high water markers but are
storing the required head room in the buffer. This simplifies
the logic and we do not need to account for the size of the
buffer when setting the thresholds.
Testing with iperf and 16 threads showed a slight uptick in
throughput over a single traffic class .1-.2Gbps and a reduction
in pause frames. Without the patch a 30 second run would show
~10-15 pause frames being transmitted with the patch ~2-5 are
seen. Test were run back to back with 82599.
Note RXPBSIZE is in KB and low and high water marks fields are
also in KB. However the FCRT* registers are 32B granularity and
right shifted 5 into the register,
(((rx_pbsize - water_mark) * 1024) / 32) << 5
is the most explicit conversion here we simplify
(rx_pbsize - water_mark) * 32 << 5 = (rx_pbsize - water_mark) << 10
This patch updates the PFC thresholds and legacy FC thresholds.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 66c87bd50ddae681ebedfda0d75e6e73ecd29ce7
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date: Tue Nov 16 19:26:43 2010 -0800
ixgbevf: Update Version String and Copyright Notice
Update version string and copyright notice.
Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 1a51502bddca7ac1e921d918b741ffd2bec149ed
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 16 19:26:42 2010 -0800
ixgbe: delay rx_ring freeing
"cat /proc/net/dev" uses RCU protection only.
Its quite possible we call a driver get_stats() method while device is
dismantling and freeing its data structures.
So get_stats() methods must be very careful not accessing driver private
data without appropriate locking.
In ixgbe case, we access rx_ring pointers. These pointers are freed in
ixgbe_clear_interrupt_scheme() and set to NULL, this can trigger NULL
dereference in ixgbe_get_stats64()
A possible fix is to use RCU locking in ixgbe_get_stats64() and defer
rx_ring freeing after a grace period in ixgbe_clear_interrupt_scheme()
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Reported-by: Tantilov, Emil S <emil.s.tantilov@xxxxxxxxx>
Tested-by: Ross Brattain <ross.b.brattain@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit c08512c761e7b9eaaab0e9167a389393f268e93c
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 15:57:58 2010 -0500
USB: improve uses of usb_mark_last_busy
This patch (as1434) cleans up the uses of usb_mark_last_busy() in
usbcore. The function will be called when a device is resumed and
whenever a usage count is decremented. A call that was missing from
the hub driver is added: A hub is used whenever one of its ports gets
suspended (this prevents hubs from suspending immediately after their
last child).
In addition, the call to disable autosuspend support for new devices
by default is moved from usb_detect_quirks() (where it doesn't really
belong) into usb_new_device() along with all the other runtime-PM
initializations. Finally, an extra pm_runtime_get_noresume() is added
to prevent new devices from autosuspending while they are being
registered.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fcc4a01eb8661226e80632327673f67bf6a5840b
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 15:57:51 2010 -0500
USB: use the runtime-PM autosuspend implementation
This patch (as1428) converts USB over to the new runtime-PM core
autosuspend framework. One slightly awkward aspect of the conversion
is that USB devices will now have two suspend-delay attributes: the
old power/autosuspend file and the new power/autosuspend_delay_ms
file. One expresses the delay time in seconds and the other in
milliseconds, but otherwise they do the same thing. The old attribute
can be deprecated and then removed eventually.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6ddf27cdbc218a412d7e993fdc08e30eec2042ce
Author: Ming Lei <tom.leiming@xxxxxxxxx>
Date: Mon Nov 15 15:57:30 2010 -0500
USB: make usb_mark_last_busy use pm_runtime_mark_last_busy
Since the runtime-PM core already defines a .last_busy field in
device.power, this patch uses it to replace the .last_busy field
defined in usb_device and uses pm_runtime_mark_last_busy to implement
usb_mark_last_busy.
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
Reviewed-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 045cac6b3b067a9286dabfb789f67ae4f433f88b
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date: Mon Nov 15 15:57:07 2010 -0500
USB: use sysfs_merge_group for power attributes
This patch (as1426) makes use of the new sysfs_merge_group() and
sysfs_unmerge_group() routines to simplify the handling of power
attributes for USB devices.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 63defa73c8c1193c1273474440c30d34c2524597
Author: Ming Lei <tom.leiming@xxxxxxxxx>
Date: Mon Nov 15 15:56:54 2010 -0500
USB: use the no_callbacks flag for interfaces
Call pm_runtime_no_callbacks to set no_callbacks flag for USB
interfaces. Since interfaces cannot be power-managed separately from
their parent devices, there's no reason for the runtime-PM core to
invoke any callbacks for them.
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
Reviewed-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f646cf94520e22cb11eb5d2e9a35b33bfe4bea1b
Author: Toshiharu Okada <toshiharu-linux@xxxxxxxxxxxxxxx>
Date: Thu Nov 11 18:27:57 2010 +0900
USB device driver of Topcliff PCH
This patch adds the USB device driver of EG20T(Topcliff) PCH.
EG20T PCH is the platform controller hub that is going to be used in
Intel's upcoming general embedded platform. All IO peripherals in
EG20T PCH are actually devices sitting on AMBA bus.
EG20T PCH has USB device I/F. Using this I/F, it is able to access system
devices connected to USB device.
Signed-off-by: Toshiharu Okada <toshiharu-linux@xxxxxxxxxxxxxxx>
Acked-by: MichaÅ? Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d8df0b611c66db3b7afd0678213979209616681a
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Fri Nov 12 14:29:29 2010 +0100
usb: gadget: f_fs: remove custom printk() wrappers
This commit removes custom printk() wrappers from the f_fs.c
file. They served little purpose above what pr_*() family of
macros provides. Only FVDBG() has been left but renamed to
pr_vdebug() to match other uses.
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5ab54cf7acf418573c9204371cf1ab3497c451ee
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Fri Nov 12 14:29:28 2010 +0100
usb: gadget: FunctionFS: fix typos and coding style
This commit changes FunctionFS as to make it more compliant
with coding style as well as fixes several typos.
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7189ba939ea0e74f73d7b30573b849c732835fc5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 12 13:38:02 2010 -0800
drivers/uwb: Use printf extension %pR for struct resource
Using %pR standardizes the struct resource output.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit cc7e6056f440796e028629d6d79a26fa20d457e8
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 19:04:49 2010 -0800
drivers/usb/gadget: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ce7eb32fc24a7380f55924360fa0c96297aa237e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 12:14:01 2010 -0800
drivers/usb/host/uhci-hcd.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c8c38de9d8002578599222296b90696745ac0fe3
Author: Deepak Sikri <deepak.sikri@xxxxxx>
Date: Wed Nov 10 14:33:18 2010 +0530
USB host: Adding USB ehci & ohci support for spear platform
This patch adds support for ehci and ohci controller in the SPEAr platform.
Changes since V2:
added clear_tt_buffer_complete in ehci_spear_hc_driver
Signed-off-by: Deepak Sikri <deepak.sikri@xxxxxx>
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 28d9cc7f21da6a70fc8c1516fa0ee5588572eb92
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Sat Nov 13 20:58:27 2010 +0530
ath9k_htc: Use macro for caldata array size
The calibration data variable size is based on the number of
channels available in the ath9k driver.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ef1b21f7eb074a8c8ddfea70ed70e988545c8d54
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Nov 12 08:47:07 2010 +0100
iwlwifi: kill elapsed_jiffies
Subtract of jiffies is fine even if one variable overwrap.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 70f3876f09ccf1f2819aee6caee9266b2c4b1622
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Nov 12 08:47:06 2010 +0100
iwlagn: simplify iwlagn_tx_skb
We can simplify length calculation in iwlagn_tx_skb, that function
is enough complex, without fuzz it more than necessary.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2cb7865648e44647a976875428c9dfd9d5553221
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Nov 12 08:47:05 2010 +0100
iwl3945: remove unused len_org variable
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8f0729b16ae354f9db89394fc1d2d65003455d56
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 15:07:23 2010 +0100
mac80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 885a46d0f7942d76c2f3860acb45f75237d3bb42
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 15:07:22 2010 +0100
cfg80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a619a4c0e1fd4e8c360c63d0df3fa0a401107d69
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Thu Nov 11 08:50:18 2010 +0200
mac80211: Add function to get probe request template for current AP
Chipsets with hardware based connection monitoring need to autonomically
send directed probe-request frames to the AP (in the event of beacon loss,
for example.)
For the hardware to be able to do this, it requires a template for the frame
to transmit to the AP, filled in with the BSSID and SSID of the AP, but also
the supported rate IE's.
This patch adds a function to mac80211, which allows the hardware driver to
fetch this template after association, so it can be configured to the hardware.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4e8c14e9587c38f4cce8049c766935629fdb8d46
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 03:18:38 2010 +0100
ath9k_hw: add a private op for configuring radar pulse detection
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 82b873afe83c81d9b1273a816bbdacb266f71a52
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 03:18:37 2010 +0100
ath9k: clean up tx buffer setup
Merge ath_tx_send_normal and ath_tx_send_ht_normal.
Move the paprd state initialization and sequence number assignment
to reduce the number of redundant checks.
This not only simplifies buffer allocation error handling, but also
removes a small inconsistency in the buffer HT flag.
This flag should only be set if the frame is also a QoS data frame.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 61117f01e79f7c0da86c23535bed757370f5885f
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 03:18:36 2010 +0100
ath9k: remove the tx info padding byte abuse
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f0c255a07fe8a4d450cce6355a22b73ee0e9e6e0
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 03:18:35 2010 +0100
ath9k: handle tx underrun in the driver instead of rate control
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1d666d8e05edf5891a7a4bd84a25f493f01dc71a
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Nov 11 03:18:34 2010 +0100
ath9k: remove the unnecessary private xretry tx flag
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7afbb2f07028183f50ae4f7ce4dab1f32b36cf48
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Wed Nov 10 11:43:51 2010 -0800
ath5k: Cleanup opmode setting logic.
An earlier review suggested moving the code in a small
method that was only called once inline. This patch
accomplishes that.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Acked-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6ee63f55c7754462a45315ac93027a1df60667c9
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:16 2010 -0800
ath9k_hw: Fix low throughput issue with AR93xx
TX underruns were noticed when RTS/CTS preceded aggregates.
This issue was noticed in ar93xx family of chipsets only.
The workaround involves padding the RTS or CTS length up
to the min packet length of 256 bytes required by the
hardware by adding delimiters to the fist descriptor of
the aggregate.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 39ec2997c374b528cdbf65099b6d6b8593a67f7f
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:15 2010 -0800
ath9k: Fix bug in delimiter padding computation
There is a roundng error in delimiter padding computation
which causes severe throughput drop with some of AR9003.
signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Cc:stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bc2068020bfa976efd425f3be590f58a012fd747
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:14 2010 -0800
ath9k_hw: Add helper function for interpolation
Also round off interpolated values this would improve power
accuracy by 0.5dB in some cases.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 15cbbc44cc4abaaebc37caf0ec9410a3f83d1deb
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:13 2010 -0800
ath9k_hw: Improve power control accuracy for AR9003
It is done for 5Ghz by adding three temperature slopes.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f4475a6e52fce8d951a96c763f36b835bf89fdec
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:12 2010 -0800
ath9k_hw: Enable strong signal detection for AR9003
Attenuation from eeprom is configured into attenuator control
register.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 52a0e2477dac2106bc1688cbe9615cdafc9deb7d
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:11 2010 -0800
ath9k_hw: Fix XPABIAS level configuration for AR9003
Improper configuration of 0x16288 and 0x16290 would affect transmission.
Cc:stable@xxxxxxxxxx
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3092354970381fb8b6439fb4def0c34632277ae9
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:10 2010 -0800
ath9k_hw: add eeprom templates for ar9003 family chipsets
We are currently using the default eeprom default and it doesn't
work properly for all ar9003 family chipsets. So add eeprom
templates for different versisons and select the eeprom table
based on the template version programmed in the eeprom.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3ceb801bffb62bc486f9662cd4dbca2cbdc6f5c7
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:09 2010 -0800
ath9k_hw: Fix paprd training frame failure.
paprd training frame fails in some rates. Fix the rate mask.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ef5a6a7573b7a12ced67dae155be8a909bc245d6
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:08 2010 -0800
ath9k_hw: Initialize 2GHz CTL properly.
The last 2GHz CTL was not being initialized, so power was being
set to 0 instead of 30dbm. Initialize to 30 like other CTLs.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b3dd6bc1f052ef3a754fa866743e4fda38522811
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Wed Nov 10 05:03:07 2010 -0800
ath9k_hw: Add new member into the eeprom structure.
Add eeprom base extension structures which are needed for
AR938x caliberation changes and gain calculation.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a9d85fbd3e5f7a0679e6276953cd23ac7bb72789
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date: Thu Nov 11 00:40:33 2010 -0800
ath9k_hw: Fix a reset failure on AR9382 (2x2).
AR9382 needs to be configured for the correct chain mask before
running AGC/TxIQ caliberation. Otherwise reset would fail.
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 72a801103f07182c0a4f3a761caa62b4ab8eb4e5
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Wed Nov 10 12:51:01 2010 +0900
ath5k: Add support for antenna configuration
Support setting the antenna configuration via cfg/mac80211. At the moment only
allow the simple pre-defined configurations we already have (fixed antenna A/B
or diversity), but more advanced settings are possible to implement.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 15d967532148a5fcda075282b82a271b6595a386
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Wed Nov 10 12:50:56 2010 +0900
mac80211: Add antenna configuration
Allow antenna configuration by calling driver's function for it.
We disallow antenna configuration if the wiphy is already running, mainly to
make life easier for 802.11n drivers which need to recalculate HT capabilites.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit afe0cbf87500f0585d217deb8c6fd329793a7957
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Wed Nov 10 12:50:50 2010 +0900
cfg80211: Add nl80211 antenna configuration
Allow setting of TX and RX antennas configuration via nl80211.
The antenna configuration is defined as a bitmap of allowed antennas to use.
This API can be used to mask out antennas which are not attached or should not
be used for other reasons like regulatory concerns or special setups.
Separate bitmaps are used for RX and TX to allow configuring different antennas
for receiving and transmitting. Each bitmap is 32 bit long, each bit
representing one antenna, starting with antenna 1 at the first bit. If an
antenna bit is set, this means the driver is allowed to use this antenna for RX
or TX respectively; if the bit is not set the hardware is not allowed to use
this antenna.
Using bitmaps has the benefit of allowing for a flexible configuration
interface which can support many different configurations and which can be used
for 802.11n as well as non-802.11n devices. Instead of relying on some hardware
specific assumptions, drivers can use this information to know which antennas
are actually attached to the system and derive their capabilities based on
that.
802.11n devices should enable or disable chains, based on which antennas are
present (If all antennas belonging to a particular chain are disabled, the
entire chain should be disabled). HT capabilities (like STBC, TX Beamforming,
Antenna selection) should be calculated based on the available chains after
applying the antenna masks. Should a 802.11n device have diversity antennas
attached to one of their chains, diversity can be enabled or disabled based on
the antenna information.
Non-802.11n drivers can use the antenna masks to select RX and TX antennas and
to enable or disable antenna diversity.
While covering chainmasks for 802.11n and the standard "legacy" modes "fixed
antenna 1", "fixed antenna 2" and "diversity" this API also allows more rare,
but useful configurations as follows:
1) Send on antenna 1, receive on antenna 2 (or vice versa). This can be used to
have a low gain antenna for TX in order to keep within the regulatory
constraints and a high gain antenna for RX in order to receive weaker signals
("speak softly, but listen harder"). This can be useful for building long-shot
outdoor links. Another usage of this setup is having a low-noise pre-amplifier
on antenna 1 and a power amplifier on the other antenna. This way transmit
noise is mostly kept out of the low noise receive channel.
(This would be bitmaps: tx 1 rx 2).
2) Another similar setup is: Use RX diversity on both antennas, but always send
on antenna 1. Again that would allow us to benefit from a higher gain RX
antenna, while staying within the legal limits.
(This would be: tx 0 rx 3).
3) And finally there can be special experimental setups in research and
development even with pre 802.11n hardware where more than 2 antennas are
available. It's good to keep the API simple, yet flexible.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
--
v7: Made bitmasks 32 bit wide and rebased to latest wireless-testing.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0e67d6cb753643fc076a90fa9309301b3fbfb8db
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 16:35:19 2010 -0800
drivers/net/wireless/b43legacy/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5b736d42bc51fe893fd7d4ceac34c727d23135e1
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 16:35:18 2010 -0800
drivers/net/wireless/b43/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7e559ec31c5625cf85bcb1ae0eb9f8f2a8da4a29
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 16:35:17 2010 -0800
drivers/net/wireless/ath/debug.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5cb56af29be8d12f74afcb2c1de91e51a577bd52
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Nov 9 19:25:56 2010 +0200
rndis_wlan: workaround poor scanning with BCM4320a
BCM4320a devices seem to sometimes do scanning pretty poorly. This can be
workaround by issuing new scan every second, while not yet connected. By this
new scanning method device catches beacons much faster. Fixes bug #20822.
Reported-by: LuÃs Picciochi <Pitxyoki@xxxxxxxxx>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b5257c952dda24df7078c74b7b811b44c6e49206
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date: Tue Nov 9 19:25:47 2010 +0200
rndis_wlan: workaround device not returning bss for currently connected AP
BCM4320a devices do not return bss for currently connected AP in bss-list,
althought this is required by NDIS specs. Missing bss leads to warning at
net/wireless/sme.c:__cfg80211_connect_result(), WARN_ON(!bss).
Workaround this by crafting bss manually with information we can read from
device. Workaround is only used when device bss-list does not return current
bss, and so is only used with BCM4320a devices and not newer BCM4320b ones.
Fixes bug #20152.
Reported-by: LuÃs Picciochi <Pitxyoki@xxxxxxxxx>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f23a478075659db8a4fd62fa6e264a8bb052cc5b
Author: Arik Nemtsov <arik@xxxxxxxxxx>
Date: Mon Nov 8 11:51:06 2010 +0200
mac80211: support hardware TX fragmentation offload
The lower driver is notified when the fragmentation threshold changes
and upon a reconfig of the interface.
If the driver supports hardware TX fragmentation, don't fragment
packets in the stack.
Signed-off-by: Arik Nemtsov <arik@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ca4a0831917d6541b45f03542257fcb20dc9cf4a
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Wed Nov 3 23:28:45 2010 +0100
ssb: return -ENOMEM on alloc fail (instead of CRC check's result)
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Wed Nov 3 22:06:26 2010 +0100
ssb: workarounds: be verbose about hacking SPROM revision, don't duplicate code
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d1f9e41d1d739cd4393840d35e7554f4a439a4f1
Author: Brian Cavagnolo <brian@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:53 2010 -0800
mwl8k: use const struct fw pointers throughout
This eliminates compiler warnings by doing things how the
firmware class expects.
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 99020471001dbbd6edf61f105368cb6667cc683d
Author: Brian Cavagnolo <brian@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:52 2010 -0800
mwl8k: make initial firmware load asynchronous
Introduce a firmware loading state machine to manage the process
of loading firmware asynchronously and completing initialization
upon success. The state machine attempts to load the preferred
firmware image. If that fails, and if an alternative firmware
image is available, it will attempt to load that one.
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 952a0e963fb02e50f4afbf502f7d468a8fe2b0fa
Author: Brian Cavagnolo <brian@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:51 2010 -0800
mwl8k: add API version checking for AP firmware
The AP firmware specifies an API version in the GET_HW_SPEC
command response. Currently, the driver only supports AP
firmware for the 8366, and only supports API v1. In the future,
if higher API version firmwares emerge (possibly for different
chips), different ops can be selected based on the reported API
version.
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0863ade8d6bde1d151f75720d999ff27f9fe3533
Author: Brian Cavagnolo <brian@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:50 2010 -0800
mwl8k: choose proper firmware image as directed by user
The mwl8k can operate in AP or STA mode, depending on the
firmware image that is loaded. By default, STA firmware is
loaded. Allow the user to override this default mode at
module load time. This saves an unnecessary firmware reload
for users only interested in AP mode.
Also, the firmware image can be swapped to meet the user's
add_interface request. For example, suppose the STA
firmware is loaded, no STA interface has been added, and the
user adds an AP interface. In this case, the AP firmware
will be loaded to meet the request.
Based on contributions from Pradeep Nemavat <pnemavat@xxxxxxxxxxx>,
Yogesh Powar <yogeshp@xxxxxxxxxxx>, and
Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>.
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3cc7772c0a3cc193fa9873816168bd34d4f16837
Author: Brian Cavagnolo <brian@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:49 2010 -0800
mwl8k: factor out firmware loading and hw init code
This is in preparation for supporting different fw images for
different interface types, and for supporting asynchronous
firmware loading.
Based on a patch from Pradeep Nemavat <pnemavat@xxxxxxxxxxx>
and Yogesh Powar <yogeshp@xxxxxxxxxxx>
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 41fdf0974d9eb81215cb578211a6d8f8a022a9eb
Author: Nishant Sarmukadam <nishants@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:48 2010 -0800
mwl8k: rf_tx_power cmd not supported by AP firmware APIv1
APIv1 AP firmware does not support the RF_TX_POWER command. It
supports the similar TX_POWER command.
Signed-off-by: Pradeep Nemavat <pnemavat@xxxxxxxxxxx>
Signed-off-by: Nishant Sarmukadam <nishants@xxxxxxxxxxx>
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb
Author: Brian Cavagnolo <brian@xxxxxxxxxxx>
Date: Fri Nov 12 17:23:47 2010 -0800
mwl8k: revert unnecessary modification of tx descriptor
This reverts change 783391c443728febc669e40597193308460e7b4f.
The stabilized AP v1 firmware uses the same tx descriptor as
the STA firmware.
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ae63a33ec9b598b3454cf0d29077fa17b616c42a
Author: Deepak Saxena <dsaxena@xxxxxxxxxx>
Date: Sun Oct 31 13:40:33 2010 +0000
libertas: EHS_REMOVE_WAKEUP is not always supported
Certain firmware versions, particularly the 8388 found on the XO-1,
do not support the EHS_REMOVE_WAKEUP command that is used to disable
WOL. Sending this command to the card will return a failure that
would get propagated up the stack and cause suspend to fail.
Instead, fall back to an all-zero wakeup mask.
This fixes http://dev.laptop.org/ticket/9967
Signed-off-by: Deepak Saxena <dsaxena@xxxxxxxxxx>
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
[includes fixups by Paul Fox]
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cf43298864fdfd687202db8c736473522bfceb98
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Sun Oct 31 13:40:12 2010 +0000
libertas: don't block usb8388 suspend if no wakeup conditions are set
This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
prevent suspend of the whole system if no wakeup params are set.
In the case of the usb8388 we do want to keep the card powered up even
if there are no wakeup params. This is because it will continue acting
as a mesh node.
If the mesh is disabled, it would indeed make more sense to power down
the card during suspend, as the equivalent hunk does for the SD interface.
But that's a separate task; for now just restore the previous behaviour.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Acked-by: Dan Williams <dcbw@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a80c49dbb6cd389fd5b0d79f850b56322475d00b
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Mon Nov 15 21:11:12 2010 +0100
serial8250: Mark console as CON_ANYTIME
While trying to debug a cpu-hotplug issue I noticed printk() stopped
working once the cpu got marked offline, since the 8250 serial console
doesn't have any per-cpu resources the CON_ANYTIME bit is the safe and
documented way to make it work again.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c540ee70e49b573535c7ddfd0e9a0fc9d549c8b7
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 16 12:50:19 2010 -0800
sparc64: Delete prom_setcallback().
Unused.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 83abd0d897ad3b7d064c8d8594ec5cc8520d6646
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Fri Nov 12 10:46:23 2010 +0000
serial: ifx6x60: Fix missing include for msleep
Noted by Stephen Rothwell
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8ddbe5edfb33e2186a5c83925d657914f643e09a
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Thu Nov 11 22:28:58 2010 +0000
serial: ifx6x60: The IFX requires SPI
Correct the KConfig as noted by Greg.
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e44dcb6c377529805bbaae505d5b333daab69111
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Fri Nov 12 19:47:47 2010 +0100
serial: mpc52xx: make printout for type more generic
The printout for the type should be just "5xxx", so 512x users won't
wonder why they have a mpc52xx-type UART.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 597c606f560cf7ef6029152fa7574bddbfb0252f
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 4 16:20:21 2010 +0100
parisc: cleanup console handling
* use newly added for_each_console for iterating consoles
* add proper console locking
* do not initialize tmp twice
* no need to declare console_drivers, it's already done in console.h
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Acked-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx>
Cc: linux-parisc@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 23308ba54dcdb54481163bfb07dd8aeca76a7a2e
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 4 16:20:24 2010 +0100
console: add /proc/consoles
It allows users to see what consoles are currently known to the system
and with what flags.
It is based on Werner's patch, the part about traversing fds was
removed, the code was moved to kernel/printk.c, where consoles are
handled and it makes more sense to me.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> [cleanups]
Signed-off-by: "Dr. Werner Fink" <werner@xxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 281e66057757ddf32ffe679a08f9634fa9f70a7a
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 4 16:20:22 2010 +0100
VIDEO: xen-fb, switch to for_each_console
Use newly added for_each_console for iterating consoles.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Cc: virtualization@xxxxxxxxxxxxxx
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx
Cc: linux-fbdev@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3dfbd044d0d99cad2fe50e4f6c79845703fa0558
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 4 16:20:23 2010 +0100
TTY: include termios.h in tty_driver.h
We reference termios and termiox in tty_driver.h, but we do not include
linux/termios.h where these are defined. Add the #include properly.
Otherwise when we include tty_driver.h, we get compile errors.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <gregkh@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a75d946f42ae1771424a9582129fc5182ff48a1b
Author: Jiri Slaby <jslaby@xxxxxxx>
Date: Thu Nov 4 16:20:20 2010 +0100
console: move for_each_console to linux/console.h
Move it out of printk.c so that we can use it all over the code. There
are some potential users which will be converted to that macro in next
patches.
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2e3161390130f50fdbb4b989c667f42e5008107f
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Nov 13 11:24:22 2010 +0300
Staging: bcm: signedness bug in InitCardAndDownloadFirmware()
status is used to store negative error codes throughout. The only place
where this is a runtime bug is if create_worker_threads() fails.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f05321cca53da7c7abad4bc726699e9f27bf4922
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Nov 13 07:37:49 2010 +0300
Staging: bcm: signedness bug in StoreSFParam()
wrm() returns negative error codes so "ret" needs to be signed here.
There was place where wrm() returned positive EACCES instead of
negative -EACCES so I fixed that as well. Also a few checkpatch.pl
issues.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0ebce2696305c3f49f54f3af25cb966ef1b24f71
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Sat Nov 13 08:44:35 2010 -0800
staging: fix iio/gyro typos, build errors
Typo causes build errors. Did anyone even build this driver?
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 59a126418b96e9f5337d431e6024a8d50bbd6e4e
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Nov 13 12:05:32 2010 +0300
Staging: iio/dds: double locking bugs
This is a static checker patch and I don't have this hardware.
This code is unusual because while I've often seen a double lock, this
is the first time I've seen code that takes a lock 11 times in a row. I
feel like I must have missed something. But I've looked very carefully
I don't see any way the original code is correct. Does spi_sync()
somehow release the lock in a way that I can't see? Even if it does,
the locking would still be wrong.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a1a26e492c4a90466cb3e064ccf69db4dd66d63a
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Nov 13 11:34:16 2010 +0300
Staging: cptm1217: move free under dereference
We dereference "ts" in the printk so move the kfree() down a line.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 62af33ec6e73d658720ea1190861c8c0609a94b3
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Thu Nov 11 10:44:22 2010 -0800
staging/easycap: make module params private/static, fix build
The easycap driver has module parameters (bars, gain, & debug)
with global scope that intrude on the kernel namespace and cause
build problems. Change the names of them to be driver-specific
and make 2 of them static.
drivers/built-in.o:(.bss+0x97c00): multiple definition of `debug'
ld: Warning: size of symbol `debug' changed from 58 in arch/x86/built-in.o to 4 in drivers/built-in.o
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a65e659d97bc652b2e14a63beaf9efbf5d4e18b2
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date: Fri Nov 12 14:47:02 2010 -0800
staging: fix ste_rmi4 build, depends on INPUT
The synaptics_i2c_rmi4 driver uses input_*() interfaces,
so it should depend on INPUT to fix its build errors:
ERROR: "input_event" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_free_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_register_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_set_abs_params" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_allocate_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_unregister_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: naveen.gaddipati@xxxxxxxxxxxxxx, js.ha@xxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 44d4a4f784d0e1a50b3f1fc52bd6a661846abdc5
Author: David Brown <davidb@xxxxxxxxxxxxxx>
Date: Fri Nov 12 13:49:53 2010 -0800
msm: make constant unsigned long to correct format warning
Define VMALLOC_END as an unsigned long to match expected type.
Eliminates a warning:
arch/arm/mm/init.c: In function 'mem_init':
arch/arm/mm/init.c:606: warning: format '%08lx' expects type
'long unsigned int', but argument 12 has type 'unsigned int'
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 3251627c943f1cfc5bfad7c38d4e8d85cf44c6d8
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Sat Nov 13 11:58:26 2010 +0300
Staging: intel_sst: fix memory leak
The original code set "str_info->decode_ibuf" to NULL so the kfree() is
no-op.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Harsha Priya <priya.harsha@xxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 832855354b5863d141ecfc563e78063978c6f29f
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Nov 12 08:11:13 2010 +0300
Staging: rtl8712: signedness bug in init
PollingCnt is 20 and that means we loop 20 times and then run the
timeout code. After the end of the loop PollingCnt should be -1 but
because it's an unsigned char, it's actually 255 and the timeout
code never runs.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f36d83a8cb7224f45fdfa1129a616dff56479a09
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Sat Nov 13 13:01:56 2010 -0600
staging: rtl8187se: Change panic to warn when RF switch turned off
This driver issues a kernel panic over conditions that do not
justify such drastic action. Change these to log entries with
a stack dump.
This patch fixes the system crash reported in
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/674285.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Reported-and-Tested-by: Robie Basik <rb-oss-3@xxxxxxxxxxxxxxxx>
Cc: Stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 61838261edaf621d1e8ee4ea9d7c052f7d783ca4
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Sat Nov 13 19:46:50 2010 +0100
staging: comedi: fix memory leak
Instead of freeing outBuffer, inBuffer gets freed twice.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ebba26f4a8d0c137a2d365b6bded2a0d7fcd1d06
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Nov 12 08:04:43 2010 +0300
Staging: quickstart: free after input_unregister_device()
input_unregister_device() releases "quickstart_input" so the
input_free_device() is a double free. Also I noticed that there is a
memory leak if the call to input_register_device() fails.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5fb5d38fc268b8285125b213b9b2ded9322a371c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date: Fri Nov 12 08:08:35 2010 +0300
Staging: speakup: free after input_unregister_device()
input_unregister_device() frees the device so the call to
input_free_device() is a double free.
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d2c5d2145f127fffb7498bee943a480de66910ff
Author: David Brown <davidb@xxxxxxxxxxxxxx>
Date: Fri Nov 12 13:49:52 2010 -0800
msm: smd: ifdef adjustment to remove unused variables
Put some variables inside of the same ifdef as the code that uses
them.
arch/arm/mach-msm/smd_debug.c: In function 'smsm_print_sleep_info':
arch/arm/mach-msm/smd_debug.c:274: warning: unused variable 'int_info'
arch/arm/mach-msm/smd_debug.c:273: warning: unused variable 'gpio'
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
[dwalker@xxxxxxxxxxxxxx: changed the commit text a little.]
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit f7b5f55ac1623dfde24ef5319ad77c1746645f3f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 16 12:24:16 2010 -0800
sparc64: Unexport prom_service_exists().
Only used by functions in misc_64.c so make it private
to that file.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5d1394bb6b781df8148565783b0671f9b11500b7
Author: David Brown <davidb@xxxxxxxxxxxxxx>
Date: Fri Nov 12 13:49:51 2010 -0800
msm: sirc: remove some unused variables
Eliminate some unreferenced variables.
arch/arm/mach-msm/sirc.c:43: warning: 'save_type' defined but not used
arch/arm/mach-msm/sirc.c:44: warning: 'save_polarity' defined but not used
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
[dwalker@xxxxxxxxxxxxxx: changed the commit text a little.]
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit 9be58f317d79278afc23186d861ada774cf386ea
Author: David Brown <davidb@xxxxxxxxxxxxxx>
Date: Fri Nov 12 13:49:27 2010 -0800
msm: smd: Reduce driver log chatter
The MSM smd driver logs numerous messages during startup that are
useful for debug purposes. Change some of these to pr_debug() to
match their purpose, and remove others that aren't really useful.
Cc: Brian Swetland <swetland@xxxxxxxxxx>
Cc: Arve Hjønnevåg <arve@xxxxxxxxxxx>
Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx>
commit b148246912bea92bde2a0cba125ca94f1f776b12
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 16 12:23:20 2010 -0800
sparc: Kill prom devops_{32,64}.c
Completely unused.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit defc19cebc7f700cb05226f0c4496b9d50c84643
Author: Tushar Mehta <tushariiitb@xxxxxxxxx>
Date: Tue Nov 16 12:13:50 2010 +0530
Staging: autofs: fix coding style issue in dirhash.c
This is a patch to the dirhash.c file that fixes up a number of issues
found by the checkpatch.pl tool
Signed-off-by: Tushar Mehta <tushariiitb@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 17d70d6df0c4ea7a203b444001572a91ad9c2bef
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 16 12:11:15 2010 -0800
sparc: Remove prom_pathtoinode()
Unused.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ce05a94efaf71d562eeefd30d6bbc2ab42b06bac
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 16 12:08:23 2010 -0800
sparc64: Delete prom_puts() unused.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0ff36f69bd3e7846557880fe934dd0cdeee6a29e
Author: Brandon Philips <brandon@xxxxxxxx>
Date: Mon Nov 15 11:55:33 2010 -0800
staging: hv: add explanation of no-op set_multicast_list
I was going to remove netvsc_set_multicast_list() so I think it is worth
adding a comment since it isn't immediately clear why you would want
this.
Signed-off-by: Brandon Philips <brandon@xxxxxxxx>
Acked-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e33196e108197e4a1f1a5331dc7740ad9263f4f5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 13:12:32 2010 -0800
drivers/staging: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 345594d6ef696b8ad4b96cffe462c6cde2f27292
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Nov 15 12:14:00 2010 -0800
drivers/staging: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 859171ca92f2865453b4b2e17bf679c67044a833
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 19:04:48 2010 -0800
drivers/staging: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ae0d9ebaffe47ed553e715ab5243660c33b6338c
Author: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Date: Sun Nov 14 13:36:23 2010 +0200
staging: brcm80211: brcmfmac: remove PXA SDIO controller binding
Signed-off-by: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5b93a8b8e0514ebacb49a50c67a8846139bcd1bd
Author: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Date: Sun Nov 14 13:36:21 2010 +0200
staging: brcm80211: remove unused osl_pkt{get,free}_static
Signed-off-by: Mike Rapoport <mike.rapoport@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a1dc08b7d95817faea5e6a358e22c6185b84163a
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 12 18:10:17 2010 -0800
staging: brcm80211: get rid of last bit of pci configspace workaround.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit baebc160c12ba88baf201d35ecc22f1e250aad3f
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 12 15:28:30 2010 -0800
staging: brcm80211: simplify pci_config_read/write osl routines.
Start simplifying osl with goal of purging it entirely.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f96c377ead5ed308f0cf18b9156f86fdf207a288
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Sat Nov 13 19:43:27 2010 +0100
staging: comedi: fix typo in error message
Fix typo in error message of dux commands allocation.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e08e02faff68d33c938fd0322c0f8318a25ddb39
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:54 2010 +0000
staging: vme: ca91cx42: mark the registers' base address pointer as __iomem
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e20cbcf199e2c3e4a4822e890726c49b70a4d280
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:47 2010 +0000
staging: vme: tsi148: mark the registers' base address pointer as __iomem
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0599726793d6dca6bd171cd4e497f9aac21e8f0c
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:40 2010 +0000
staging: vme: mark struct vme_master_resource's base address pointer as __iomem
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1a85f2073d99080ea70962f767edca479c768b6e
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:34 2010 +0000
staging: vme_user: mark user-space buffers with __user
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
[martyn.welch@xxxxxx: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0a81a0f768e5bb0c32db6e44440c5b7c1b4658e7
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:27 2010 +0000
staging: vme_user: remove __iomem marking from kern_buf and derivates
kern_buf is not iomem; it comes from kmalloc and is directly
dereferenced.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c949231838006d7de4ad38be38d9e112826862da
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:21 2010 +0000
staging: vme_user: use an unsigned int for counting the number of kparams
unsigned int is what struct kparam_array internally uses.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b9cc293486e27f4d29a9813da6ebcb8574071dfa
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:14 2010 +0000
staging: vme_user: declare private variables as static
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
[martyn.welch@xxxxxx: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit efbb979d1b31638a95d76b5acf65cf00a3213fe4
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:07 2010 +0000
staging: vme: ca91cx42: declare static functions as such
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
[martyn.welch@xxxxxx: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5ade6c4d79377efc371ac89db07e4f6594d1286a
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:15:00 2010 +0000
staging: vme: tsi148: declare static functions as such
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
[martyn.welch@xxxxxx: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 84295e0b243cba070fcfe8be825c39827ea022e6
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:54 2010 +0000
staging: vme: tsi148: remove unreachable line
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a82ad05ecd9dbd909509a332d3aa5f4ac439a054
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:47 2010 +0000
staging: vme: tsi148: fix warning in free_irq
The cookie passed to request_irq isn't the same as the one passed
to free_irq, which results in the following warning:
[ 63.243533] WARNING: at kernel/irq/manage.c:899 __free_irq+0x9b/0x17d()
[ 63.243533] Hardware name:
[ 63.243533] Trying to free already-free IRQ 17
[ 63.243533] Modules linked in: vme_tsi148(-) vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: scsi_wait_scan]
[ 63.243533] Pid: 2013, comm: rmmod Not tainted 2.6.35 #2
[ 63.243533] Call Trace:
[ 63.243533] [<ffffffff81036ea3>] warn_slowpath_common+0x80/0x98
[ 63.243533] [<ffffffff81036f4f>] warn_slowpath_fmt+0x41/0x43
[ 63.243533] [<ffffffff810678c4>] __free_irq+0x9b/0x17d
[ 63.243533] [<ffffffff810679d9>] free_irq+0x33/0x4e
[ 63.243533] [<ffffffffa004a897>] tsi148_irq_exit+0x6b/0x70 [vme_tsi148]
[...]
[ 63.243533] ---[ end trace bbf92311d969efb4 ]---
Fix it by passing the same cookie to both functions.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
[martyn.welch@xxxxxx: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b12ef0b1f5d0358bc13cc716155d6e9b5584af48
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:40 2010 +0000
staging: vme: tsi148: remove double freeing of the IRQ in .remove
tsi148_irq_exit is called twice in .remove, which causes an oops.
Remove the second call, which apart from being redundant cannot
possibly work; the CR/CSR space has been already unmapped.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b558ba2f356c28269de179c4f7f6f179a4fa6a1d
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:34 2010 +0000
staging: vme: tsi148: use list_for_each_safe when deleting resources in .remove
This fixes an oops when removing the module.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit db6d8fc5596ef866e64e9a7eef96bacdc6e51e11
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:27 2010 +0000
staging: vme: fix bogus clearing of the bus number in vme_free_bus_num
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c0779fd01df76b3097cc77e3a404e8bb067e5628
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:20 2010 +0000
staging: vme_user: remove unreachable line
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 55db50205adaf14db1bda07d0931b647b794de2f
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:14 2010 +0000
staging: vme_user: return the appropriate error code when module_init fails
When init_module fails, 0 is returned anyway; the module is then installed
and oopses when we try to remove it:
[ 3236.368009] WARNING: at drivers/base/driver.c:262 driver_unregister+0x36/0x6f()
[ 3236.368012] Hardware name:
[ 3236.368014] Unexpected driver unregister!
[ 3236.368016] Modules linked in: vme_user(-) vme_tsi148 vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: vme]
[ 3236.368027] Pid: 16162, comm: rmmod Not tainted 2.6.35 #2
[ 3236.368029] Call Trace:
[ 3236.368037] [<ffffffff81036ea3>] warn_slowpath_common+0x80/0x98
[ 3236.368044] [<ffffffff81060a65>] ? __try_stop_module+0x0/0x58
[ 3236.368049] [<ffffffff81036f4f>] warn_slowpath_fmt+0x41/0x43
[ 3236.368054] [<ffffffff81060a65>] ? __try_stop_module+0x0/0x58
[ 3236.368059] [<ffffffff811e8f78>] driver_unregister+0x36/0x6f
[ 3236.368066] [<ffffffffa004aa44>] vme_unregister_driver+0xd/0xf [vme]
[ 3236.368072] [<ffffffffa00616c8>] vme_user_exit+0x10/0x1e [vme_user]
[ 3236.368076] [<ffffffff810612c1>] sys_delete_module+0x1ba/0x226
[ 3236.368082] [<ffffffff812d6e14>] ? do_page_fault+0x25d/0x28a
[ 3236.368088] [<ffffffff8100202b>] system_call_fastpath+0x16/0x1b
[ 3236.368092] ---[ end trace cab6d88ebc44c1de ]---
The appended fixes it by returning the appropriate error code in module_init
whenever something goes wrong, thus cancelling the insertion of the module.
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 886953e9b70bcb6913716b49bdf21b69450a7cd6
Author: Emilio G. Cota <cota@xxxxxxxxx>
Date: Fri Nov 12 11:14:07 2010 +0000
staging: vme: style: convert '&(foo)' to '&foo'
done with
find . -name '*.c' | xargs perl -p -i -e 's/&\(([^()]+)\)/&$1/g'
Signed-off-by: Emilio G. Cota <cota@xxxxxxxxx>
Acked-by: Martyn Welch <martyn.welch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9d1e5e40d6cac4bf7008e04c202d71918455ca11
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 3 05:56:38 2010 +0000
mpc52xx: cleanup locking
commit 1e4e0767ecb1 (Fix locking on fec_mpc52xx driver) assumed IRQ are
enabled when an IRQ handler is called.
It is not the case anymore (IRQF_DISABLED is deprecated), so we can use
regular spin_lock(), no need for spin_lock_irqsave().
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Tested-by: Jean-Michel Hautbois <jhautbois@xxxxxxxxx>
Cc: Asier Llano <a.llano@xxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7f55f13c2ca82f6d998502df70f24deb550e5e0c
Author: Steven Rostedt <rostedt@xxxxxxxxxxx>
Date: Thu Nov 11 11:29:25 2010 -0500
staging: ft1000: Copy from user into correct data
While doing a ktest.pl I used a MIN_CONFIG that had STAGING enabled, and
a randconfig with CONFIG_DEBUG_STRICT_USER_COPY_CHECKS enabled caught
the following bug:
In file included from /home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess.h:571:0,
from /home/rostedt/work/autotest/nobackup/linux-test.git/include/linux/poll.h:14,
from /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:32:
In function 'copy_from_user',
inlined from 'ft1000_ChIoctl' at /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:702:36:
/home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess_32.h:212:26: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct
Looking at the code it was obvious what the problem was. The pointer
dpram_data was being allocated but the address was being written to.
Looking at the comment above the code shows that it use to write into an
element of that pointer where the '&' is appropriate. But now that it
writes to the pointer itself, we need to remove the '&' otherwise we
write over the pointer and not into the data it points to.
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e72115bce326dc893bc1db96db72059a6a08148c
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Fri Nov 12 10:27:44 2010 +0100
staging: ft1000: Fix error goto statements.
With commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95 there
was intruduced error which lead to stopping uninitialized
kthread which leads to kernel panics.
This patch fix problems with common entry point in correct
way.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2018845b6a169f75341f8e68ad1089cb6697cf24
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:23:33 2010 -0800
Staging: line6: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Markus Grabner <grabner@xxxxxxxxxxxxx>
Cc: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0281b490dd7b96990724f4a15842c55657699aed
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:22:43 2010 -0800
Staging: zram: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit cc9ca9dfddda46b1802d325891a69d7efdbe1f1e
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:21:36 2010 -0800
Staging: udlfb: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Bernie Thompson <bernie@xxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 90c05b97fdec8d2196e420d98f774bab731af7aa
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:21:03 2010 -0800
Staging: samsung-laptop: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1d904e8950c86e670ace237eaea1d48cd81e94df
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:19:53 2010 -0800
Staging: iio: adis16220: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Jonathan Cameron <jic23@xxxxxxxxx>
Cc: Barry Song <Barry.Song@xxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3bad28ec006ad6ab2bca4e5103860b75391e3c9d
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:18:33 2010 -0800
Staging: frontier: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: David Taht <d@xxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b178bb3dfc30d9555bdd2401e95af98e23e83e10
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 16 05:56:04 2010 +0000
net: reorder struct sock fields
Right now, fields in struct sock are not optimally ordered, because each
path (RX softirq, TX completion, RX user, TX user) has to touch fields
that are contained in many different cache lines.
The really critical thing is to shrink number of cache lines that are
used at RX softirq time : CPU handling softirqs for a device can receive
many frames per second for many sockets. If load is too big, we can drop
frames at NIC level. RPS or multiqueue cards can help, but better reduce
latency if possible.
This patch starts with UDP protocol, then additional patches will try to
reduce latencies of other ones as well.
At RX softirq time, fields of interest for UDP protocol are :
(not counting ones in inet struct for the lookup)
Read/Written:
sk_refcnt (atomic increment/decrement)
sk_rmem_alloc & sk_backlog.len (to check if there is room in queues)
sk_receive_queue
sk_backlog (if socket locked by user program)
sk_rxhash
sk_forward_alloc
sk_drops
Read only:
sk_rcvbuf (sk_rcvqueues_full())
sk_filter
sk_wq
sk_policy[0]
sk_flags
Additional notes :
- sk_backlog has one hole on 64bit arches. We can fill it to save 8
bytes.
- sk_backlog is used only if RX sofirq handler finds the socket while
locked by user.
- sk_rxhash is written only once per flow.
- sk_drops is written only if queues are full
Final layout :
[1] One section grouping all read/write fields, but placing rxhash and
sk_backlog at the end of this section.
[2] One section grouping all read fields in RX handler
(sk_filter, sk_rcv_buf, sk_wq)
[3] Section used by other paths
I'll post a patch on its own to put sk_refcnt at the end of struct
sock_common so that it shares same cache line than section [1]
New offsets on 64bit arch :
sizeof(struct sock)=0x268
offsetof(struct sock, sk_refcnt) =0x10
offsetof(struct sock, sk_lock) =0x48
offsetof(struct sock, sk_receive_queue)=0x68
offsetof(struct sock, sk_backlog)=0x80
offsetof(struct sock, sk_rmem_alloc)=0x80
offsetof(struct sock, sk_forward_alloc)=0x98
offsetof(struct sock, sk_rxhash)=0x9c
offsetof(struct sock, sk_rcvbuf)=0xa4
offsetof(struct sock, sk_drops) =0xa0
offsetof(struct sock, sk_filter)=0xa8
offsetof(struct sock, sk_wq)=0xb0
offsetof(struct sock, sk_policy)=0xd0
offsetof(struct sock, sk_flags) =0xe0
Instead of :
sizeof(struct sock)=0x270
offsetof(struct sock, sk_refcnt) =0x10
offsetof(struct sock, sk_lock) =0x50
offsetof(struct sock, sk_receive_queue)=0xc0
offsetof(struct sock, sk_backlog)=0x70
offsetof(struct sock, sk_rmem_alloc)=0xac
offsetof(struct sock, sk_forward_alloc)=0x10c
offsetof(struct sock, sk_rxhash)=0x128
offsetof(struct sock, sk_rcvbuf)=0x4c
offsetof(struct sock, sk_drops) =0x16c
offsetof(struct sock, sk_filter)=0x198
offsetof(struct sock, sk_wq)=0x88
offsetof(struct sock, sk_policy)=0x98
offsetof(struct sock, sk_flags) =0x130
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c31504dc0d1dc853dcee509d9999169a9097a717
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Nov 15 19:58:26 2010 +0000
udp: use atomic_inc_not_zero_hint
UDP sockets refcount is usually 2, unless an incoming frame is going to
be queued in receive or backlog queue.
Using atomic_inc_not_zero_hint() permits to reduce latency, because
processor issues less memory transactions.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 213b15ca818adf7766cd7162c2159a6ecdd3bab8
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 11 09:42:45 2010 +0000
vlan: remove ndo_select_queue() logic
Now vlan are lockless, we dont need special ndo_select_queue() logic.
dev_pick_tx() will do the multiqueue stuff on the real device transmit.
Suggested-by: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 590b0b9754bd8928926bae7194b6da7ead9bda3b
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 11:17:01 2010 -0800
Staging: asus_oled: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Jakub Schmidtke <sjakub@xxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4af429d29b341bb1735f04c2fb960178ed5d52e7
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 10 23:42:00 2010 +0000
vlan: lockless transmit path
vlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from vlan_rx_stats to vlan_pcpu_stats.
Note : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan
device)
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8ffab51b3dfc54876f145f15b351c41f3f703195
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 10 21:14:04 2010 +0000
macvlan: lockless tx path
macvlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from rx_stats to pcpu_stats.
Note : this reverts commit 2c11455321f37 (macvlan: add multiqueue
capability)
Note : rx_errors converted to a 32bit counter, like tx_dropped, since
they dont need 64bit range.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Cc: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Acked-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 491acf0032c08a74a4c88032ca1c03b498bfec37
Merge: 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b e53beacd23d9cb47590da6a7a7f6d417b941a994
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 16 10:44:50 2010 -0800
Staging: Merge 2.6.37-rc2 into staging-next
This was necessary in order to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
drivers/staging/bcm/Bcmchar.c
drivers/staging/intel_sst/intel_sst_app_interface.c
All should be resolved now.
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Nov 16 18:45:39 2010 +0100
perf: Rename 'perf trace' to 'perf script'
Free the perf trace name space and rename the trace to 'script' which is a
better match for the scripting engine.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Version 4 of this patch.
Change notes:
1) Removed extra memset. Didn't think kcalloc added a GFP_ZERO the way kzalloc did :)
Summary:
It was shown to me recently that systems under high load were driven very deep
into swap when tcpdump was run. The reason this happened was because the
AF_PACKET protocol has a SET_RINGBUFFER socket option that allows the user space
application to specify how many entries an AF_PACKET socket will have and how
large each entry will be. It seems the default setting for tcpdump is to set
the ring buffer to 32 entries of 64 Kb each, which implies 32 order 5
allocation. Thats difficult under good circumstances, and horrid under memory
pressure.
I thought it would be good to make that a bit more usable. I was going to do a
simple conversion of the ring buffer from contigous pages to iovecs, but
unfortunately, the metadata which AF_PACKET places in these buffers can easily
span a page boundary, and given that these buffers get mapped into user space,
and the data layout doesn't easily allow for a change to padding between frames
to avoid that, a simple iovec change is just going to break user space ABI
consistency.
So I've done this, I've added a three tiered mechanism to the af_packet set_ring
socket option. It attempts to allocate memory in the following order:
1) Using __get_free_pages with GFP_NORETRY set, so as to fail quickly without
digging into swap
2) Using vmalloc
3) Using __get_free_pages with GFP_NORETRY clear, causing us to try as hard as
needed to get the memory
The effect is that we don't disturb the system as much when we're under load,
while still being able to conduct tcpdumps effectively.
Tested successfully by me.
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Maciej Żenczykowski <zenczykowski@xxxxxxxxx>
Reported-by: Maciej Żenczykowski <zenczykowski@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 020f01ebd04f3429c32586d90598c9f59e54ca7d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Tue Nov 9 14:35:16 2010 +0000
drivers/isdn/mISDN: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3654654f7aa79a37dde130afb7409c55b11807e7
Author: Jan Engelhardt <jengelh@xxxxxxxxxx>
Date: Tue Nov 16 09:52:32 2010 -0800
netlink: let nlmsg and nla functions take pointer-to-const args
The changed functions do not modify the NL messages and/or attributes
at all. They should use const (similar to strchr), so that callers
which have a const nlmsg/nlattr around can make use of them without
casting.
While at it, constify a data array.
Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Mon Nov 15 20:29:21 2010 +0000
ipv6: fix missing in6_ifa_put in addrconf
Fix ref count bug introduced by
commit 2de795707294972f6c34bae9de713e502c431296
Author: Lorenzo Colitti <lorenzo@xxxxxxxxxx>
Date: Wed Oct 27 18:16:49 2010 +0000
ipv6: addrconf: don't remove address state on ifdown if the address
is being kept
Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr
refcnt correctly with in6_ifa_put().
Reported-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b5e4156743c5d42b736936be7a9ee8d72e0e4ac9
Merge: 6b35308850e1679741e8b646cfb7bb3ab5369888 b1d771ee33c6e4006676002b9d74abf45b71d3d6
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Nov 16 09:17:12 2010 -0800
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 9e2e7422d059f9b98c3a0810df92a1ff660ade2f
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Fri Nov 12 13:52:37 2010 -0800
iwlwifi: set STATUS_READY before commit_rxon
Have the STATUS_READY bit set before commit_rxon call to avoid fail
to send tx power to uCode.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5
Author: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Date: Fri Nov 12 13:48:13 2010 -0800
iwlagn: check change before commit RXON cmd
When setting rxon chain and filter, no need to commit RXON when the
chain flag is not changed. This reduces the number of RXON commands
we send down to uCode.
Signed-off-by: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 21a5b3c6b19a8b8972ccdd55389be28a8b7c9180
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 13:32:59 2010 -0800
iwlagn: use SKU information in the EEPROM
EEPROM contain the SKU information for the device, use it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit f4115d46599464a49a3055d33d499d97ac81fccb
Author: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Date: Wed Nov 10 18:25:58 2010 -0800
iwlagn: update QoS before commit associated RXON
RXON command without association bit can clear the QoS info in the
uCode. Therefore, before sending the associated RXON, we need to
send the QoS command just in case.
Signed-off-by: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit efe54db8233a4b41e68cbe67ca2e30c48532078a
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:49 2010 -0800
iwlagn: fix PAN slot timing wrt. DTIM
When the DTIM is not 1, then the slot timing is in
some cases required to be calclulated based on the
DTIM interval instead of the beacon interval, fix
that.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 2b5f7a679c2ae34407f6cc9387e77b563578bfdc
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:48 2010 -0800
iwlagn: reprogram AP STA after assoc
Instead of unconditionally sending unassoc RXON,
before any assoc RXON, re-send only the AP STA
entry which is required after the BSSID has been
programmed into the device to set up internal
filters in the microcode properly.
This fixes some issues that we correlated with
sending a lot of RXON commands to the device.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 893654de3ff41a4f5037397d06a3f853bbbb3484
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:47 2010 -0800
iwlagn: avoid crash if vif is not assigned
For reasons that aren't entirely clear to me,
we sometimes get here during hardware reset
without the interface being set. Don't crash,
but keep a warning.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit cfa1da7e9133be9280990b2a64fa7696924c8d9a
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:46 2010 -0800
iwlagn: fix PAN queues
Currently, when a PAN queue needs to be
stopped, we erroneously stop queue number 5
(for example) with mac80211 -- which doesn't
even exist!
To avoid that problem, recalculate the swq_id
for all queues when setting up the queues,
and don't use the default identity mapping
that is acceptable for devices which don't
support PAN.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit ea9b307f8e859186a6791e0d508c5993448ac900
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:45 2010 -0800
iwlwifi: always build swq_id as virtual queue ID
Previously, we used the swq_id's mechanism
to have AC and HW queue different only for
aggregation queues. To be able to fix a bug
with iPAN simply always build the swq_id as
ac | (hwq << 2) and remove the flag bit.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 549a04e092e5e043df82fd0541f3b67ab488359b
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:44 2010 -0800
iwlwifi: pass txq to wake/stop queue
Instead of passing the txq->swq_id, pass the
txq struct directly to make sure that in the
future nobody will pass an invalid number.
Only three places actually change from using
the txq_id or the skb's queue_mapping to now
using txq->swq_id as well.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 4bea9b990205e4a3d432d9d6c29687215618a306
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:43 2010 -0800
iwlagn: remove a bogus AGG_OFF check
Even if this check were to happen, using the
txq_id here (which is a HW queue) would lead
to confusion in mac80211. Luckily, it doesn't
seem like this can ever happen.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 8d56396ac3926412dd97dcb9dd8d0cef556b908e
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:42 2010 -0800
iwlagn: remove unused variable swq_id
Simply remove the unused variable swq_id.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 18:25:41 2010 -0800
iwlagn: fix some naming regarding FIFOs
Some variables are misnamed in the FIFO setup
code, fix that.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 564b344c10b694d433cef5b89f8ff8ac5e33898d
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Tue Nov 9 09:21:34 2010 -0800
iwlwifi: change default led mode for different devices
Set the default led mode for different devices.
For the newer devices such as 6000g2a, 6000g2b and newer,
the default led mode is On/Off instead of blinking.
The led_mode still can be control through module parameter
0: system default
1: On/Off
2: blinking
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 05433df23cf16a9ccbdd35964aba781cdf455034
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Nov 8 12:37:20 2010 -0800
iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex
Change the default BT_KILL_ACK_MASK and BT_KILL_CTS_MASK for BT coex
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 66e863a527f9ed3a871797862aaf0d62b0954813
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Nov 8 14:54:37 2010 -0800
iwlagn: support dynamic aggregation for BT coex
Use dynamic aggregation threshold if bt traffic load is high
to reduce the impact on aggregated frame.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 95a5ede3ee9269e175bfe0e6f5a4a5fd2914ed6a
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Mon Nov 8 14:55:43 2010 -0800
iwlagn: set dynamic aggregation threshold for BT
Setting the max/min/def value for BT dynamic aggregation threshold.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 8829c9e2ec144baeb3cee599e1e653a396ad521b
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 11:05:38 2010 -0800
iwlagn: used frame count info in compressed ba packet
For newer devices, uCode provide both "number of frames sent"
and "number of frames acked" information inside the compressed_ba
packet. So instead of figure the success/failure information through
the bitmap, use those information which is much betrer approach.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit 27d29dc4be07aafae270992f8d6e400f8912a33d
Merge: 936fc42831aa351974b707c00b9e67ac81cd530f 640dcfa0ff49ea1fcddad39e7c468683d9f00342 4232f60791d12a5156c3e1c9b04ae08b873a2920
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 16 16:25:35 2010 +0900
Merge branches 'rmobile/fbdev' and 'common/fbdev-edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
commit 936fc42831aa351974b707c00b9e67ac81cd530f
Merge: 12ddf37444eaaf67b147561141150e10a56d7742 0ad83f6882c41df1a7fa387086029e162038c1f2
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 16 16:25:03 2010 +0900
Merge branch 'fbdev/edid'
commit 6d72ad35f1bfaf6e52ca7133cb51ce0e36f17528
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 16 16:10:20 2010 +0900
ARM: mach-shmobile: Tidy up the Kconfig bits.
Presently each one of the CPUs manually selects the same feature set, and
there's a reasonable expectation that none of these will change for
future CPUs in the SH-Mobile / R-Mobile family, so we move those over to
the top-level ARCH_SHMOBILE.
While we're at it, all of the CPUs support optional GPIOs via the PFC,
do not have I/O ports, and expect sparse IRQ, so we bring the
configuration in line across the board.
This more or less brings the ARM-based parts in sync with their SH
counterparts.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 96f8d864afd646e4a52ea55462b7d83e3b94fd5c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 16 14:00:24 2010 +0900
fbdev: move udlfb out of staging.
udlfb has undergone a fair bit of cleanup recently and is effectively at
the point where it can be liberated from staging purgatory and promoted
to a real driver.
The outstanding cleanups are all minor, with some of them dependent on
drivers/video headers, so these will be done incrementally from udlfb's
new home.
Requested-by: Bernie Thompson <bernie@xxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6b35308850e1679741e8b646cfb7bb3ab5369888
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 15 20:15:03 2010 -0800
net: Export netif_get_vlan_features().
ERROR: "netif_get_vlan_features" [drivers/net/xen-netfront.ko] undefined!
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c
Author: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Date: Mon Nov 15 08:09:55 2010 +0000
enic: Fix build warnings
Fix data type of argument passed to pci_alloc_consistent and pci_free_consistent routines.
Signed-off-by: Vasanthy Kolluri <vkolluri@xxxxxxxxx>
Signed-off-by: Roopa Prabhu <roprabhu@xxxxxxxxx>
Signed-off-by: David Wang <dwang2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ce5a121304af02d02489e86efb6ae26a67f95e52
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Mon Nov 15 07:30:42 2010 +0000
hso: Fix unused variable warning
Fallout from the TIOCGICOUNT work
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ec1e5610c00c7f5bc530d2aadd47faa473b90a30
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Nov 15 06:38:14 2010 +0000
bridge: add RCU annotations to bridge port lookup
br_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b5ed54e94d324f17c97852296d61a143f01b227a
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Nov 15 06:38:13 2010 +0000
bridge: fix RCU races with bridge port
The macro br_port_exists() is not enough protection when only
RCU is being used. There is a tiny race where other CPU has cleared port
handler hook, but is bridge port flag might still be set.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 61391cde9eefac5cfcf6d214aa80c77e58b1626b
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date: Mon Nov 15 06:38:12 2010 +0000
netdev: add rcu annotations to receive handler hook
Suggested by Eric's bridge RCU changes.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a386f99025f13b32502fe5dedf223c20d7283826
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Nov 15 06:38:11 2010 +0000
bridge: add proper RCU annotation to should_route_hook
Add br_should_route_hook_t typedef, this is the only way we can
get a clean RCU implementation for function pointer.
Move route_hook to location where it is used.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e80516880019aa1f7c5c410276edfea9575ec89f
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Mon Nov 15 06:38:10 2010 +0000
bridge: add RCU annotation to bridge multicast table
Add modern __rcu annotatations to bridge multicast table.
Use newer hlist macros to avoid direct access to hlist internals.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8a22c99a80b0926585cfcbcc423ee2c49c1fd820
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:05:00 2010 +0000
net/ipv6/mcast.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:58 2010 +0000
include/net/caif/cfctrl.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Sjur Braendeland <sjur.brandeland@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c59504ebc5baa628706d10c2d3c7e1f4bc3c2147
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:57 2010 +0000
include/linux/if_macvlan.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 779bb41d4bd111d5631d58d1bf2d00b5c4389c80
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:37 2010 +0000
drivers/net/cnic.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e81a1ba815666ec02ef5bf0e17cf256c88d233b3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:33 2010 +0000
drivers/net/ixgbe: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d51c4185bb369cb39ed8cc20b331508e47b35b2
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:32 2010 +0000
drivers/net/e1000e: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6f38ad93e4882e84c1cc113736db7dc9252dcf11
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:31 2010 +0000
drivers/net/bnx2x: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ad65ffd12dccf6d1031298eacc060327751084da
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 17:04:26 2010 +0000
drivers/isdn: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6c1b6c6b873d66d353ef47a054156dfde3f4c075
Merge: fe8222406c8277a21172479d3a8283d31c209028 7e87fe84303cc54ecf3c7b688cb08ca24322a41d
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 15 10:59:49 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit fe8222406c8277a21172479d3a8283d31c209028
Author: Tom Herbert <therbert@xxxxxxxxxx>
Date: Tue Nov 9 10:47:38 2010 +0000
net: Simplify RX queue allocation
This patch move RX queue allocation to alloc_netdev_mq and freeing of
the queues to free_netdev (symmetric to TX queue allocation). Each
kobject RX queue takes a reference to the queue's device so that the
device can't be freed before all the kobjects have been released-- this
obviates the need for reference counts specific to RX queues.
Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ed9af2e839c06c18f721da2c768fbb444c4a10e5
Author: Tom Herbert <therbert@xxxxxxxxxx>
Date: Tue Nov 9 10:47:30 2010 +0000
net: Move TX queue allocation to alloc_netdev_mq
TX queues are now allocated in alloc_netdev_mq and freed in
free_netdev.
Signed-off-by: Tom Herbert <therbert@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cc9ff19da9bf76a2f70bcb80225a1c587c162e52
Author: Timo Teräs <timo.teras@xxxxxx>
Date: Wed Nov 3 04:41:38 2010 +0000
xfrm: use gre key as flow upper protocol info
The GRE Key field is intended to be used for identifying an individual
traffic flow within a tunnel. It is useful to be able to have XFRM
policy selector matches to have different policies for different
GRE tunnels.
Signed-off-by: Timo Teräs <timo.teras@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e1f2d8c2cc61d2b9472efe44e8a2b098336914b4
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 15 10:37:30 2010 -0800
vlan: Fix build warning in vlandev_seq_show()
net/8021q/vlanproc.c: In function 'vlandev_seq_show':
net/8021q/vlanproc.c:283:20: warning: unused variable 'fmt'
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b1d771ee33c6e4006676002b9d74abf45b71d3d6
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Fri Oct 29 23:11:23 2010 +0200
carl9170: use generic sign_extend32
This patch replaces the handcrafted
sign extension cruft with a generic
bitop function.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7919a57bc608140aa8614c19eac40c6916fb61d2
Author: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Date: Mon Aug 30 19:04:01 2010 +0000
bitops: Provide generic sign_extend32 function
This patch moves code out from wireless drivers where two different
functions are defined in three code locations for the same purpose and
provides a common function to sign extend a 32-bit value.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e4b3fdb80021bc0a3239bfc2a873a6d7c6ac52a1
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Thu Nov 4 00:13:49 2010 +0200
wl1251: use wl12xx_platform_data to pass data
Make use the newly added method to pass platform data for wl1251 too.
This allows to eliminate some redundant code.
Cc: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
Acked-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 1d4b89f2970f9ea0902d0a3bc1090f3c770b5080
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Mon Nov 8 15:29:36 2010 +0200
wl1251: add runtime PM support for SDIO
Add runtime PM support, similar to how it's done for wl1271.
This allows to power down the card when the driver is loaded but
network is not in use.
Cc: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cb7bbc7a5535ab2333915b83391e1d846a0914df
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Thu Nov 4 00:13:47 2010 +0200
wl1251: add power callback to wl1251_if_operations
Call interface specific power callback before calling board specific
one. Also allow that callback to fail. This is how it's done for
wl1271 and will be used for runtime_pm support.
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f81c1f48384d398dbe8f6c5b10377c7158086791
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:50 2010 -0800
iwlagn: enable shadow register
For 6000 series devices and up, enable automatic update MAC's register
for better power usage in PSP mode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6fe8efb2211fe61caa7b0e1c36c521670b8a10a9
Author: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Date: Wed Nov 10 09:56:49 2010 -0800
iwlwifi: disable disconnected antenna for advanced bt coex
Disconnected antenna algorithm is used to find out which antennas are
disconnected. It should be disabled for devices that support advanced
bluetooth coexist.
Signed-off-by: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3031242b31dcd76e1c6b1c1718cfee872f55d5af
Author: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Date: Wed Nov 10 09:56:48 2010 -0800
iwlwifi: seperate disconnected antenna function
Disconnected antenna algorithm is seperated into its own function from chain noise
calibration routine for better code management.
Signed-off-by: Shanyu Zhao <shanyu.zhao@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b2769b84d86a2d29fa131a763d2b23b112834420
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 09:56:47 2010 -0800
iwlagn: fix RXON HT
When the HT information is changed due to
BSS changes (like legacy stations joining)
we need to recalculate HT RXON parameters.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8da8e62851680772f0422d0f1c4b467190b268e5
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 09:56:46 2010 -0800
iwlagn: re-enable calibration
During the RXON rewrite, this code got lost.
When we've just associated, we need to enable
all calibrations and see if some were already
finished. Add back the missing code.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 52d980c01353202332ff4322f3f41db0c49816a5
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 09:56:45 2010 -0800
iwlagn: fix RXON issues
The RXON rework resulted in a massive loss of
throughput because we weren't programming the
device completely correctly -- the BSSID has
to be programmed into the device before the
AP station is uploaded. To fix this, simply
always send the unassoc RXON, i.e. even when
it was already unassoc so that the BSSID and
some other parameters are updated properly.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2e1fea43aa170e18beb8378465e595e18cd08f6e
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 09:56:44 2010 -0800
iwlagn: fix needed chains calculation
Garen noticed that this was wrong. Fix
the calibration -- default to multiple
chains and fall back to single where
possible.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 35a6eb36520b938742d8680fd8d821df20982ced
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:43 2010 -0800
iwlwifi: resending QoS command when HT changes
"mac80211: Fix WMM driver queue configuration"
inadvertedly broke iwlwifi, because now mac80211
configures the QoS settings before assoc, and
therefore before HT. Thus, iwlwifi no longer told
the device about the HT setting, which it needs
to -- and thus throughput went down a lot. Fix
this by resending the QoS command to the device
not only when QoS/WMM settings change, but also
when HT changes.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fd11743dd25efe7157ff17b03dd2db0cbb6fed05
Author: Winkler, Tomas <tomas.winkler@xxxxxxxxx>
Date: Wed Nov 10 09:56:42 2010 -0800
iwlwlifi: update rx write pointer w/o request mac access in the CAM mode
In iwl_rx_queue_update_write_ptr function
replace iwl_write_direct32 with iwl_write32 when not in power save mode.
We don't have to go through grab nic access as the NIC is already awake.
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 708068db4c09f93937a6a83ac8fff8516f482b0f
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:41 2010 -0800
iwlwifi: legacy tx_cmd_protection function
Legacy (4965 and 3945) devices has different tx_cmd_protection routine.
Move to iwl-legacy.c
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e39fdee1d7856817619326fa114438c146d74510
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:40 2010 -0800
iwlwifi: put all the isr related function under ops
There were two type of isr supported by iwlwifi devices.
legacy isr - only used by legacy devices (3945 & 4965)
ict isr - used by all new generation of iwlwifi devices
Move all the isr related functions into ops, the ict type of isr
supports only needed for newer devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 81baf6ec9c190ae128748cf2a026bff5cb811b70
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:39 2010 -0800
iwlwifi: Legacy isr only used by legacy devices
Move iwl_isr_legacy function to iwl_legacy.c since it only used
by legacy devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ae79d23d0b2c16998e60f49a16dae53521c76a45
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed Nov 10 09:56:38 2010 -0800
iwlagn: fix non-5000+ build
When building 4965 without 5000+ there were a
lot of build errors due to functions being used
that weren't even compiled in. To fix this move
some code around and only compile the HCMD code
for 5000+ series as it's not used for 4965.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2a21ff446c07b95d08cbb830bd20112f3ee1d76e
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:37 2010 -0800
iwlagn: update PCI ID for 100 series devices
Update the supported PCI ID list for 100 series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fb30eaf38703d7562606e49a5872745d66366a50
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:36 2010 -0800
iwlagn: update PCI ID for 6000g2a series devices
Update the supported PCI ID list for 6000g2a series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8b37d9f0a1e114a1c7f5082842fb310a81ea3732
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Wed Nov 10 09:56:35 2010 -0800
iwlagn: update PCI ID for 6000g2b series devices
Update the supported PCI ID list for 6000g2b series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5d882c97e2c958df9f8b78832fa1ecbecef6ea1d
Author: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Mon Nov 8 10:50:03 2010 -0800
ath5k: Print stats as unsigned ints.
The debugfs code for ath5k was printing some unsigned int
stats with %d instead of %u. This meant that you could see
negative numbers instead of a clean wrap.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8c5765fda4b382acce4ff386e18ec11790dff893
Author: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Date: Sat Nov 6 15:49:01 2010 +0100
rt2x00: Add watchdog functions for HW queue
Add watchdog functions for managing the Queues inside the hardware.
Normally the driver doesn't have much to do with these queues
directly, but the Ralink drivers did implement watchdog functions
for these. These watchdog functions are not triggered that often,
compared to the other watchdog functions, but I have at least
seen them trigger once or twice during a long stresstest run.
v2: Add extra documentation for register fields
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ea175ee26268370ca07aff91cf6ba1e0f1a3bd36
Author: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Date: Sat Nov 6 15:48:43 2010 +0100
rt2x00: Remove rt2x00lib_toggle_rx
As part of the queue refactoring, the rt2x00lib_toggle_rx
can be removed and replaced with the call directly to
the set_device_state callback function.
We can remove the STATE_RADIO_RX_ON_LINK and
STATE_RADIO_RX_OFF_LINK, as it was only used for
special behavior inside rt2x00lib rather then the
drivers.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8be4eed0ea7d8ef38692de878043a949e9db16e8
Author: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Date: Sat Nov 6 15:48:23 2010 +0100
rt2x00: Fix rt2x00queue_kick_tx_queue arguments
The queue_entry argument to rt2x00queue_kick_tx_queue,
doesn't make sense due to the function name (it is called
kick QUEUE)... But neither do we need the queue_entry, since
we need the data_queue.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 813f0339dd739c48607f12dac79ec26c61874226
Author: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Date: Sat Nov 6 15:48:05 2010 +0100
rt2x00: Rename queue->lock to queue->index_lock
The queue->lock is only used to protect the index
numbers. Rename the lock accordingly.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 821cde63b5bd04bc3ca0f95e2abf17b04e640488
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:47:46 2010 +0100
rt2x00: checkpatch.pl error fixes for rt73usb.c
rt73usb.c:43: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f8bfbc31794635f6d0b7fd30950d49cecf54e1ce
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:47:25 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00queue.c
rt2x00queue.c:804: ERROR: space prohibited after that open parenthesis '('
rt2x00queue.c:805: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 027e8fd105c82956de9dec232bad21b1628ee7c0
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:47:09 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00link.c
rt2x00link.c:70: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5f181dc16bbd13b68b54ed5c43c4d2c5ad00297b
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:46:53 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00lib.h
rt2x00lib.h:60: ERROR: space prohibited after that open parenthesis '('
rt2x00lib.h:60: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c2361baec100c6f373107346e3fd98e9b267ac6c
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:46:36 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00dev.c
rt2x00dev.c:689: ERROR: spaces required around that '=' (ctx:WxV)
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8a239033c355be998b8985f12f0cc3a9eaeb93e9
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:46:17 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00config.c
rt2x00config.c:136: ERROR: space required before the open parenthesis '('
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 87a46caf920515eb269df0109f0a61a958236568
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:45:58 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800usb.h
rt2800usb.h:43: ERROR: space prohibited after that open parenthesis '('
rt2800usb.h:43: ERROR: space prohibited before that close parenthesis ')'
rt2800usb.h:44: ERROR: space prohibited after that open parenthesis '('
rt2800usb.h:44: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 144b80bc05e76df0acb8b5e86a6e6aaf0c53325e
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:45:41 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800usb.c
rt2800usb.c:48: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c6cbadeb3afd9471e539791842877d085f367746
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:45:22 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800pci.h
rt2800pci.h:41: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:42: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:43: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:44: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:55: ERROR: space prohibited after that open parenthesis '('
rt2800pci.h:55: ERROR: space prohibited before that close parenthesis ')'
rt2800pci.h:56: ERROR: space prohibited after that open parenthesis '('
rt2800pci.h:56: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bf1b15125e2aa245ddd9348f80d041d4f1fd13a9
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:45:06 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800lib.c
rt2800lib.c:831: ERROR: inline keyword should sit between storage class and type
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:44:52 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800.h
rt2800.h:1511: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1511: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1513: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1513: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1515: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1515: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1517: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1517: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1519: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1519: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1521: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1521: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1661: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1661: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1662: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1662: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1663: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:2013: ERROR: space prohibited after that open parenthesis '('
rt2800.h:2013: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:2014: ERROR: space prohibited after that open parenthesis '('
rt2800.h:2014: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:44:33 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2500usb.c
rt2500usb.c:42: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit cb771b1a5de81e3ee59bd8b7ed17da6d09ffcf68
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:44:15 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2500pci.h
rt2500pci.h:1091: ERROR: space prohibited after that open parenthesis '('
rt2500pci.h:1091: ERROR: space prohibited before that close parenthesis ')'
rt2500pci.h:1092: ERROR: space prohibited after that open parenthesis '('
rt2500pci.h:1092: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 46b9786975a69a75f25b71796f7e36d203fbd4ee
Author: Mark Einon <mark.einon@xxxxxxxxx>
Date: Sat Nov 6 15:44:00 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2400pci.h
rt2400pci.h:812: ERROR: space prohibited after that open parenthesis '('
rt2400pci.h:812: ERROR: space prohibited before that close parenthesis ')'
rt2400pci.h:813: ERROR: space prohibited after that open parenthesis '('
rt2400pci.h:813: ERROR: space prohibited before that close parenthesis ')'
rt2400pci.h:950: ERROR: Macros with complex values should be enclosed in parenthesis
Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 041fb8f504fb0a6b61bc2131679da554b2fa8c9d
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sat Nov 6 14:07:10 2010 +0100
carl9170: tx path review
This patch fixes a few shortcomings in the tx path.
* move temp. ampdu_[ack]_len out of txinfo->pad.
* fix WARN_ON from tx.c:line 300 when tx_ampdu_queue
fails to queue the frame.
* In tx_prepare, we already have a local pointer
to the station's ieee80211_sta struct.
* remove a second !sta check, tx_prepare already takes
care of that.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ffa56e540c3949c4560dcce45eca247819e183c1
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Thu Nov 4 22:59:56 2010 +0100
mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()
crypto_free_cipher() is a wrapper around crypto_free_tfm() which is a
wrapper around crypto_destroy_tfm() and the latter can handle being passed
a NULL pointer, so checking for NULL in the
ieee80211_aes_key_free()/ieee80211_aes_cmac_key_free() wrappers around
crypto_free_cipher() is pointless and just increase object code size
needlesly and makes us execute extra test/branch instructions that we
don't need.
Btw; don't we have to many wrappers around wrappers ad nauseam here?
Anyway, this patch removes the redundant conditionals.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 723fc7af5300dba9eac40cb23dbefa67589e5181
Author: Lalith Suresh <suresh.lalith@xxxxxxxxx>
Date: Thu Nov 4 20:43:16 2010 +0100
rt2x00: Fix comments in rt73usb.h and rt61pci.h
This patch fixes a few comments in rt73usb.h and rt61pci.h.
Signed-off-by: Lalith Suresh <suresh.lalith@xxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fa8b4b22d543b4052602b0c86065150613ed19e8
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Nov 4 20:42:36 2010 +0100
rt2x00: Fix hw crypto in AP mode for some devices
The BSSID register shouldn't be set in AP mode on some older devices (like
rt73usb) as it breaks hw crypto on these. However, rt2800 devices explicitly
need the BSSID register set to the same value as our own MAC address (only
in AP mode).
Hence, don't set the BSSID from rt2x00lib but move it down into rt2800 to
avoid problems on older devices.
This fixes a regression (at least for rt73usb) and avoids a new regression
for rt2800 devices in 2.6.36.
Reported-by: Johannes Stezenbach <js@xxxxxxxxx>
Reported-by: Lee <lee-in-berlin@xxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 070192dd2975c0e97bbdeac7623b755235c6db7d
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Thu Nov 4 20:41:05 2010 +0100
rt2x00: Fix crash on USB unplug
By not scheduling the TX/RX completion worker threads
when Radio is disabled, or hardware has been unplugged,
the queues cannot be completely cleaned.
This causes crashes when the hardware has been unplugged while
the radio is still enabled.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 303c7d6abfd0430e39e84a43361492b4a8c890b6
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Thu Nov 4 20:40:46 2010 +0100
rt2x00: Fix MCU_SLEEP arguments
Legacy driver uses 0xff as the second argument for the MCU_SLEEP
command. It is still unknown what the values actually mean, but
this will at least keep the command in-sync with the original
driver.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f44df18c58d4debe3ec0bb76a490aa2f3929fd8b
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Thu Nov 4 20:40:11 2010 +0100
rt2x00: Implement flush callback
Implement a basic flush callback function, which simply loops
over all TX queues and waits until all frames have been transmitted
and the status reports have been gathered.
At this moment we don't support dropping any frames during the
flush, but mac80211 will only send 'false' for this argument anyway,
so this is not important at this time.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit aaf886bd215396f295bc0489e8ae09d1c03d9aa0
Author: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Date: Thu Nov 4 20:39:48 2010 +0100
rt2x00: Remove failsave from rt2x00usb_watchdog_tx_dma
When the TX status handler failed to clear the queue
in rt2x00usb_watchdog_tx_dma() we shouldn't use a failsave
to use the rt2x00usb txdone handler.
If a driver has overriden the txdone handler it must make
sure the txdone handler is capable of cleaning up the queue itself.
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7225ce1ea93d24c0914eea0410dcfc426281f996
Author: Ivo van Doorn <ivdoorn@xxxxxxxxx>
Date: Thu Nov 4 20:39:23 2010 +0100
rt2x00: Rename rt2x00queue_timeout
Rename rt2x00queue_timeout to rt2x00queue_status_timeout to
better describe what is actually timing out (note that
we already have a rt2x00queue_dma_timeout).
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e2f8c8752b994026fc0ddb4bb29ca229b3e0c104
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Nov 4 20:38:56 2010 +0100
rt2x00: Optimize rt2x00debug_dump_frame when frame dumping is not active
When rt2x00 is compiled with debugging but frame dumping is currently
not active we can avoid the call to do_gettimeofday. Furthermore,
frame dumping is not the default case, mark it as unlikely.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2b23cdaa3b0e9567597563e5a7a5103ecda447f0
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Nov 4 20:38:15 2010 +0100
rt2x00: Reduce tx descriptor size
The tx descriptor values qid, cw_min, cw_max and aifs are directly
accessible through the tx entry struct. So there's no need to copy
them into the tx descriptor and passing them to the indiviual drivers.
Instead we can just get the correct value from the tx entry.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 08e5310028359de2daaa39cd10e9ca493c51792b
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Nov 4 20:37:47 2010 +0100
rt2x00: Wait up to one second on rt2800 for WPDMA to be ready
At least some devices need such a long time to inititalize WPDMA. This
only increases the maximum wait time and shouldn't affect devices that
have been working before.
Reported-by: Joshua Smith <jesmith@xxxxxxxx>
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit efd2f271e44c7ea011cdb0363d38f40338ab80d2
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Nov 4 20:37:22 2010 +0100
rt2x00: Sync Tx and RX ring sizes with legacy drivers
All rt2x00 devices used the same Tx and Rx ring size (24 entries) till
now. Newer devices (like rt2800) can however make use of a larger TX and
RX ring due to 11n capabilities (AMPDUs of size 64 for example).
Hence, bring rt2x00 in sync with the legacy drivers and use the same TX
and RX ring sizes. Also remove the global defines RX_ENTRIES, TX_ENTRIES,
BEACON_ENTRIES and ATIM_ENTRIES and use per driver values.
That is 24 entries for rt2400pci, 32 entries for rt2500pci, rt2500usb,
rt61pci and rt73usb and 128 (RX) and 64 (TX) for rt2800pci and rt2800usb.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 961621abee08fde2328daf6f8000e1059e5205e9
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date: Thu Nov 4 20:36:59 2010 +0100
rt2x00: Add TXOP_CTRL_CFG register definition
Remove the magic value initialisation of the TXOP_CTRL_CFG register by
defining its fields and using them during intialisation. The field
RESERVED_TRUN_EN is referred to as reserved, however it is set to 1 by
the legacy drivers. Hence, do the same.
Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 066dae93bdfcc7af5e38a33617773fd5c6457607
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sun Nov 7 14:59:39 2010 +0100
ath9k: rework tx queue selection and fix queue stopping/waking
The current ath9k tx queue handling code showed a few issues that could
lead to locking issues, tx stalls due to stopped queues, and maybe even
DMA issues.
The main source of these issues is that in some places the queue is
selected via skb queue mapping in places where this mapping may no
longer be valid. One such place is when data frames are transmitted via
the CAB queue (for powersave buffered frames). This is made even worse
by a lookup WMM AC values from the assigned tx queue (which is
undefined for the CAB queue).
This messed up the pending frame counting, which in turn caused issues
with queues getting stopped, but not woken again.
To fix these issues, this patch removes an unnecessary abstraction
separating a driver internal queue number from the skb queue number
(not to be confused with the hardware queue number).
It seems that this abstraction may have been necessary because of tx
queue preinitialization from the initvals. This patch avoids breakage
here by pushing the software <-> hardware queue mapping to the function
that assigns the tx queues and redefining the WMM AC definitions to
match the numbers used by mac80211 (also affects ath9k_htc).
To ensure consistency wrt. pending frame count tracking, these counters
are moved to the ath_txq struct, updated with the txq lock held, but
only where the tx queue selected by the skb queue map actually matches
the tx queue used by the driver for the frame.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Reported-by: Björn Smedman <bjorn.smedman@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 21e731a1b15bf03927e292af1b4a2c84fc8af817
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Wed Nov 3 21:36:12 2010 +0100
b43legacy: rfkill: use status register based on core revision (not PHY's)
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d94519c1b0de827d5d142b9333b7f114c0b3a021
Author: maximilian attems <max@xxxxxxx>
Date: Tue Nov 2 23:39:12 2010 +0100
zd1201: Add missing id
The Mandriva patch seems to stem from 2.6.14, so much for their
upstreaming effort.
Didn't find another Linux reference of it, just an omnious
"USB\VID_1044&PID_8004" from GigabyteZD1201U.INF for
Gigabyte GN-WLBZ101 802.11b USB Adapter, which matches the
Mandriva patch comment.
Aboves file also lists an "USB\VID_1044&PID_8006", which I have
kept appart as this "Gigabyte GN-WBZB-M 802.11b USB Adapter"
didn't show up in googling.
Signed-off-by: maximilian attems <max@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8cecc90e4a302ac214c48e362709ce906a96a295
Author: maximilian attems <max@xxxxxxx>
Date: Tue Nov 2 23:10:12 2010 +0100
zd1211rw: add 2 missing usb id's
"These USB ID came from Palnex <http://www.planex.co.jp/>
Worked fine." says Mandriva patch for their 2.6.32 and earlier.
Web has evidence for both id's to work, so just add them upstream:
http://www.mail-archive.com/zd1211-devs@xxxxxxxxxxxxxxxxxxxxx/msg00507.html
http://ubuntuforums.org/showthread.php?t=473046
Signed-off-by: Go Taniguchi <go@xxxxxxxxxxxxxxxx>
Signed-off-by: maximilian attems <max@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit daeeb074105a80a34f90a454c24efc14e9a8d3c3
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:39 2010 -0200
rtl8187: restore anaparam registers after reset with 8187B
Current 8187B initialization misses anaparam registers restore after
8187 reset. This causes ANAPARAM register to stay zeroed out (ANAPARAM2
kept its value on my tests). To avoid this, call rtl8187_set_anaparam
right after chip reset (to be on the safe side, as it makes sure we
restore all ANAPARAM registers).
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Cc: seno <senada@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 998606cfd75e7a8169ed0d324061a8d6bc60716a
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:38 2010 -0200
rtl8187: remove uneeded setting of anaparam write
Usually you set RTL818X_CONFIG3_ANAPARAM_WRITE when you are going to
change/write ANAPARAM registers. But in current initialization of
RTL8187B there is a place where ANAPARAM_WRITE bit is set without any
ANAPARAM register being written, without reason, so remove it.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Cc: seno <senada@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 0bf198eb4d05a4662143e4a2e2a44fb592e2b177
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:37 2010 -0200
rtl8187: consolidate anaparam on/off write sequences
There are repeated calls for anaparam on/off sequence in the code.
Consolidate the common code in rtl8187_set_anaparam and use it where
needed.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit fe3326903d7aafd7b5602d8e178537c8b0465f6c
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:36 2010 -0200
rtl8187: don't set RTL818X_CONFIG3_GNT_SELECT flag on 8187B
The GNTSel bit should only concern pci devices by looking at RTL8180
spec, which is not the case of 8187B. Also testing shows that trying to
set this bit fails, a subsequent read from the register after trying to
set it shows that the bit isn't set, seems the hardware ignores it,
which makes sense. This setting was a left over from Realtek sources.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 896cae65fc0489b8e42bb7790f64731d53a2cecf
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:35 2010 -0200
rtl8187: move pll reset at start out of ANAPARAM write
On 8187B start, comment about pll reset, and move it out of ANAPARAM
write sequence, so that code is more readable.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a8ff34e37a186ebb7d2d90ee40ef88a3ef95ad47
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:34 2010 -0200
rtl8187: avoid redundant write to register FF72 (RFSW_CTRL)
The table with misc register initialization was setting it, and later
on we would set it again with a explicity call to rtl818x_iowrite16_idx.
Remove duplicate initialization from the register table.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 60f589145d76cf834ec5e485c5412ec0994e52d1
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:33 2010 -0200
rtl8187: fix wrong register initialization in 8187B
We were using wrong address for BRSR (Basic Rate Set Register) while
initializing its value, comparing with Realtek sources, for 8187B case.
Also, the same register is initialized in rtl8187b_reg_table, so remove
the duplicate initialization from the table.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f002c25cc13e86762551c0eda29a40c60d6dbf1b
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:32 2010 -0200
rtl8187: remove setting of beacon/atim registers from initialization
On 8187B path, we set a initial value for beacon interval and atim
window on initialization. But this isn't needed, since same setup is
done on rtl8187_config.
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 327571ea9927beec2ee2ed9a266c57c1515393b4
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Mon Nov 1 22:59:31 2010 -0200
rtl8187: remove redundant initialization of ARFR
This removes redundant write to Auto Rate Fallback Register on RTL8187B.
The same value was being written twice in the same function. Avoid this
removing the duplicate initialization on rtl8187b_reg_table, and also
add comment for this write (information from Realtek source).
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6
Author: Nishant Sarmukadam <nishants@xxxxxxxxxxx>
Date: Mon Nov 1 17:55:48 2010 -0700
mwl8k: force AP mode to use non-AMPDU frames
AP firmware uses xmitcontrol to differentiate between AMPDU
and non-AMPDU frames. As the support for AMPDU is not yet
added, set xmitcontrol to non-AMPDU for all tx frames for AP
firmware. This field will be set to indicate ampdu/non-ampdu
frames when tx AMPDU support is added.
Signed-off-by: Pradeep Nemavat <pnemavat@xxxxxxxxxxx>
Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
Acked-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3eedb6f436858f3e864139dc184adc9a51440c92
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Sat Oct 30 00:36:53 2010 +0200
carl9170: configurable beacon rates
Previously, the beacon rate was fixed to either:
* 1Mb/s [2.4GHz band]
* 6Mb/s [5GHz band]
This limitation has been addressed and now the
beacon rate is selected by ieee80211_tx_info's
rate control info, almost like any ordinary
data frame.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2a6cef513fab525399e484edc9bfb39b6d462f76
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Fri Oct 29 23:41:16 2010 +0200
carl9170: stop stale uplink BA sessions
This patch fixes a possible lengthy stall if the device
is operating as an experimental 11n AP and an STA
[during heavy txrx action] suddenly signalized to go
off-channel (old NetworkManager), or (sleep - which is
unlikely, because then it wouldn't be *active* at all!?).
Because the driver has to manage the BA Window, the
sudden PSM transition can leave active uplink BA
sessions to the STA in a bad state and a proper
cleanup is needed.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e4a668c59080f862af3ecc28b359533027cbe434
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Fri Oct 29 23:26:13 2010 +0200
carl9170: fix spurious restart due to high latency
RX Stress tests of unidirectional bulk traffic with
bitrates of up to 220Mbit/s have revealed that the
fatal-event recovery logic [which was solely triggered
by an out-of-rx-buffer situation] is too aggressive.
The new method now "pings" the device and then
decides - based on the response - whenever
a restart is needed or not.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e27769059ccb15273a7eb69ed31b8e08f9b0eda8
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Fri Oct 29 23:17:38 2010 +0200
carl9170: initialize HW aMPDU parameters properly
This patch changes the initial aMPDU density and
factor settings to match those of Otus.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3f1240e4f4b249f2388903864bdc766973f76687
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date: Fri Oct 29 22:44:59 2010 +0200
carl9170: import hw/fw header updates
This patch imports all shared header changes
from carl9170fw.git.
* add some strategic __aligned(4).
This allows the compiler generate optimized code for
architectures which can't access (unaligned/packed)
data efficiently.
("ath9k_hw: optimize all descriptor access functions")
* add a forgotten __CARL9170FW__ ifdef around
a private firmware-internal struct.
* GET_VAL macro helper
Very useful for extracting data out of the
bit-packed PHY registers.
* cosmetic changes
e.g.: _CCA_MINCCA_ to just _CCA_MIN_.
* version bump 1.8.8.3 -> 1.9.0.
Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bdd7bd16439975133d36bcd7c9c489302a114525
Author: Blaise Gassend <blaise@xxxxxxxxxxxxxxxx>
Date: Thu Oct 28 02:01:24 2010 -0700
mac80211_hwsim: Incorporate txpower into rssi
Up to now mac80211_hwsim has been reporting an rssi of -50. This patch
improves the model slightly by returning txpower-50. This makes it
easy to stimulate tests that need to see a varying rssi.
Signed-off-by: Blaise Gassend <blaise@xxxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 19999792d2889350611ba9e346d6a2924959dc2d
Author: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
Date: Thu Oct 28 20:01:00 2010 -0200
rtl8187b: do not do per packet TX AGC
Clearing the per packet TX AGC for the RTL8187B device appears to
increase its overall TX power. This allows the device to associate and a
connection to be established using APs a little further away.
This is in accordance to what is done for RTL8187L devices and also what
Realtek drivers do.
Tested-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
Cc: linux-wireless@xxxxxxxxxxxxxxx
Cc: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Cc: Rogerio Luz Coelho <rogluz.news@xxxxxxxxx>
Cc: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Cc: Hin-Tak Leung <hintak.leung@xxxxxxxxx>
Cc: seno <senada@xxxxxxxxxxx>
Tested-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e285a5250c0772c5596a9137041a96b2c1f744d6
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed Oct 27 14:09:58 2010 +0200
wl1271: add recover testmode command
add RECOVER testmode command.
this command triggers a recovery sequence (by enqueueing a recovery_work).
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit ccc83b046c03378bbaf7cf095d8d7e9b9abb24c5
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed Oct 27 14:09:57 2010 +0200
wl1271: handle HW watchdog interrupt
unmask the WL1271_ACX_INTR_WATCHDOG interrupt.
when getting it - enqueue a recovery work and bail out.
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 03107a4b5923aa7767329e857caf227749087e47
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed Oct 27 14:58:30 2010 +0200
wl1271: refactor debugfs function generation code
refactor wl1271_debugfs by using a format© function, instead of
duplicating the code for each generated function.
this change reduces about 3Kb from wl1271.ko
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 71125abdf0c297adc00dc5632f0318b2397286f5
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Thu Oct 28 21:46:43 2010 +0200
wl1271: set wl->vif only if add_interface succeeded.
set wl->vif to the newly created interface only after the firmware booted
successfully. on the way - make the function flow more clear.
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit f8d9802f66eda9ff14f7667f99a46b31e9a9e273
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Tue Oct 26 13:24:39 2010 +0200
wl1271: Check interface state in op_* functions
Check the state of the interface on op_* function so we don't try to access
the hardware in when its off.
The mac80211 may call these in some corner cases related, for instance, to
the hardware recovery procedure. These accesses cause a kernel crash on at
least some SDIO devices, because the bus is not properly claimed in that
scenario.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit b739a42c921dcb0ae92cc14032b7f75dcba88e3b
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Tue Oct 26 13:24:38 2010 +0200
wl1271: Fix scan failure detection
In scan_complete_work, because the mutex is released before accessing the
scan->failed flag, it is possible for unfounded hardware recovery rounds
to be executed.
Fix this.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf
Author: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Date: Mon Oct 25 11:24:29 2010 +0200
wl1271: Fix RX path stall
The wl1271_rx function loops through packets in an aggregated buffer. Each
packet in the buffer is handled by a call to wl1271_rx_handle_data, which will
fail if skb memory allocation fails or production mode is enabled. These
failures currently prevent the rx counters to be incremented, thus causing the
rx loop to run forever.
Fix this by ignoring error codes reported wl1271_rx_handle_data function.
This essentially means that frames will be dropped in production mode, which
is the intetion, and frames will be dropped if memory allocation fails, which
is a decent way to recover from that situation.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit ff6d76fd3d45ed5494287e57d76073739721214b
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Mon Oct 25 15:30:03 2010 +0200
wireless/wl1271: remove redundant if-statement v2
wl1271_ps_elp_sleep() is void and cannot return a value.
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 5404643139c16e56d31a6ebd09cfa6db1eb03a36
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date: Wed Oct 20 15:15:52 2010 +0300
wl1271: exit ELP mode when setting enabled rates in tx
This bug was being triggered by a call to acx_rate_policies in tx_work
without calling ps_elp_wakeup first. If we have full PSM enabled, this
happens rather often, immediately after association.
Reported-by: Tuomas Katila <ext-tuomas.2.katila@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@xxxxxxxxx>
commit 6a2de93b2553c2e9a72997370534993c85c1eee6
Author: Teemu Paasikivi <ext-teemu.3.paasikivi@xxxxxxxxx>
Date: Thu Oct 14 11:00:04 2010 +0200
wl1271: Fix warning about unsupported RX rate
While scanning, it is possible that beacon and probe response frames are
received on other band than configured to the driver. In rx status
handling this has caused "Unsupported RX rate from HW" warnings. This
patch changes the wl1271_rate_to_index function to take the band of the
received frame as a parameter instead of using value configuret to
wl->band.
Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@xxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 18357850b694ba3fa29363c7d86ccd8783f4a065
Author: Shahar Levi <shahar_levi@xxxxxx>
Date: Wed Oct 13 16:09:41 2010 +0200
wl1271: 11n Support, functionality and configuration ability
Add 11n ability in scan, connection and using MCS rates.
The configuration is temporary due to the code incomplete and
still in testing process. That plans to be remove in the future.
Signed-off-by: Shahar Levi <shahar_levi@xxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit c4db1c879679e795689ef3c9dd7d3f6568ea14c5
Author: Shahar Levi <shahar_levi@xxxxxx>
Date: Wed Oct 13 16:09:40 2010 +0200
wl1271: 11n Support, ACX Commands
Added ACX command to the FW for 11n support.
Signed-off-by: Shahar Levi <shahar_levi@xxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit e8b03a2b8debc6056f6f43d24f98f601097301a1
Author: Shahar Levi <shahar_levi@xxxxxx>
Date: Wed Oct 13 16:09:39 2010 +0200
wl1271: 11n Support, Add Definitions
Two acx commands: ht_capabilities & ht_information, 11n sta capabilities
macro.
Signed-off-by: Shahar Levi <shahar_levi@xxxxxx>
Reviewed-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 2fe33e8cff354a3f320549544bffebbbab680145
Author: Ido Yariv <ido@xxxxxxxxxx>
Date: Tue Oct 12 14:49:12 2010 +0200
wl1271: Fix TX queue low watermark handling
The number of entries in the TX queue is compared to the low watermark
value each time TX completion interrupts are handled.
However, the fact that a TX completion arrived does not necessarily mean
there are any less skbs in the TX queue.
In addition, a TX completion interrupt does not necessarily mean that there
are any new available TX blocks. Thus, queuing TX work when the low
watermark is reached might not be needed.
Fix this by moving the low watermark handling to the TX work function,
and avoid queuing TX work in this case.
Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 25eeb9e3876a161e3afcc820c6cb72e13f9b7c7e
Author: Ido Yariv <ido@xxxxxxxxxx>
Date: Tue Oct 12 16:20:06 2010 +0200
wl1271: Allocate TX descriptors more efficiently
On each TX descriptor allocation, a free entry is found by traversing the TX
descriptors array.
Improve this by holding a bitmap of all TX descriptors, and using efficient
bit operations to search for free entries.
Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit a522550a283de31c7cfc30c7a129ce584e38c582
Author: Ido Yariv <ido@xxxxxxxxxx>
Date: Tue Oct 12 14:49:10 2010 +0200
wl1271: Fix TX starvation
While wl1271_irq_work handles RX directly (by calling wl1271_rx), a different
work is scheduled for transmitting packets. The IRQ work might handle more than
one interrupt during a single call, including multiple TX completion
interrupts. This might starve TX, since no packets are transmitted until all
interrupts are handled.
Fix this by calling the TX work function directly, instead of deferring
it.
Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 6c6e669ed6282788d6045397ce0f201edc400d9d
Author: Ido Yariv <ido@xxxxxxxxxx>
Date: Tue Oct 12 14:49:09 2010 +0200
wl1271: TX aggregation optimization
In case the aggregation buffer is too small to hold all available packets,
the buffer is transferred to the FW and no more packets are aggregated.
Although there may be enough available TX blocks, no additional packets will
be handled by the current TX work.
Fix this by flushing the aggregation buffer when it's full, and continue
transferring packets as long as there are enough available TX blocks.
Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit c8aea565e8f715d9f10064b1cbfbc15bf75df501
Author: Gery Kahn <geryk@xxxxxx>
Date: Tue Oct 5 16:09:05 2010 +0200
wl1271: ref_clock cosmetic changes
Cosmetic cleanup for ref_clock code while configured by board.
Signed-off-by: Gery Kahn <geryk@xxxxxx>
Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
commit 34d59c07e9ad7130813c28f8554ef1298af923b7
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Sat Oct 23 09:15:46 2010 -0700
iwlagn: use 6000g2b uCode for 130 series devices
For 130 series device, 6000g2b uCode will be used, no need to
have additional defines for 130 devices, so remove those.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 69d826b6c54de113f02a73990b6f6809289b48cc
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Sat Oct 23 09:15:45 2010 -0700
iwlwifi: add new devices to Kconfig
Adding description to Kconfig to indicate more devices
are being supported by iwlagn
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f5682c01eb85fce13d064d232c947322bd7e2631
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date: Sat Oct 23 09:15:44 2010 -0700
iwlagn: turn dynamic smps on while BT is on
While BT is on and doing iscan and/or pscan, BT is in listen
mode which will impact WiFi throughput, we need to
enable dynamic smps in order to improve the rx throughput.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d4daaea656e0b5543c2e37c31934cea8f044b31e
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Oct 23 09:15:43 2010 -0700
iwlwifi: implement switching iftype while up
Implement switching the interface while an
interface is up in iwlwifi. Interfaces have
to stay on the context they were created on.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit bd50a8ab9f48787109f6ff761c8f0e185e3d0690
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Oct 23 09:15:42 2010 -0700
iwlwifi: fix IBSS beaconing
My previous patch to clean up all RXON handling
inadvertently broke IBSS because it failed to
take into account that unlike in AP mode, IBSS
requires beacons to be sent only after setting
the RXON assoc.
Fix this, clean up the code a bit, improve the
error checking around this, and also react to
beacon changes in IBSS mode from mac80211.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2295c66b68ae160dde2e6e2dc4f3061105153bfc
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Oct 23 09:15:41 2010 -0700
iwlagn: new RXON processing for modern devices
In order to simplify the flow, and make new
enhancements easier, separate out the RXON
processing for modern AGN (5000 and newer)
from RXON processing for the older 3945 and
4965 devices. Avoid changing these old ones
to avoid regressions and move their code to
a new file (iwl-legacy.c). 4965 gets the
commit_rxon that used to be common for all
AGN devices, but with removed PAN support.
The new RXON processing is more central and
does more work in committing, so that it is
easier to follow.
To make it more evident what is split out
for legacy, split the necessary operations
for that into a new struct iwl_legacy_ops.
Those parts that still exist in the new AGN
code don't need to be parametrized.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2d4e43c3c6783f956163c11568303b0390725e28
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Oct 23 09:15:40 2010 -0700
iwlagn: don't resend RXON timing
Resending RXON timing here caused issues with
dual-mode under certain circumstances, so avoid
doing it here right now.
This effectively reverts b01efe434bd6ea807eb72b
and partially 2491fa42d9bdf26075765. The next
patch will make all this cleaner for just the
devices that need it.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit dc21b5453249e7e9b8878fab356fd60b731cf04d
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Sat Oct 23 09:15:39 2010 -0700
iwlwifi: make mac80211 ops a device config
In the future, 4965 and modern AGN devices will
need to have different mac80211 callbacks since
they have different capabilities. Prepare for
that by making the mac80211 operations a device
config.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 07caf9d6c9135ae25a760867f37aab90c1008380
Author: Eliad Peller <eliad@xxxxxxxxxx>
Date: Wed Oct 27 14:58:29 2010 +0200
mac80211: refactor debugfs function generation code
refactor mac80211 debugfs code by using a format© function, instead of
duplicating the code for each generated function.
this change reduces about 600B from mac80211.ko
Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6a6733f256f18cbcf4875e13f59eedb593b755a8
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Oct 26 15:27:25 2010 -0700
ath9k: content DMA start / stop through the PCU lock
This helps align resets / RX enable & disable / TX stop / start.
Locking around the PCU is important to ensure the hardware doesn't
get stale data when working with DMA'able data.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Kyungwan Nam <kyungwan.nam@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4bdd1e978ede034c1211957eb17eaf50de00d234
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Oct 26 15:27:24 2010 -0700
ath9k: move the PCU lock to the sc structure
The PCU lock should be used to contend TX DMA as well,
this will be done next.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Kyungwan Nam <kyungwan.nam@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9d94674ab754be0e275120a183670ead435f9c0d
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Tue Oct 26 15:27:23 2010 -0700
ath9k: simplify hw reset locking
The new PCU lock is better placed so we can just contend
against that when trying to reset hardware.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Kyungwan Nam <kyungwan.nam@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5d4c428254f73bae272be9d296724b1ee09d76ec
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Tue Oct 26 21:28:57 2010 +0530
ath9k: Properly assign boolean types
This takes care that boolean types are properly assigned
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date: Tue Oct 26 20:11:29 2010 +0530
ath9k_htc: Handle monitor mode properly for HTC devices
No need to inform about monitor interface changes to
firmware. Set the HW mode to monitor type based on mac80211
indication flag is sufficient.
Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f60dc0138aa19769bf8bab9f93b043235428b66f
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Oct 25 16:12:37 2010 -0400
iwlwifi: Convert to new PCI PM framework
Use the new PCI PM and let the PCI core code handle the PCI-specific
details of power transitions.
Based on similarly titled ath9k patch posted by Rafael J. Wysocki.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
commit b9237578f8d685bb86901ba9ff0d379218e5a3c5
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Oct 25 10:33:07 2010 -0400
rt2x00pci: do not use GFP_DMA
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
commit 26f94dc264a7ebddcc08d3908e99880703d871e5
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date: Mon Oct 25 10:24:09 2010 -0400
b43: remove extraneous code in free_ringmemory
This code seems to have been cut-n-pasted from alloc_ringmemory?
Anyway, it is useless.
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8e7ce8930165c785ec1c754ef3e3092a3bdffe02
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date: Sat Oct 23 19:51:32 2010 +0200
carl9170: fix typos
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Acked-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a2d9bc6fdc0c8693b5641c69bce7eaf5b47f0593
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Fri Oct 22 17:43:49 2010 +0200
b43: N-PHY: improve 2055 radio initialization
1) Upload 5 GHz values when needed.
2) Do not upload all values on first init. Follow wl.
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Fri Oct 22 17:43:48 2010 +0200
b43: N-PHY: determine usage of radio regulatory workaround correctly
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Fri Oct 22 17:43:47 2010 +0200
b43: define known SPROM boardflags2 bits
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c0b102c20972cfa3e10a0cf4a2a563edb70961b1
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Fri Oct 22 17:43:46 2010 +0200
b43: N-PHY: fix 2055 radio init
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3eb9616af24d6a1910ae6ae5c2d51719eba960cf
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Oct 22 17:04:30 2010 +0200
iwlwifi: avoid commit rxon during scan in iwl_set_no_assoc
Currently we are canceling scan when changing BSSID. Behave the same
when changing association and beacon enablement, to avoid committing
rxon during scan in iwl_set_no_assoc().
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ac4f5457c7617999967e9740f8903b922714bab4
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Oct 22 17:04:29 2010 +0200
iwlwifi: defer update power mode while scan
Do not set power mode when scanning, and defer that when scan finish.
We still set power mode in force case i.e. when device is overheated.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 5eda74a40587139b1d66cd8197cac92ba36e79f4
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Oct 22 17:04:28 2010 +0200
iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work
Avoid sending commands to firmware (including commit_rxon) when scan
is pending and we are calling iwlagn_bt_traffic_change_work simultaneously.
Also comment some innocent race conditions.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 749ff4efa14df904c22b28e2f7b10a02119a4d5e
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Oct 22 17:04:27 2010 +0200
iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter
Almost anywhere in the code we avoid committing rxon while performing
scan, and make rxon commit when scan complete. However in some places
in the code we do not follow that rule. This patch fix that problem in
iwlagn_configure_filter().
Since we do not commit directly in iwl3945_configure_filter, we can
also do the same for agn, so I just remove iwlcore_commit_rxon()
function and add a comment. Also change comment for iwl3945.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a25a66ac94db88190653d5725c563e3f8faeee61
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Oct 22 17:04:26 2010 +0200
iwlwifi: fix set_tx_power vs scan
According to comment in iwl_bg_scan_completed, setting tx power should
be deferred during pending scan, but we are not doing this.
This patch change code to really defer setting tx power after scan
complete. Additionally refactor iwl_set_tx_power code and call
lib->send_tx_power() directly from iwlagn_commit_rxon.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4cbf1b12491cd43032846acc6c6924d9090fa19f
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Fri Oct 22 17:04:25 2010 +0200
iwlwifi: send tx_power_cmd synchronously
On 5xxx and 6xxx change to send tx_power_cmd command synchronously,
to do not start other commands when setting tx power is pending.
We currently do the same for 4956 and 3945.
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4beeba7dc59cc10d6a47346c857d1a64a9ec9642
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Mon Oct 25 10:34:50 2010 +0200
iwlwifi: warn when send tx power settings during scan
Add WARN_ONCE when scanning is pending. Use STATUS_SCAN_HW bit since we
can have scan canceled or completed but STATUS_SCANNING bit still set.
v1 -> v2: replace EIO to EAGAIN
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit c7317e41df30c7e04dca46360e5ebb0cb36dda45
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Oct 21 02:47:25 2010 +0200
mac80211: minstrel_ht - reduce the overhead of rate sampling
- reduce the number of retransmission attempts for sample rates
- sample lower rates less often
- do not use RTS/CTS for sampling frames
- increase the time between sampling attempts
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ff32d9cd2c4107224a28f39d3c72eec66d566e09
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Thu Oct 21 02:47:23 2010 +0200
ath9k_hw: fix potential spurious tx error bit interpretation
According to documentation, AR_ExcessiveRetries, AR_Filtered and
AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear.
Not checking this might result in suboptimal FIFO settings, unnecessary
retransmissions, or other connectivity issues.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 78a7685e1e44c6d4b6f79c73687b9322e40b040e
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 16:07:08 2010 -0700
ath9k: add a debug warning when we cannot stop RX
We have seen several DMA races when we race against
stopping and starting the PCU. I suspect that when
we cannot stop the PCU we may hit some of these same
races so warn against them for now but only when
debugging (CONFIG_ATH_DEBUG) is enabled.
If you run into this warning and are a developer,
please fix the cause of the warning. The potential
here, although I cannot prove yet, is that the DMA
engine can be confused and start writing to a buffer
that was already DMA'd before and at least the kernel
assumes is not being accessed by hardware anymore.
Cc: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Kyungwan Nam <kyungwan.nam@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit b87b0128894efd3bbf7272a579f71b3a2bc500d1
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Thu Oct 21 12:10:11 2010 -0700
ath: add a ATH_DBG_WARN()
To be used to throw out warnings only for developers.
This can be used by some corner cases that developers
already know can be hit but developers want to address
so to avoid spewing out a warning this can only be
enabled with CONFIG_ATH_DEBUG enabled.
Cc: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Kyungwan Nam <kyungwan.nam@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit d91e41b690f795c04af4eb6fe28d2cafd3291051
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 10:18:59 2010 -0700
cfg80211: prefix REG_DBG_PRINT() with cfg80211
Everyone's doing it, its the cool thing.
Cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e702d3cf29143327679ce2e2a60775eaf829f377
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Thu Oct 21 19:17:04 2010 +0530
cfg80211: add debug print when processing a channel
In the worst case you are seeing really odd things you want
more information than what is provided right now, for those
that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
provide a print of when we are processing a channel and with what
regulatory rule.
Cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a65185367f9f876448f0f12ac09a673d20371efc
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 10:18:57 2010 -0700
cfg80211: add debug print when disabling a channel on a custom regd
Cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 926a0a094d2b9052db3f7f37438c3d305cea4be7
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Thu Oct 21 19:17:03 2010 +0530
cfg80211: add debug prints for when we ignore regulatory hints
This can help with debugging issues. You will only see
these with CONFIG_CFG80211_REG_DEBUG enabled.
Cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ca4ffe8f2848169a8ded0ea8a60b2d81925564c9
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 10:18:55 2010 -0700
cfg80211: fix disabling channels based on hints
After a module loads you will have loaded the world roaming regulatory
domain or a custom regulatory domain. Further regulatory hints are
welcomed and should be respected unless the regulatory hint is coming
from a country IE as the IEEE spec allows for a country IE to be a subset
of what is allowed by the local regulatory agencies.
So disable all channels that do not fit a regulatory domain sent
from a unless the hint is from a country IE and the country IE had
no information about the band we are currently processing.
This fixes a few regulatory issues, for example for drivers that depend
on CRDA and had no 5 GHz freqencies allowed were not properly disabling
5 GHz at all, furthermore it also allows users to restrict devices
further as was intended.
If you recieve a country IE upon association we will also disable the
channels that are not allowed if the country IE had at least one
channel on the respective band we are procesing.
This was the original intention behind this design but it was
completely overlooked...
Cc: David Quan <david.quan@xxxxxxxxxxx>
Cc: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 749b527b21465fb079796c03ffb4302584dc31c1
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 10:18:54 2010 -0700
cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
even if we haven't yet recieved regulatory domain hint for the driver
if it needed one. Without this Country IEs are not passed on to drivers
that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.
This was part of the original design, however it was completely
overlooked...
Cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 10:18:53 2010 -0700
cfg80211: pass the reg hint initiator to helpers
This is required later.
Cc: Easwar Krishnan <easwar.krishnan@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Wed Oct 20 10:16:58 2010 -0700
rfkill: remove dead code
The following code is defined but never used.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e081685c1bbe8da37c7f61726fdb783ff277f14f
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Wed Oct 20 09:59:33 2010 -0500
ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices
MMIO log traces obtained using the Broadcom wl hybrid driver show that
the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared
if non-zero. Similar code found in other drivers such as ipw2100 show
this operation is needed to keep PCI Tx retries from interfering with
C3 CPU state. There are no known cases where omission of this code has
caused a problem, but this patch is offered just in case such a situation
occurs.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 14fb7c17e97ea0fcc545393fb1f34e6541647b5b
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 06:59:38 2010 -0700
ath5k: make ath5k_update_bssid_mask_and_opmode() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/base.c:569:6: warning: symbol
'ath5k_update_bssid_mask_and_opmode' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f8c2a0871b8462481a02445b38a7321ad63bfc88
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 06:59:37 2010 -0700
ath: make ath_hw_set_keycache_entry() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/key.c
drivers/net/wireless/ath/key.c:110:6: warning: symbol
'ath_hw_set_keycache_entry' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit a3685d119dacb07a7080169fea2847ef385b209f
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Wed Oct 20 06:59:36 2010 -0700
ath: make ath_hw_keysetmac() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/key.c
drivers/net/wireless/ath/key.c:70:6: warning: symbol 'ath_hw_keysetmac' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit babcbc295fee766ca710235e431686fef744d9a6
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Oct 20 02:09:46 2010 +0200
ath9k: initialize per-channel tx power limits instead of hardcoding them
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit de40f316c01b1ba9535e6dc99f6a67e7655b07da
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Oct 20 03:08:53 2010 +0200
ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower
ath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set -
causes the rate txpower table and the regulatory limit to be calculated
and stored, without changing hardware registers.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 6b7b6cf553f881d45bb37a73f5db956afb290a08
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Wed Oct 20 02:09:44 2010 +0200
ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003
The same is done for the older chip families as well.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 900fcf091e95fbcc773b72c770afcd2e8eda4da2
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 09:29:24 2010 +0000
net: sh_eth: Move off of deprecated I/O routines.
sh_eth is the last in-tree user of the ctrl_xxx I/O routines. This simply
converts them over to regular MMIO accesors.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 636e19a34275d7d6fda0fefa965b1e2a715e2b02
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Sat Oct 30 14:22:42 2010 +0000
net: consolidate 8021q tagging
Now that VLAN packets are tagged in dev_hard_start_xmit()
at the bottom of the stack we no longer need to tag them
in the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR
case).
This allows the accel path and non accel paths to be consolidated.
Here the vlan_tci in the skb is always set and we allow the
stack to add the actual tag in dev_hard_start_xmit().
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Acked-by: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Sat Oct 30 14:22:37 2010 +0000
net: remove check for headroom in vlan_dev_create
It is possible for the headroom to be smaller then the
hard_header_len for a short period of time after toggling
the vlan offload setting.
This is not a hard error and skb_cow_head is called in
__vlan_put_tag() to resolve this.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Acked-by: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 029f5fc31cdb35d6c8a7fe9a54bf21556e175988
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date: Sat Oct 30 14:22:32 2010 +0000
8021q: set hard_header_len when VLAN offload features are toggled
Toggling the vlan tx|rx hw offloads needs to set the hard_header_len
as well otherwise we end up using LL_RESERVED_SPACE incorrectly.
This results in pskb_expand_head() being used unnecessarily.
Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
Acked-by: Jesse Gross <jesse@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 58e998c6d23988490162cef0784b19ea274d90bb
Author: Jesse Gross <jesse@xxxxxxxxxx>
Date: Fri Oct 29 12:14:55 2010 +0000
offloading: Force software GSO for multiple vlan tags.
We currently use vlan_features to check for TSO support if there is
a vlan tag. However, it's quite likely that the NIC is not able to
do TSO when there is an arbitrary number of tags. Therefore if there
is more than one tag (in-band or out-of-band), fall back to software
emulation.
Signed-off-by: Jesse Gross <jesse@xxxxxxxxxx>
CC: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c8d5bcd1aff89199cde4bd82c5c40fb704c8bba4
Author: Jesse Gross <jesse@xxxxxxxxxx>
Date: Fri Oct 29 12:14:54 2010 +0000
offloading: Support multiple vlan tags in GSO.
We assume that hardware TSO can't support multiple levels of vlan tags
but we allow it to be done. Therefore, enable GSO to parse these tags
so we can fallback to software.
Signed-off-by: Jesse Gross <jesse@xxxxxxxxxx>
CC: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e1e78db628b33c657944865e3bca01ee59cc5b80
Author: Jesse Gross <jesse@xxxxxxxxxx>
Date: Fri Oct 29 12:14:53 2010 +0000
offloading: Make scatter/gather more tolerant of vlans.
When checking if it is necessary to linearize a packet, we currently
use vlan_features if the packet contains either an in-band or out-
of-band vlan tag. However, in-band tags aren't special in any way
for scatter/gather since they are part of the packet buffer and are
simply more data to DMA. Therefore, only use vlan_features for out-
of-band tags, which could potentially have some interaction with
scatter/gather.
Signed-off-by: Jesse Gross <jesse@xxxxxxxxxx>
CC: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Reviewed-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 410989f65151557701ce86875b141e694281dd6c
Author: Casey Leedom <leedom@xxxxxxxxxxx>
Date: Thu Nov 11 09:30:43 2010 +0000
cxgb4vf: Advertise NETIF_F_TSO_ECN.
Advertise NETIF_F_TSO_ECN.
Signed-off-by: Casey Leedom <leedom@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4204875dd4b3c3e40e0294a8c2619fdf9e5907e1
Author: Casey Leedom <leedom@xxxxxxxxxxx>
Date: Thu Nov 11 09:30:42 2010 +0000
cxgb4vf: fix up "Section Mismatch" compiler warning.
Fix up "Section Mismatch" compiler warning and mark another routine as
__devinit.
Signed-off-by: Casey Leedom <leedom@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f12fe3536bebcbd2ccfa80030ec7d9868c488d30
Author: Casey Leedom <leedom@xxxxxxxxxxx>
Date: Thu Nov 11 09:30:41 2010 +0000
cxgb4vf: add ethtool statistics for GRO.
Add ethtool statistics for GRO.
Signed-off-by: Casey Leedom <leedom@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit caedda35c6dba5a283e5d87e77a8d19ee4be3183
Author: Casey Leedom <leedom@xxxxxxxxxxx>
Date: Thu Nov 11 09:30:40 2010 +0000
cxgb4vf: minor comment/symbolic name cleanup.
Minor cleanup of comments and symbolic constant names for clarity.
Signed-off-by: Casey Leedom <leedom@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d9aa93804e53f2153260568024b75ad3d81784f9
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 15 08:52:02 2010 -0800
ipv4: Fix build with multicast disabled.
net/ipv4/igmp.c: In function 'ip_mc_inc_group':
net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl'
net/ipv4/igmp.c:1228: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_unmap':
net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped'
...
Move for_each_pmc_rcu and for_each_pmc_rtnl macro definitions
outside of multicast ifdef protection.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6021afcf19d8c6f5db6d11cadcfb6a22d0c28a48
Author: Edgar (gimli) Hucek <gimli@xxxxxxxxxxxxxx>
Date: Tue Nov 9 17:38:42 2010 +0100
input: bcm5974: Add support for MacBookAir3
This patch adds support for the MacBookAir3,1 and MacBookAir3,2
models.
[rydberg@xxxxxxxxxxx: touchpad range calibration]
Cc: stable@xxxxxxxxxx
Signed-off-by: Edgar (gimli) Hucek <gimli@xxxxxxxxxxxxxx>
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 20a4c261ad9cec39942257b1f91765a4b238db05
Author: Paul Fox <pgf@xxxxxxxxxx>
Date: Mon Nov 15 01:33:24 2010 -0800
Input: hgpk - fix powersave mode
Recent testing of this codepath showed that it wasn't working,
perhaps due to changes within the input layer. This fixes it.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 34caed2082105a6d9f5aaba1cf4e02760cbee14e
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Mon Nov 15 01:33:22 2010 -0800
Input: hgpk - recalibration tweaks
Disable the recalibration guard where new recalibrations are triggered
if we detect a packet too soon after calibrating - we found that this
results in erroneous recalibrations, and if the recalibration failed
then the rest of our badness-detection code will request another.
Add a module option disabling all of the recalibration code, in case
an OLPC deployment thinks all of the workarounds we have are doing
more damage than good and wants to experiment with them all disabled.
Based on work by Paul Fox.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 67f56bb0f4997b55291c162077e02e4f29639fc2
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Mon Nov 15 01:28:54 2010 -0800
Input: hgpk - detect simple mode overflows
Based on work by Paul Fox.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 7e87fe84303cc54ecf3c7b688cb08ca24322a41d
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Sun Nov 14 17:26:13 2010 +0100
dccp ccid-2: Separate option parsing from CCID processing
This patch replaces an almost identical replication of code: large parts
of dccp_parse_options() re-appeared as ccid2_ackvector() in ccid2.c.
Apart from the duplication, this caused two more problems:
1. CCIDs should not need to be concerned with parsing header options;
2. one can not assume that Ack Vectors appear as a contiguous area within an
skb, it is legal to insert other options and/or padding in between. The
current code would throw an error and stop reading in such a case.
Since Ack Vectors provide CCID-specific information, they are now processed
by the CCID directly, separating this functionality from the main DCCP code.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 52394eecec4e6fa677a61af26f0bd35de665344e
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Sun Nov 14 17:26:02 2010 +0100
dccp ccid-2: Remove old infrastructure
This removes
* functions for which updates have been provided in the preceding patches and
* the @av_vec_len field - it is no longer necessary since the buffer length is
now always computed dynamically.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit d83447f0944e73d690218d79c07762ffa4ceb9e4
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Sun Nov 14 17:25:46 2010 +0100
dccp ccid-2: Schedule Sync as out-of-band mechanism
The problem with Ack Vectors is that
i) their length is variable and can in principle grow quite large,
ii) it is hard to predict exactly how large they will be.
Due to the second point it seems not a good idea to reduce the MPS; in
particular when on average there is enough room for the Ack Vector and an
increase in length is momentarily due to some burst loss, after which the
Ack Vector returns to its normal/average length.
The solution taken by this patch is to subtract a minimum-expected Ack Vector
length from the MPS, and to defer any larger Ack Vectors onto a separate
Sync - but only if indeed there is no space left on the skb.
This patch provides the infrastructure to schedule Sync-packets for transporting
(urgent) out-of-band data. Its signalling is quicker than scheduling an Ack, since
it does not need to wait for new application data.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 18219463c884bfdb7954d298b9edb5194b14d621
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Sun Nov 14 17:25:36 2010 +0100
dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module
This aggregates Ack Vector processing (handling input and clearing old state)
into one function, for the following reasons and benefits:
* all Ack Vector-specific processing is now in one place;
* duplicated code is removed;
* ensuring sanity: from an Ack Vector point of view, it is better to clear the
old state first before entering new state;
* Ack Event handling happens mostly within the CCIDs, not the main DCCP module.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 3802408644515e29fb723d51a5317301b212cf3a
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Sun Nov 14 17:25:23 2010 +0100
dccp ccid-2: Update code for the Ack Vector input/registration routine
This patch updates the code which registers new packets as received, using the
new circular buffer interface. It contributes a new algorithm which
* supports both tail/head pointers and buffer wrap-around and
* deals with overflow (head/tail move in lock-step).
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Sun Nov 14 17:25:11 2010 +0100
dccp ccid-2: Algorithm to update buffer state
This provides a routine to consistently update the buffer state when the
peer acknowledges receipt of Ack Vectors; updating state in the list of Ack
Vectors as well as in the circular buffer.
While based on RFC 4340, several additional (and necessary) precautions were
added to protect the consistency of the buffer state. These additions are
essential, since analysis and experience showed that the basic algorithm was
insufficient for this task (which lead to problems that were hard to debug).
The algorithm now
* deals with HC-sender acknowledging to HC-receiver and vice versa,
* keeps track of the last unacknowledged but received seqno in tail_ackno,
* has special cases to reset the overflow condition when appropriate,
* is protected against receiving older information (would mess up buffer state).
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 4232f60791d12a5156c3e1c9b04ae08b873a2920
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Nov 11 14:45:09 2010 +0000
fbdev: sh_mobile_hdmi: add support for E-EDID parsing
Many HDMI clients implement enhanced EDID blocks, which often contain
additional supported video modes. This patch implements parsing of such
E-EDID blocks.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d8d776f3fb1ff19c37d43b600fc8c128ff172deb
Merge: c724d07a56e60e91b0aa75193f86fb000545ffe4 0ad83f6882c41df1a7fa387086029e162038c1f2
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 15 14:57:49 2010 +0900
Merge branch 'fbdev/edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/fbdev-2.6 into common/fbdev-edid
commit 0ad83f6882c41df1a7fa387086029e162038c1f2
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Nov 11 15:45:04 2010 +0100
fbdev: when parsing E-EDID blocks, also use SVD entries
Add parsing of E-EDID SVD entries. In this first version only a few
CEA/EIA-861E modes are implemented, more can be added as needed.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e4105119aca9b86b163fa07428df1f615034a03d
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Nov 11 15:44:52 2010 +0100
fbdev: export fb_edid_add_monspecs() for modules, improve algorithm
fb_edid_add_monspecs() should also be exported for use in modules, and it
requires a dummy version for the case, when CONFIG_FB_MODE_HELPERS is not
selected. This patch also improves the algorithm by removing a redundant
memory allocation, adds function documentation, adds data verification and
replaces memmove() with memcpy().
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9fbbdde93231ad7f35c217aa6bbbc7995133f483
Author: Erik Gilling <konkers@xxxxxxxxxxx>
Date: Thu Nov 11 15:44:43 2010 +0100
video: add fb_edid_add_monspecs for parsing extended edid information
Modern monitors/tvs have more extended EDID information blocks which can
contain extra detailed modes. This adds a fb_edid_add_monspecs function
which drivers can use to parse those additions blocks.
Signed-off-by: Erik Gilling <konkers@xxxxxxxxxxx>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sun Nov 14 19:04:47 2010 -0800
drivers/spi: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit c25ecd0a21d5e08160cb5cc984f9e2b8ee347443
Merge: 190683a9d5457e6d962c232ffbecac3ab158dddd 9457b24a0955bbdd2e89220a75de69fe09501bba
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Nov 14 11:57:05 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 362d31297fafb150676f4d564ecc7f7f3e3b7fd4
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Sun Nov 14 03:34:30 2010 +0000
[CIFS] fs/cifs/Kconfig: CIFS depends on CRYPTO_HMAC
linux-2.6.37-rc1: I compiled a kernel with CIFS which subsequently
failed with an error indicating it couldn't initialize crypto module
"hmacmd5". CONFIG_CRYPTO_HMAC=y fixed the problem.
This patch makes CIFS depend on CRYPTO_HMAC in kconfig.
Signed-off-by: Jody Bruchon<jody@xxxxxxxxxxxxx>
CC: Shirish Pargaonkar <shirishp@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 59c55ba1fba61ae13fbfff094a674e73407201f1
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Nov 12 06:30:29 2010 -0500
cifs: don't take extra tlink reference in initiate_cifs_search
It's possible for initiate_cifs_search to be called on a filp that
already has private_data attached. If this happens, we'll end up
calling cifs_sb_tlink, taking an extra reference to the tlink and
attaching that to the cifsFileInfo. This leads to refcount leaks
that manifest as a "stuck" cifsd at umount time.
Fix this by only looking up the tlink for the cifsFile on the filp's
first pass through this function. When called on a filp that already
has cifsFileInfo associated with it, just use the tlink reference
that it already owns.
This patch fixes samba.org bug 7792:
https://bugzilla.samba.org/show_bug.cgi?id=7792
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Reviewed-and-Tested-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 190683a9d5457e6d962c232ffbecac3ab158dddd
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 10 10:50:44 2010 +0000
net: net_families __rcu annotations
Use modern RCU API / annotations for net_families array.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e85eb11782259dc39502807f3ec903a7b82b1bab
Author: Philippe De Muyter <phdm@xxxxxxxxx>
Date: Thu Nov 11 12:31:21 2010 +0000
net: Kconfig whitespace cleanup
Many lines in Kconfig start withe 8 spaces instead of a TAB, and even
sometimes with 7 spaces. Replace 10 or 9 spaces, or TAB + 1 space,
by TAB + 2 spaces, and 8 or 7 spaces by TAB.
Signed-off-by: Philippe De Muyter <phdm@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d7138de878d1d4210727c1200193e69596f93b3
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Nov 12 05:46:50 2010 +0000
igmp: RCU conversion of in_dev->mc_list
in_dev->mc_list is protected by one rwlock (in_dev->mc_list_lock).
This can easily be converted to a RCU protection.
Writers hold RTNL, so mc_list_lock is removed, not replaced by a
spinlock.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Cypher Wu <cypher.w@xxxxxxxxx>
Cc: Américo Wang <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f5539b5bfa2e00f2a6fd35731db66142a2f327c0
Author: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Date: Fri Nov 12 12:43:34 2010 -0800
stmmac: update the driver documentation
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f92c8dd7a0eb18124521e2b549f88422e17f707b
Author: Bob Peterson <rpeterso@xxxxxxxxxx>
Date: Fri Nov 12 11:15:20 2010 -0600
dlm: reduce cond_resched during send
Calling cond_resched() after every send can unnecessarily
degrade performance. Go back to an old method of scheduling
after 25 messages.
Signed-off-by: Bob Peterson <rpeterso@xxxxxxxxxx>
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
commit cb2d45da81c86d5191b19d0f67732a854bc0253c
Author: David Teigland <teigland@xxxxxxxxxx>
Date: Fri Nov 12 11:12:55 2010 -0600
dlm: use TCP_NODELAY
Nagling doesn't help and can sometimes hurt dlm comms.
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
commit dcce240ead802d42b1e45ad2fcb2ed4a399cb255
Author: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Date: Fri Nov 12 12:12:29 2010 +0000
dlm: Use cmwq for send and receive workqueues
So far as I can tell, there is no reason to use a single-threaded
send workqueue for dlm, since it may need to send to several sockets
concurrently. Both workqueues are set to WQ_MEM_RECLAIM to avoid
any possible deadlocks, WQ_HIGHPRI since locking traffic is highly
latency sensitive (and to avoid a priority inversion wrt GFS2's
glock_workqueue) and WQ_FREEZABLE just in case someone needs to do
that (even though with current cluster infrastructure, it doesn't
make sense as the node will most likely land up ejected from the
cluster) in the future.
Signed-off-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
commit 87abb6bbdbcfbced2ce0bcad68dd89ac3ff9464b
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Nov 11 22:03:59 2010 -0800
Input: mac mouse emulation - add locking
We need to add appropriate locking when toggling mac mouse emulation
on and off to ensure that input device and handler are in consistent
state.
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit a309cdc778b9eece59b34e9e1c26e41476dbbcd6
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Thu Nov 11 22:20:03 2010 -0800
Input: hgpk - extend jumpiness detection
In addition to forcing recalibrations upon detection of cursor jumps (and
performing them quicker than before), detect and discard errant 'jump'
packets caused by a firmware bug, which are then repeated with each one
being approximately half the delta of the one previously (as if it is
averaging out)
Based on original work by Paul Fox.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit c0dc8342656a1425c31dcc505072f2387f0f0c92
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Thu Nov 11 22:20:02 2010 -0800
Input: hgpk - rework spew detection
The old implementation of spew detection simply tracked the overall
position delta of the cursor over every 100 packets. We found that
this causes occasional false positives in spew detection, and also
that the conditions of the spewy packets are perhaps more fixed than
we once thought.
Rework the spew detection to look for packets of specific small
delta, and only recalibrating if the overall movement delta stays
within expected bounds.
Also discard duplicate packets in the advanced mode, which appear
to be very common. If we don't, the spew detection kicks in far
too early. If we get a large spew of duplicates, request a
recalibration straight up.
Based on earlier work by Paul Fox.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit ca94ec43540ce5d93fd30a3bf88321b6f11ed51a
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Thu Nov 11 22:19:57 2010 -0800
Input: hgpk - support GlideSensor and PenTablet modes
Add a "hgpk_mode" sysfs attribute that allows selection between 3 options:
Mouse (the existing option), GlideSensor and PenTablet.
GlideSensor is an enhanced protocol for the regular touchpad mode that
additionally reports pressure and uses absolute coordinates. We suspect
that it may be more reliable than mouse mode in some environments.
PenTablet mode puts the touchpad into resistive mode, you must then use
a stylus as an input. We suspect this is the most reliable way to drive
the touchpad.
The GlideSensor and PenTablet devices expose themselves with the
intention of being combined with the synaptics X11 input driver.
Based on earlier work by Paul Fox.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 10ee2ded629b1571cef1182728d6f65dbe4c7f79
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Nov 11 01:03:00 2010 -0800
Input: pcf_keypad - convert to dev_op_ops
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 2a0591596b302adc654a1caf6bd3d0063407ea4b
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date: Thu Nov 11 21:52:18 2010 -0800
Input: xpad - remove useless check in xpad_remove
ixpad can never be NULL here; if it is NULL we would not have been bound to
the interface and then why would we be called?
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 161feb2417dd0c4324c2e8da24aaebd30a436d45
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Thu Nov 11 21:47:42 2010 -0800
Input: xpad - fix resource reclaim in xpad_probe error path
Properly free the resources in error path by the reverse order of resource
allocation.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 6ff92a6db2083ecd1a8e2742d9397159fd880987
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Thu Nov 11 21:43:17 2010 -0800
Input: xpad - fix a memory leak
In xpad_led_disconnect(), what we really want is to kfree(xpad_led).
In xpad_disconnect(), add a missing kfree(xpad->bdata) to fix the memory leak.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit 49cc69b6789b57d2d8ed78843c4219525b433b58
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date: Thu Nov 11 21:39:11 2010 -0800
Input: xpad - return proper error in error path
In current implementation, xpad_probe return 0 when
usb_alloc_urb failed for xpad->bulk_out and kzalloc failed for xpad->bdata.
This patch removes the initialization for error variable,
assign the error code at the place the error happens instead.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
commit c753796769e4fb0cd813b6e5801b3c01f4681d4f
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Nov 11 17:07:48 2010 -0800
ipv4: Make rt->fl.iif tests lest obscure.
When we test rt->fl.iif against zero, we're seeing if it's
an output or an input route.
Make that explicit with some helper functions.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 37bc9f5078c62bfa73edeb0053edceb3ed5e46a4
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date: Tue Nov 9 12:08:08 2010 -0800
x86: Ce4100: Add reboot_fixup() for CE4100
This patch adds the CE4100 reboot fixup to reboot_fixups_32.c
[ tglx: Moved PCI id to reboot_fixups_32.c ]
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@xxxxxxxxx>
LKML-Reference: <5bdcfb4f0206fa721570504e95659a03b815bc5e.1289331834.git.dirk.brandewie@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 91d8037f563e4a86ff8b02c994530989c7936427
Author: Dirk Brandewie <dirk.j.brandewie@xxxxxxxxx>
Date: Tue Nov 9 12:08:05 2010 -0800
ce4100: Add PCI register emulation for CE4100
This patch provides access methods for PCI registers that mis-behave on
the CE4100. Each register can be assigned a private init, read and
write routine. The exception to this is the bridge device. The
bridge device is the only device on bus zero (0) that requires any
fixup so it is a special case.
[ tglx: minor coding style cleanups, __init annotation and
simplification of ce4100_conf_read/write ]
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@xxxxxxxxx>
LKML-Reference: <40b6751381c2275dc359db5a17989cce22ad8db7.1289331834.git.dirk.brandewie@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit c751e17b5371ad86cdde6cf5c0175e06f3ff0347
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Nov 9 12:08:04 2010 -0800
x86: Add CE4100 platform support
Add CE4100 platform support. CE4100 needs early setup like
moorestown.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
LKML-Reference: <94720fd7f5564a12ebf202cf2c4f4c0d619aab35.1289331834.git.dirk.brandewie@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 2adc2917ce4bfb482a6e3c05ff543cef151c9830
Author: Baurzhan Ismagulov <ibr@xxxxxxxxxxx>
Date: Thu Nov 11 10:54:58 2010 +0100
serial: cpu_uart: Remove unused uart_cpm_port fields
AFAICT, these fields are not used anywhere.
Signed-off-by: Baurzhan Ismagulov <ibr@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5b04ec4ad8e2ffdc9d1f27fd6eb5118e919bc87d
Author: Baurzhan Ismagulov <ibr@xxxxxxxxxxx>
Date: Thu Nov 11 10:53:03 2010 +0100
serial: cpm_uat: reducing CPM serial latency
Setting Rx FIFO size to 1 reduces reader process wakeup latency up to
20x for baud rates <= 9600. This patch sets the Rx FIFO size to 1 for
baud rates <= 9600 or if low latency has been requested for the tty.
Signed-off-by: Michael Trimarchi <michael@xxxxxxxxxxxxxxxx>
Signed-off-by: Bruno Morelli <bruno@xxxxxxxxxxxxxxx>
Signed-off-by: Baurzhan Ismagulov <ibr@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 63295cb2ff4329f563579f3d20c5855a96a866d5
Author: Claudio Scordino <claudio@xxxxxxxxxxxxxxx>
Date: Thu Nov 11 11:22:36 2010 +0100
serial: add Documentation about RS485 serial communications
Documentation about RS485 serial communications
Signed-off-by: Claudio Scordino <claudio@xxxxxxxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Acked-by: Russell King <linux@xxxxxxxxxxxxxxxx>
Acked-by: Grant Edwards <grant.b.edwards@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5f9a31d63105c3e88bd6d026e7bc53f02a5ac042
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Thu Nov 4 15:17:27 2010 +0000
n_gsm: clean up printks
[Original From Ken Mills but I redid it using pr_ helpers instead]
Also fix up coding style, there are two warnings left but that is where
the CodingStyle tools blow up because they cannot handle
if (blah) {
foo
} else switch (x) {
case 1:
}
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c2f2f0000bb69f067fea12624272e6a58a811702
Author: Alan Cox <alan@xxxxxxxxxxxxxxx>
Date: Thu Nov 4 15:17:03 2010 +0000
n_gsm: Fix support for legacy encoding
The mux supports several encoding schemes. Encoding 0 is a "not
recommended" mode still sometimes used. This has now been tested with
hardware that supports this mode, and found wanting.
Fix the FCS handling in this mode and correct the state machine.
Signed-off-by: Ken Mills <ken.k.mills@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 304e12665a4a7b8b25dfe8c64fa4fd56a04a67ea
Author: Alexey Charkov <alchark@xxxxxxxxx>
Date: Mon Nov 8 20:33:20 2010 +0300
serial: Add support for UART on VIA VT8500 and compatibles
This adds a driver for the serial ports found in VIA and WonderMedia
Systems-on-Chip. Interrupt-driven FIFO operation is implemented.
The hardware also supports pure register-based operation (which is
slower) and DMA-based FIFO operation. As the FIFOs are only 16 bytes
long, DMA operation is probably not worth the hassle.
Signed-off-by: Alexey Charkov <alchark@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit af3b8881f4c9852eefe9c7f1a997b3ecf580561b
Author: Russ Gorby <richardx.r.gorby@xxxxxxxxx>
Date: Tue Oct 26 14:13:52 2010 +0100
ifx6x60: SPI protocol driver for Infineon 6x60 modem
Prototype driver for the IFX6x60 series of SPI attached modems by Jim
Stanley and Russ Gorby
Signed-off-by: Russ Gorby <richardx.r.gorby@xxxxxxxxx>
[Some reworking and a major cleanup]
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b36930dd508e00f0c5083bcd57d25de6d0375c76
Author: David Miller <davem@xxxxxxxxxxxxx>
Date: Wed Nov 10 21:56:39 2010 -0800
dlm: Handle application limited situations properly.
In the normal regime where an application uses non-blocking I/O
writes on a socket, they will handle -EAGAIN and use poll() to
wait for send space.
They don't actually sleep on the socket I/O write.
But kernel level RPC layers that do socket I/O operations directly
and key off of -EAGAIN on the write() to "try again later" don't
use poll(), they instead have their own sleeping mechanism and
rely upon ->sk_write_space() to trigger the wakeup.
So they do effectively sleep on the write(), but this mechanism
alone does not let the socket layers know what's going on.
Therefore they must emulate what would have happened, otherwise
TCP cannot possibly see that the connection is application window
size limited.
Handle this, therefore, like SUNRPC by setting SOCK_NOSPACE and
bumping the ->sk_write_count as needed when we hit the send buffer
limits.
This should make TCP send buffer size auto-tuning and the
->sk_write_space() callback invocations actually happen.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
commit ed1deb7021b4dfee1d544b91edff4ef92f5c3b54
Merge: 72cdd1d971c0deb1619c5c339270570c43647a78 b3d14bff12a38ad13a174eb0cc83d2ac7169eee4
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Nov 11 10:43:30 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit 72cdd1d971c0deb1619c5c339270570c43647a78
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 11 07:14:07 2010 +0000
net: get rid of rtable->idev
It seems idev field in struct rtable has no special purpose, but adding
extra atomic ops.
We hold refcounts on the device itself (using percpu data, so pretty
cheap in current kernel).
infiniband case is solved using dst.dev instead of idev->dev
Removal of this field means routing without route cache is now using
shared data, percpu data, and only potential contention is a pair of
atomic ops on struct neighbour per forwarded packet.
About 5% speedup on routing test.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Cc: Roland Dreier <rolandd@xxxxxxxxx>
Cc: Sean Hefty <sean.hefty@xxxxxxxxx>
Cc: Hal Rosenstock <hal.rosenstock@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 46b13fc5c0f239f36e84665c73087d5fa86bfd86
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 11 06:57:19 2010 +0000
neigh: reorder struct neighbour
It is important to move nud_state outside of the often modified cache
line (because of refcnt), to reduce false sharing in neigh_event_send()
This is a followup of commit 0ed8ddf4045f (neigh: Protect neigh->ha[]
with a seqlock)
This gives a 7% speedup on routing test with IP route cache disabled.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c0c04c2a89cf6363da2940da59afd2e30001b991
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:26:04 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2c91308f449c6705b81bd3370a0ec647e370f35c
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:26:03 2010 +0000
vxge: sparse and other clean-ups
Correct issues found by running sparse on the vxge driver, as well as
other miscellaneous cleanups.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1901d042abf10d08a829961a63fd158f9844587e
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:26:02 2010 +0000
vxge: update Kconfig
Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO).
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ca3e3b8fae982400dacbbf19f3112cc84e51d46a
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:26:01 2010 +0000
vxge: correct multi-function detection
The values used to determined if the adapter is running in single or
multi-function mode were previously modified to the values necessary
when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However,
the firmware call was not modified. This had the driver printing out on
probe that the adapter was in multi-function mode when in single
function mode and vice versa.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e7935c9669c27c5d530bff634c0c15f7a602d697
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:26:00 2010 +0000
vxge: Titan1A detection
Detect if the adapter is Titan or Titan1A, and tune the driver for this
hardware. Also, remove unnecessary function __vxge_hw_device_id_get.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c3150eac9f2e5f770b09d371f7716540219a46f6
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:59 2010 +0000
vxge: Handle errors in vxge_hw_vpath_fw_api
Propagate the return code of the call to vxge_hw_vpath_fw_api and
__vxge_hw_vpath_pci_func_mode_get. This enables the proper handling of
error conditions when querying the function mode of the device during
probe.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b81b37338412e3215670641e5025c85146521dea
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:58 2010 +0000
vxge: add receive hardware timestamping
Add support for enable/disabling hardware timestamping on receive
packets via ioctl call. When enabled, the hardware timestamp replaces
the FCS in the payload.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e8ac175615b9458a00193c55617b5b8865e67817
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:57 2010 +0000
vxge: add support for ethtool firmware flashing
Add the ability in the vxge driver to flash firmware via ethtool.
Updated to include comments from Ben Hutchings.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8424e00dfd5282026a93996a165fc4079d382169
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:56 2010 +0000
vxge: serialize access to steering control register
It is possible for multiple callers to access the firmware interface for
the same vpath simultaneously, resulting in uncertain output. Add locks
to serialize access. Also, make functions only accessed locally static,
thus requiring some movement of code blocks.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ddd62726e0bc1ffe0ab791b647f4178161ab451b
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:55 2010 +0000
vxge: cleanup debug printing and asserts
Remove all of the unnecessary debug printk indirection and temporary
variables for vxge_debug_ll and vxge_assert.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4d2a5b406c02b224bd3f50992c8b02450c65a730
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:54 2010 +0000
vxge: Wait for Rx to become idle before reseting or closing
Wait for the receive traffic to become idle before attempting to close
or reset the adapter. To enable the processing of packets while Receive
Idle, move the clearing of __VXGE_STATE_CARD_UP bit in vxge_close to
after it. Also, modify the return value of the ISR when the adapter is
down to IRQ_HANDLED. Otherwise there are unhandled interrupts for the
device.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 47f01db44b2470d9517848f6b73c75883ef5fda0
Author: Jon Mason <jon.mason@xxxxxxxx>
Date: Thu Nov 11 04:25:53 2010 +0000
vxge: enable rxhash
Enable RSS hashing and add ability to pass up the adapter calculated rx
hash up the network stack (if feature is available). Add the ability to
enable/disable feature via ethtool, which requires that the adapter is
not running at the time. Other miscellaneous cleanups and fixes
required to get RSS working.
Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
Signed-off-by: Ram Vepa <ram.vepa@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6f207e9bb4219d261d9326597ca533f954f31755
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Thu Nov 11 15:50:50 2010 +0000
x86: mrst: Set vRTC's IRQ to level trigger type
When setting up the mpc_intsrc structure for vRTC's IRQ,
we need to set its irqflag to level trigger, otherwise
it will be taken as edge triggered and the vRTC IRQ will
fire only once, as there is never a EOI issued from the
IA core for it.
The original code worked in previous kernel. This is because it
was configured to level trigger type by luck. It fell
into the default PCI trigger category which is level triggered.
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101111155019.12924.569.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 8af27e1dc4e4dd7a7b04c2cd0fc3d419d91d45b0
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Tue Nov 9 16:29:27 2010 +0100
fixdep: use hash table instead of a single array
I noticed fixdep uses ~2% of cpu time in kernel build, in function
use_config()
fixdep spends a lot of cpu cycles in linear searches in its internal
string array. With about 400 stored strings per dep file, this begins to
be noticeable.
Convert fixdep to use a hash table.
kbuild results on my x86_64 allmodconfig
Before patch :
real 10m30.414s
user 61m51.456s
sys 8m28.200s
real 10m12.334s
user 61m50.236s
sys 8m30.448s
real 10m42.947s
user 61m50.028s
sys 8m32.380s
After:
real 10m8.180s
user 61m22.506s
sys 8m32.384s
real 10m35.039s
user 61m21.654s
sys 8m32.212s
real 10m14.487s
user 61m23.498s
sys 8m32.312s
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit e86c2412c88fbe4676920c40348d3c547c9edb0d
Author: maximilian attems <max@xxxxxxx>
Date: Fri Oct 29 15:55:50 2010 +0200
kbuild, deb-pkg: Fix build with paranoid umask
umask 077
make deb-pkg
<snipp ..>
dpkg-deb: building package `linux-image-2.6.36+' in `../linux-image-2.6.36+_2.6.36+-4_amd64.deb'.
dpkg-deb: control directory has bad permissions 700 (must be >=0755 and <=0775)
make[1]: *** [deb-pkg] Error 2
Reported-by: Bastian Blank <waldi@xxxxxxxxxx>
Signed-off-by: maximilian attems <max@xxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit ad78acafeed26f62c9e644f96eecb7c19bd78bb4
Author: Alexey Charkov <alchark@xxxxxxxxx>
Date: Sun Nov 7 19:28:55 2010 +0300
usb: Add support for VIA VT8500 and compatibles in EHCI HCD
VIA and WonderMedia Systems-on-Chip feature a standard EHCI host
controller. This adds necessary glue to use the standard driver
with these systems.
Signed-off-by: Alexey Charkov <alchark@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8be8a9d3d16a25645b7869e4544a9d0ec386966a
Author: Tatyana Brokhman <tlinder@xxxxxxxxxxxxxx>
Date: Mon Nov 1 17:38:05 2010 +0200
usb: dummy_hcd code simplification
Take handling of the control requests out from dummy_timer to a different
function.
Signed-off-by: Tatyana Brokhman <tlinder@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0eadcc09203349b11ca477ec367079b23d32ab91
Author: Tatyana Brokhman <tlinder@xxxxxxxxxxxxxx>
Date: Mon Nov 1 18:18:24 2010 +0200
usb: USB3.0 ch11 definitions
Adding hub SuperSpeed usb definitions as defined by ch10 of the USB3.0
spec.
Signed-off-by: Tatyana Brokhman <tlinder@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b73af61e3283068f680e58e091ceafcb88d74b22
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Thu Oct 28 17:31:23 2010 +0200
USB: gadget: f_mass_storage: code style clean ups
This commit is purely style clean ups.
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 00cb636ed87a65b512012ea4236348af19daef1e
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Thu Oct 28 17:31:22 2010 +0200
USB: gadget: f_mass_storage: remove needless complete()
This commit removes call to the complete() function done in
fsg_unbind() which was never needed there but was a leftover
form file_storage.c.
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fe52f7922c446b2f604ef609153f1cef0ea17278
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Thu Oct 28 17:31:21 2010 +0200
USB: gadget: f_mass_storage: drop START_TRANSFER() macro
This commit drops START_TRANSFER_OR() and START_TRANSFER()
macros with a pair of nice inline functions which are actually
more readable and easier to use.
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1ccd7923fe521273d63d936129754e71a33ebe51
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Thu Oct 28 17:31:20 2010 +0200
USB: gadget: f_mass_storage: use ?: instead of a macro
This commit removes an "OR" macro defined in Mass Storage
Function in favour of a two argument version of "?:" operator
(which is a GCC extension).
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 17a936117c587c23aafafdb9cd6d433a90daa83d
Author: Rahul Ruikar <rahul.ruikar@xxxxxxxxx>
Date: Thu Oct 28 17:31:19 2010 +0200
USB: gadget: f_mass_storage: put_device() in error recovery
This commit fixes an issue with error recovery after
device_register() fails in Mass Storage Function. The device
needs to be put to avoid resource leakage.
Signed-off-by: Rahul Ruikar <rahul.ruikar@xxxxxxxxx>
[mina86@xxxxxxxxxx: updated commit message]
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d9385b6352da7fed50981f375c2ccb60354039a6
Author: Michal Nazarewicz <mina86@xxxxxxxxxx>
Date: Thu Oct 28 17:31:18 2010 +0200
USB: gadget: file_storage: put_device() in error recovery
This commit fixes some issues with File-backed Storage Gadget
error recovery when registering LUN's devices.
First of all, when device_register() fails the device still
needs to be put. However, because lun_release() decreases
fsg->ref reference counter the counter must be incremented
beforehand.
Second of all, after any of the device_create_file()s fails,
device_unregister() is called which in turn (indirectly) calls
lun_release() which decrements fsg->ref. So, again, the
reference counter must be incremented beforehand.
Lastly, if the first or the second device_create_file()
succeeds, the files are never removed. To fix it,
device_remove_file() needs to be called. This is done by
simply marking LUN as registered prior to creating files so
that fsg_unbind() can handle removing files.
Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Reported-by: Rahul Ruikar <rahul.ruikar@xxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 78bff3c65df33da47e93736bd8847b694084e5a9
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Oct 27 10:19:01 2010 +0200
USB: gadget: composite: Typo fix.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8b455561d28bcfac17d6910e64c616cf684da07f
Author: Julia Lawall <julia@xxxxxxx>
Date: Tue Oct 26 12:25:31 2010 +0200
USB: gadget: amd5536udc.c: delete double assignment
Delete successive assignments to the same location.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Acked-by: Thomas Dahlmann <dahlmann.thomas@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 06c3859fc9bd62edb7211b241eadd0cdc8ecbecd
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Mon Oct 25 16:30:12 2010 +0200
usb: gadget/imx-udc: remove usage of deprecated symbol USBD_INT0
Since v2.6.34-rc2~66^2~5^2~47 USBD_INT0 is deprecated in favour of
MX1_USBD_INT0. So use the new name.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f7043ecbb3f7b8632a6d6470f8f95160ac868d0f
Author: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
Date: Thu Oct 21 14:43:05 2010 -0400
USB: ssu100: remove max_packet_size calculation
The max_packet_size logic is taken from ftdi_sio, but it's not needed
for this device. This also makes proces_read_urb simpler.
Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Wed Nov 10 17:19:41 2010 -0800
staging: brcm80211: Remove unused module parameters.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 86071535f845fd054753122e564cee9406c84e70
Author: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Wed Nov 10 17:40:48 2010 +0000
x86: mrst: Add audio driver bindings
This patch adds the sound card bindings for Moorestown (pmic_audio) and
the Medfield platform (msic_audio) as IPC devices. This ensures they will be
created at the right time.
Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101110174044.11340.78008.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 0146f26145af75d53e12dbf23a36996aff373680
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Wed Nov 10 17:29:17 2010 +0000
rtc: Add drivers/rtc/rtc-mrst.c
Provide the standard kernel rtc driver interface on top of the vrtc layer
added in the previous patch.
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
LKML-Reference: <20101110172911.3311.20593.stgit@xxxxxxxxxxxxxxxxxxxxx>
[Fixed swapped arguments on IPC]
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
[Cleaned up and the device creation moved to arch/x86/platform]
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 7309282c90d251cde77fe3b520a8276e25315c49
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Wed Nov 10 17:29:00 2010 +0000
x86: mrst: Add vrtc driver which serves as a wall clock device
Moorestown platform doesn't have a m146818 RTC device like traditional
x86 PC, but a firmware emulated virtual RTC device(vrtc), which provides
some basic RTC functions like get/set time. vrtc serves as the only
wall clock device on Moorestown platform.
[ tglx: Changed the exports to _GPL ]
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101110172837.3311.40483.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit cfb505a7ebd4c84206b4cc7d9f966d864a2ac05a
Author: Alek Du <alek.du@xxxxxxxxx>
Date: Wed Nov 10 16:50:08 2010 +0000
x86: mrst: Add Moorestown specific reboot/shutdown support
Moorestowns needs to use a special IPC command to reboot or shutdown the
platform.
Signed-off-by: Alek Du <alek.du@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101110164928.6365.94243.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 987b21d7d91d0335e164a41a312174851c58f333
Author: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Date: Wed Nov 10 07:50:35 2010 -0600
cifs: Percolate error up to the caller during get/set acls [try #4]
Modify get/set_cifs_acl* calls to reutrn error code and percolate the
error code up to the caller.
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit a7851ce73b9fdef53f251420e6883cf4f3766534
Author: Oskar Schirmer <oskar@xxxxxxxxx>
Date: Wed Nov 10 21:06:13 2010 +0000
cifs: fix another memleak, in cifs_root_iget
cifs_root_iget allocates full_path through
cifs_build_path_to_root, but fails to kfree it upon
cifs_get_inode_info* failure.
Make all failure exit paths traverse clean up
handling at the end of the function.
Signed-off-by: Oskar Schirmer <oskar@xxxxxxxxx>
Reviewed-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 6174c3496d43b78969d4a989e1aabfbc55acbf15
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Wed Nov 10 17:08:26 2010 -0800
Revert "staging: batman-adv: Use linux/etherdevice.h address helper functions"
This reverts commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c.
Turns out the batman maintainers didn't like the implementation of it,
and the original author was going to rework it to meet their approval,
and I applied it without fully realizing all of this.
My fault.
Cc: Marek Lindner <lindner_marek@xxxxxxxx>
Cc: Simon Wunderlich <siwu@xxxxxxxxxxxxxxxxxx>
Cc: Andrew Lunn <andrew@xxxxxxx>
Cc: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 319684b1cd15f24120b9513b38a949539c0b7938
Author: Brandon Philips <brandon@xxxxxxxx>
Date: Sat Nov 6 21:19:22 2010 -0400
driver core: fix whitespace in class_attr_string
869dfc875e3 addded a long line and indented with spaces. Fix.
Signed-off-by: Brandon Philips <brandon@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610
Author: Hans J. Koch <hjk@xxxxxxxxxxxx>
Date: Sat Oct 30 00:36:47 2010 +0200
uio: Change mail address of Hans J. Koch
My old mail address doesn't exist anymore. This changes all occurrences
to my new address.
Signed-off-by: Hans J. Koch <hjk@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b17cd8d69a75f921d9d444cc3ac9b5b1d0b66ca0
Author: Brandon Philips <brandon@xxxxxxxx>
Date: Sun Nov 7 01:28:24 2010 -0500
driver core: prune docs about device_interface
drivers/base/intf.c was removed before the beginning of (git) time but
its Documentation stuck around. Remove it.
Signed-off-by: Brandon Philips <brandon@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3701befc44eb9b0e5a0e0b7169448658919b9850
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Wed Nov 10 21:31:38 2010 +0100
Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values
Here's a patch against a copy of linux-next that I just cloned.
Don't pointlessly cast pointers returned by allocation functions that
return void pointers which are implicitly converted.
For drivers/staging/bcm/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit afabbe6db368fbed0569d31d402aceb631d9f854
Author: facugaich <facugaich@xxxxxxxxx>
Date: Wed Nov 10 10:39:33 2010 -0300
Staging: solo6x10: Fix checkpatch errors and most warnings
This patch fixes all errors and most warnings reported by
checkpatch.pl for all the files in the driver.
v2: Fix a typo and update the patch against the latest HEAD
Signed-off-by: Facundo Gaich <facugaich@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 16618c20e18d60b2c8908b7758228a62a450769a
Author: Alejandro R. Sedeño <asedeno@xxxxxxx>
Date: Wed Nov 10 01:42:02 2010 -0500
Staging: beceem: Move ZTE TU25's USB id to the beceem module
Signed-off-by: Alejandro R. Sedeño <asedeno@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b706113f1475ce983faabf12120ac4e90d512d02
Author: Alejandro R. Sedeño <asedeno@xxxxxxx>
Date: Wed Nov 10 01:42:01 2010 -0500
Staging: beceem: Use 32-bit integers for hardware register values
Switching to UINT because that's what the rest of this codebase uses.
Signed-off-by: Alejandro R. Sedeño <asedeno@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 10 10:04:30 2010 +0100
staging: ft1000: Create common return point.
When reg_ft1000_netdev() fails created kthread isn't stopped.
So add return point for stopping thread.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c8b124e21dbb7f4941f292fea446ce63d92d80dd
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 10 09:29:35 2010 +0100
staging: ft1000: Check return value of kthread_run.
kthread_run could fail so we will check return value.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a10bb4fb199bd7a1dc178a6228ad749f5070e0f9
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Tue Nov 9 18:26:34 2010 -0600
staging: r8712u: Update TODO for sparse fixes
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6036f373ea03687d355634fa70fb04baa95ab75e
Author: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Date: Wed Nov 10 10:35:54 2010 -0800
x86, cpu: Only CPU features determine NX capabilities
Fix the NX feature boot warning when NX is missing to correctly
reflect that BIOSes cannot disable NX now.
Signed-off-by: Kees Cook <kees.cook@xxxxxxxxxxxxx>
LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@xxxxxxxxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit ebba638ae723d8a8fc2f7abce5ec18b688b791d7
Author: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Date: Wed Nov 10 10:35:53 2010 -0800
x86, cpu: Call verify_cpu during 32bit CPU startup
The XD_DISABLE-clearing side-effect needs to happen for both 32bit
and 64bit, but the 32bit init routines were not calling verify_cpu()
yet. This adds that call to gain the side-effect.
The longmode/SSE tests being performed in verify_cpu() need to happen very
early for 64bit but not for 32bit. Instead of including it in two places
for 32bit, we can just include it once in arch/x86/kernel/head_32.S.
Signed-off-by: Kees Cook <kees.cook@xxxxxxxxxxxxx>
LKML-Reference: <1289414154-7829-4-git-send-email-kees.cook@xxxxxxxxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit ae84739c27b6b3725993202fe02ff35ab86468e1
Author: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Date: Wed Nov 10 10:35:52 2010 -0800
x86, cpu: Clear XD_DISABLED flag on Intel to regain NX
Intel CPUs have an additional MSR bit to indicate if the BIOS was
configured to disable the NX cpu feature. This bit was traditionally
used for operating systems that did not understand how to handle the
NX bit. Since Linux understands this, this BIOS flag should be ignored
by default.
In a review[1] of reported hardware being used by Ubuntu bug reporters,
almost 10% of systems had an incorrectly configured BIOS, leaving their
systems unable to use the NX features of their CPU.
This change will clear the MSR_IA32_MISC_ENABLE_XD_DISABLE bit so that NX
cannot be inappropriately controlled by the BIOS on Intel CPUs. If, under
very strange hardware configurations, NX actually needs to be disabled,
"noexec=off" can be used to restore the prior behavior.
[1] http://www.outflux.net/blog/archives/2010/02/18/data-mining-for-nx-bit/
Signed-off-by: Kees Cook <kees.cook@xxxxxxxxxxxxx>
LKML-Reference: <1289414154-7829-3-git-send-email-kees.cook@xxxxxxxxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit c5cbac69422a9bffe7c7fd9a115130e272b547f5
Author: Kees Cook <kees.cook@xxxxxxxxxxxxx>
Date: Wed Nov 10 10:35:51 2010 -0800
x86, cpu: Rename verify_cpu_64.S to verify_cpu.S
The code is 32bit already, and can be used in 32bit routines.
Signed-off-by: Kees Cook <kees.cook@xxxxxxxxxxxxx>
LKML-Reference: <1289414154-7829-2-git-send-email-kees.cook@xxxxxxxxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
commit b3d14bff12a38ad13a174eb0cc83d2ac7169eee4
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Wed Nov 10 21:21:35 2010 +0100
dccp ccid-2: Implementation of circular Ack Vector buffer with overflow handling
This completes the implementation of a circular buffer for Ack Vectors, by
extending the current (linear array-based) implementation. The changes are:
(a) An `overflow' flag to deal with the case of overflow. As before, dynamic
growth of the buffer will not be supported; but code will be added to deal
robustly with overflowing Ack Vector buffers.
(b) A `tail_seqno' field. When naively implementing the algorithm of Appendix A
in RFC 4340, problems arise whenever subsequent Ack Vector records overlap,
which can bring the entire run length calculation completely out of synch.
(This is documented on http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/\
ack_vectors/tracking_tail_ackno/ .)
(c) The buffer length is now computed dynamically (i.e. current fill level),
as the span between head to tail.
As a result, dccp_ackvec_pending() is now simpler - the #ifdef is no longer
necessary since buf_empty is always true when IP_DCCP_ACKVEC is not configured.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 7d870936602533836bba821bd5c679c62c52a95f
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Wed Nov 10 21:21:02 2010 +0100
dccp ccid-2: Separate internals of Ack Vectors from option-parsing code
This patch
* separates Ack Vector housekeeping code from option-insertion code;
* shifts option-specific code from ackvec.c into options.c;
* introduces a dedicated routine to take care of the Ack Vector records;
* simplifies the dccp_ackvec_insert_avr() routine: the BUG_ON was redundant,
since the list is automatically arranged in descending order of ack_seqno.
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit f17a37c9b8c4b32c01e501a84fa6f30e344c6110
Author: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Wed Nov 10 21:20:07 2010 +0100
dccp ccid-2: Ack Vector interface clean-up
This patch brings the Ack Vector interface up to date. Its main purpose is
to lay the basis for the subsequent patches of this set, which will use the
new data structure fields and routines.
There are no real algorithmic changes, rather an adaptation:
(1) Replaced the static Ack Vector size (2) with a #define so that it can
be adapted (with low loss / Ack Ratio, a value of 1 works, so 2 seems
to be sufficient for the moment) and added a solution so that computing
the ECN nonce will continue to work - even with larger Ack Vectors.
(2) Replaced the #defines for Ack Vector states with a complete enum.
(3) Replaced #defines to compute Ack Vector length and state with general
purpose routines (inlines), and updated code to use these.
(4) Added a `tail' field (conversion to circular buffer in subsequent patch).
(5) Updated the (outdated) documentation for Ack Vector struct.
(6) All sequence number containers now trimmed to 48 bits.
(7) Removal of unused bits:
* removed dccpav_ack_nonce from struct dccp_ackvec, since this is already
redundantly stored in the `dccpavr_ack_nonce' (of Ack Vector record);
* removed Elapsed Time for Ack Vectors (it was nowhere used);
* replaced semantics of dccpavr_sent_len with dccpavr_ack_runlen, since
the code needs to be able to remember the old run length;
* reduced the de-/allocation routines (redundant / duplicate tests).
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
commit 0c6202b3278b417444a59cecc59e6e5af04db7fd
Author: Ron Mercer <ron.mercer@xxxxxxxxxx>
Date: Wed Nov 10 09:29:46 2010 +0000
qlge: Version change to v1.00.00.27
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@xxxxxxxxxx>
Signed-off-by: Ron Mercer <ron.mercer@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 673483c7d3a25c43d1208bb07e3888bc5136e8cf
Author: Ron Mercer <ron.mercer@xxxxxxxxxx>
Date: Wed Nov 10 09:29:45 2010 +0000
qlge: Add firmware info to ethtool get regs.
By default we add firmware information to ethtool get regs.
Optionally firmware info can instead be sent to log.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@xxxxxxxxxx>
Signed-off-by: Ron Mercer <ron.mercer@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ebe2e91e000c59aed0300d81815f451c85e0bda6
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Wed Nov 10 10:19:10 2010 -0500
cifs: fix potential use-after-free in cifs_oplock_break_put
cfile may very well be freed after the cifsFileInfo_put. Make sure we
have a valid pointer to the superblock for cifs_sb_deactive.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 5bdb05f91b27b9361c4f348a4e05999f597df72e
Author: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Date: Mon Nov 8 13:40:28 2010 -0800
futex: Add futex_q static initializer
The futex_q struct has grown considerably over the last couple years. I
believe it now merits a static initializer to avoid uninitialized data
errors (having spent more time than I care to admit debugging an uninitialized
q.bitset in an experimental new op code).
With the key initializer built in, several of the FUTEX_KEY_INIT calls can
be removed.
V2: use a static variable instead of an init macro.
use a C99 initializer and don't rely on variable ordering in the struct.
V3: make futex_q_init const
Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: John Kacur <jkacur@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1289252428-18383-1-git-send-email-dvhart@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit b41277dc7a18ee332d9e8078e978bacdf6e76157
Author: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Date: Mon Nov 8 13:10:09 2010 -0800
futex: Replace fshared and clockrt with combined flags
In the early days we passed the mmap sem around. That became the
"int fshared" with the fast gup improvements. Then we added
"int clockrt" in places. This patch unifies these options as "flags".
[ tglx: Split out the stale fshared cleanup ]
Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: John Kacur <jkacur@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit ae791a2d2e382adc69990a144a7f1a6c4bc24f1e
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Wed Nov 10 13:30:36 2010 +0100
futex: Cleanup stale fshared flag interfaces
The fast GUP changes stopped using the fshared flag in
put_futex_keys(), but we kept the interface the same.
Cleanup all stale users.
This patch is split out from Darren Harts combo patch which also
combines various flags. This way the changes are clearly separated.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@xxxxxxxxxxxxxxx>
commit c7657ac0c3e4d4ab569296911164b7a2b0ff871a
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date: Mon Nov 1 23:36:53 2010 +0100
x86, microcode, AMD: Cleanup code a bit
get_ucode_data is a memcpy() wrapper which always returns 0. Move it
into the header and make it an inline. Remove all code checking its
return value and turn it into a void.
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 1ea6be212eea5ce1e8fabadacb0c639ad87b2f00
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Mon Nov 1 22:44:34 2010 +0100
x86, microcode, AMD: Replace vmalloc+memset with vzalloc
We don't have to do memset() ourselves after vmalloc() when we have
vzalloc(), so change that in
arch/x86/kernel/microcode_amd.c::get_next_ucode().
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
commit 7decaa557a20f48aabef35f817ec16ef563567b0
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:35:54 2010 +0100
ARM: 6454/1: sa1100: Fix for a nasty initialization bug in the RTSR.
This patch fixes a nasty initialization condition on the RTSR register.
Sometimes, bit 1 will wake up set, sometimes not. This can be seen
by checking the value of the RTSR by typing '$ cat /proc/driver/rtc',
which has been provided by the previous patch.
If this bit is set, the command '$ cat /dev/rtc0' will lock the system
in an endless interrupt routine calling loop.
This patch fixes the issue both at sa1100_rtc_probe(), where it avoids
a spurious interrupt from happening, and at sa1100_rtc_interrupt(),
which is the robust solution, though it does not avoid the first
spurious interrupt.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit fd3ee6d3421bc05ce42ee7f48071aee72051af28
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:34:47 2010 +0100
ARM: 6453/1: sa1100: Print the value of RTSR on /proc/drivers/rtc.
This patch adds a line to the output of /proc/drivers/rtc to show
the value of the RTSR register. It will be used to demonstrate
a nasty initialization bug that will be fixed in the sequence.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit a404ad1ff593589bdd34c48ebecddada9edbfaf3
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:33:53 2010 +0100
ARM: 6452/1: Fix checkpatch.pl issues in drivers/rtc/rtc-sa1100.c.
This patch fixes checkpatch.pl issues in drivers/rtc/rtc-sa1100.c,
which I will later modify.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit d03f322c41890a86bf64d00314f0ec72738a7f21
Author: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon Oct 18 22:31:26 2010 +0100
ARM: 6450/1: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c.
This patch fixes checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c.
Signed-off-by: Marcelo Roberto Jimenez <mroberto@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 34177802001894e064c857cac2759f68119550cd
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Tue Oct 19 12:43:58 2010 +0100
ARM: 6438/2: mmci: add SDIO support for ST Variants
This adds some minor variant data and trickery to enable SDIO
on the ST Micro variants of MMCI/PL180.
Signed-off-by: Marcin Mielczarczyk <marcin.mielczarczyk@xxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit f20f8f21e0402c785c342547f7e49eafc42cfb52
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Tue Oct 19 13:41:24 2010 +0100
ARM: 6399/3: mmci: handle broken MCI_DATABLOCKEND hardware
On the U300 the MCI_DATAEND and MCI_DATABLOCKEND IRQs can arrive
out-of-order. Replace an ugly #ifdef hack with a proper runtime
solution which models what is really happening.
In the U300 DMA mode and on all Ux500 models, the MCI_DATABLOCKEND
flag isn't properly cleared in hardware following and ACK leading
to all kind of weird behaviour when the flag is still up in
subsequent interrupts, so we add two flags indicating the
error and handle this runtime.
Cc: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 2686b4b408c25349aee7b35558722d5730d67224
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date: Tue Oct 19 12:39:48 2010 +0100
ARM: 6311/2: mmci: work with only one irq
The DBx500 variants have only one IRQ line hooked up. Allow these (and
any other implementations which choose to use only one irq) to work by
directing the PIO interrupts also to the first IRQ line.
Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5e4f083f78d03e9f8d2e327daccde16976f9bb00
Author: Yong Zhang <yong.zhang@xxxxxxxxxxxxx>
Date: Sun Oct 24 11:50:53 2010 +0800
hrtimer: Remove stale comment on curr_timer
curr_timer doesn't resident in struct hrtimer_cpu_base anymore.
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
LKML-Reference: <1287892253-2587-1-git-send-email-yong.zhang0@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 12ddf37444eaaf67b147561141150e10a56d7742
Merge: dc7c0b6a6d28b0de231728de963ed53a9cee85cf c724d07a56e60e91b0aa75193f86fb000545ffe4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 10 18:34:49 2010 +0900
Merge branch 'common/fbdev' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
commit da1d39e3903bc35be2b5e8d2116fdd5d337244d4
Author: Simon Horman <horms@xxxxxxxxxxxx>
Date: Tue Nov 9 17:47:02 2010 +0900
mmc, sh: Move constants to sh_mmcif.h
This moves some constants from sh_mmcif.c to sh_mmcif.h
so that they can be used in sh_mmcif_boot_init().
It also alters the definition of SOFT_RST_OFF from (0 << 31) to
~SOFT_RST_ON (= ~(1 << 31)). The former seems bogus. The latter is
consistent with the code in sh_mmcif_boot_init().
Cc: Yusuke Goda <yusuke.goda.sx@xxxxxxxxxxx>
Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3cf9b85b474e656a0856b88290c7a289ac5ea247
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Fri Nov 5 16:12:38 2010 -0700
locking, lockdep: Convert sprintf_symbol to %pS
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Jiri Kosina <trivial@xxxxxxxxxx>
LKML-Reference: <1288998760-11775-6-git-send-email-joe@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit f6cd24777513fcc673d432cc29ef59881d3e4df1
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Thu Nov 4 11:13:48 2010 +0100
irq: Better struct irqaction layout
We currently use kmalloc-96 slab for struct irqaction allocations on
64bit arches.
This is unfortunate because of possible false sharing and two cache
lines accesses.
Move 'name' and 'dir' fields at the end of the structure, and force a
suitable alignement.
Hot path fields now use one cache line on x86_64.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Reviewed-by: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <1288865628.2659.69.camel@edumazet-laptop>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 640dcfa0ff49ea1fcddad39e7c468683d9f00342
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Tue Nov 2 11:27:34 2010 +0000
ARM: mach-shmobile: optimize PLLC2 frequency for HDMI
On ap4evb PLLC2 is only used as a parent of the HDMI clock, therefore it can
be reconfigured freely to improve HDMI clock precision.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c724d07a56e60e91b0aa75193f86fb000545ffe4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 10 17:54:20 2010 +0900
fbdev: sh_mobile_hdmi: fix up compiler warnings.
CC drivers/video/sh_mobile_hdmi.o
drivers/video/sh_mobile_hdmi.c: In function 'sh_hdmi_avi_infoframe_setup':
drivers/video/sh_mobile_hdmi.c:539: warning: unused variable 'var'
drivers/video/sh_mobile_hdmi.c: In function 'sh_hdmi_clk_configure':
drivers/video/sh_mobile_hdmi.c:1021: warning: unused variable 'pdata'
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 830539d14379d0f5cb07832a3e4466418011f843
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 10 17:51:44 2010 +0900
fbdev: sh_mobile_lcdcfb: fix up compiler warnings.
CC drivers/video/sh_mobile_lcdcfb.o
drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_check_var':
drivers/video/sh_mobile_lcdcfb.c:922: warning: format '%u' expects type 'unsigned int', but argument 11 has type 'long unsigned int'
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0ea2af1c15b730dba9ce741420352d298bcd7862
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Nov 4 11:06:17 2010 +0000
fbdev: sh_mobile_hdmi: add support for 1080p modes
Add support for 3 more preprogrammed video modes: 1080p at 24, 50, and 60Hz.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d2ecbab5960d9814a269d36723647d6ef391ba8f
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Thu Nov 4 11:06:06 2010 +0000
fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
LCDC hardware can support 1920x1080 formats, adjust the driver to cover them.
Besides, instead of guessing some "reasonable" validity checks, only verify
values in .fb_check_var(), that we are sure, we cannot support.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8c183ecee23991dd6c0476a537c6bae8afd2567e
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Tue Nov 2 11:27:20 2010 +0000
fbdev: sh_mobile_hdmi: improve support for more video modes
Configure pre-programmed VIC modes for VGA (640x480@60) and 720x576@50
modes, change PHY mode selection to be based on pixel clock frequency.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c36940e678fc30779c99246c034deca1fed61ae4
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date: Tue Nov 2 11:27:16 2010 +0000
fbdev: sh_mobile_hdmi: add support for more precise HDMI clock configuration
The HDMI clock has to be reconfigured for different video modes. However, the
precision of the supplying SoC clock on SH-Mobile systems is often
insufficient. This patch allows to additionally reconfigure the parent clock
to achieve the optimal HDMI clock frequency, in case this is supported by the
platform.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit eae6cb31d890e2860f9ce1b8ba73c27b6005af68
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Thu Oct 14 09:32:53 2010 -0600
spi/xilinx: merge OF support code into main driver
Now that the of_platform_bus_type has been merged with the platform
bus type, a single platform driver can handle both OF and non-OF use
cases. This patch merges the OF support into the platform driver.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Tested-by: Michal Simek <monstr@xxxxxxxxx>
commit 8fd8821b62397f8ddb7bfb23c3246a22770ab2ee
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Thu Oct 14 09:04:29 2010 -0600
spi/xilinx: fold platform_driver support into main body
This patch merges the platform driver support into the main body of
xilinx_spi.c in preparation for merging the OF and non-OF support
code.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Tested-by: Michal Simek <monstr@xxxxxxxxx>
commit 91565c4068042b3d8e37e64e393ca105476419bd
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Thu Oct 14 08:54:55 2010 -0600
spi/xilinx: Eliminate pdata references from common code.
The current code has the OF binding modifying the platform_data
pointer which it must not do, and the common code doesn't really need
to use a pdata pointer. This patch eliminates the platform_data
references from the common part of the driver in preparation for
merging the OF and non-OF versions.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
Tested-by: Michal Simek <monstr@xxxxxxxxx>
commit dc7c0b6a6d28b0de231728de963ed53a9cee85cf
Merge: d6ff7d0fe22cdf3ea41c48b50da9a9181500d1bf b884a94ed16d1a633e76f80fb1bd75d0e7373ce3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 10 12:04:41 2010 +0900
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
commit 0a1c62dedc6e28a1117b00c4ccb4427bc91b9f29
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:10:35 2010 +0100
staging, spectra: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/spectra/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5ef3df5b9fed56e64e8544e36a175354d38d0206
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:10:44 2010 +0100
staging, wlags49_h2: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/wlags49_h2/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3c4e9c84970e555a80a4c92a5a3d3125c63f0e12
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:09:38 2010 +0100
staging, ath6kl: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/ath6kl/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 131a14b3f0330a844f79c6b87c0fe57ec86faf62
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:10:25 2010 +0100
staging, rt2860: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/rt2860/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 60a1d01bcd348ae1c791260d2df564d9ffc1ac97
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:10:15 2010 +0100
staging, keucr: Remove unnecessary casts of void ptr returning alloc function return values
Hi,
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/keucr/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6ccb5d7c62845788be9aafef26132333a07708bb
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
Date: Mon Nov 8 13:41:46 2010 -0800
staging: Fix typos in rt2860
Here is a patch that fixes some typos, and comments in drivers/staging/rt2860
Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1ac586445db8e46f0007855c5c7161ff55484836
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:47 2010 -0800
staging: hv: Convert camel cased functions in ring_buffer.c to lower cases
staging: hv: Convert camel cased functions in ring_buffer.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fc8c72ebfa7547c044bab48fb8bba6906123f8c7
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:46 2010 -0800
staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases
staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 82f8bd40a017716bfadcf074b4c6110ebe4c7ba6
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:45 2010 -0800
staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases
staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 203df82d81a331e16caee4c2346cd382fcd820d6
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:44 2010 -0800
staging: hv: Convert camel cased functions in osd.c to lower cases
staging: hv: Convert camel cased functions in osd.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d39f12866d90829e1ae0440c0203dd5a162c8cd8
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:43 2010 -0800
staging: hv: Convert camel cased local variables in osd.c to lower cases
staging: hv: Convert camel cased local variables in osd.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d44890c8d2a83116463c230b59b9b9d356aafe85
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:42 2010 -0800
staging: hv: Convert camel cased functions in hv.c to lower cases
staging: hv: Convert camel cased functions in hv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b8dfb264f4f9e55f9cf8384cb782dfe5159c413c
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:41 2010 -0800
staging: hv: Convert camel cased local variables in hv.c to lower cases
staging: hv: Convert camel cased local variables in hv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6a0aaa185057801343e000183ef0695c2a2b75a9
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:40 2010 -0800
staging: hv: Convert camel cased struct fields in hv.h to lower cases
staging: hv: Convert camel cased struct fields in hv.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f6feebe073db4c97dc10f6fab54f9d4b5816886b
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:39 2010 -0800
staging: hv: Convert camel cased struct fields in hv_api.h to lower cases
staging: hv: Convert camel cased struct fields in hv_api.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c50f7fb28400bc4829c26bb4a2d6c06a45e90b1a
Author: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Date: Mon Nov 8 14:04:38 2010 -0800
staging: hv: Convert camel cased struct fields in channel_mgmt.h to lower cases
staging: hv: Convert camel cased struct fields in channel_mgmt.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a32d4acab4a862c5cd297b73d625d813af8d4e0b
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Sat Nov 6 14:48:48 2010 -0400
Staging: speakup: spk_types: trival coding style issue
Checkpatch.pl gives WARNING: missing space after struct definition.
This patch fixes that warning that was on line 55.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3c9d46526db88218a311a72971efae1b4366d4c6
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sun Nov 7 07:37:03 2010 +0100
Staging: Cypress WestBridge OMAP3430 Kernel Hal: Remove unneeded local variables from alloc functions
In
drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
the local variables 'ret_p' are not needed and should just go away.
I have no way to test this code, but I believe the change is obviously
correct. Please consider it.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: David Cross <david.cross@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6f710907ff452ab67bd1161bc3f7a95f9a7e809d
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 18:21:59 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211netdev.c
This is a patch to the p80211netdev.c file that fixes warnings that were
found by the checkpatch.pl tool
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 869c4b4a715af94a14ec074c0a5528a562e3322b
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 15:59:50 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211conv.h
This is a patch to the p80211conv.h file that fixes two 80 character
line limit styling issues
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9f027eb6871335f6e16633df796263f983f08844
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 18:24:46 2010 +0200
Staging: asus_oled: fix coding style issue in asus_oled.c
This is a patch to the asus_oled.c file that fixes up brace and enum
warning found by the checkpatch.pl tool
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f83dfd065817ea3c7387b23afb2fd4d23fb470ff
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 18:23:44 2010 +0200
Staging: wlan-ng: fix coding style issues in prism2mgmt.c
This is a patch to prism2mgmt.c that fixes coding style issues found by
checkpatch.pl. Three instances of the 80 char line limit being exceeded
have been kept as is so that string literals are not split up.
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c5de2157b801b9f38c7852b4d30fea8aff0c1bbd
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 18:23:09 2010 +0200
Staging: wlan-ng: fix coding style issues in p80211types.h
This is a patch that fixes various coding style issues in p80211types.h.
The typedef declarations have been kept as they seem necessary.
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4314e5a68ab014092a55d5b2b26964952a97bc85
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 18:22:42 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211netdev.h
This is a patch to the p80211netdev.h file that fixes up warnings found
by the checkpatch.pl tool. The typedefs have been left in place as they
seem necessary.
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5b84cc781058bb452f869d84bb24442ec51948c4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Thu Nov 4 20:07:59 2010 -0700
staging: Use vzalloc
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4eb28f7197a2cbaf7a9be778d429a5fb9bb6172e
Author: Johan Meiring <johanmeiring@xxxxxxxxx>
Date: Sat Nov 6 15:46:54 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211conv.c
This is a patch to the p80211conv.c file that fixes a couple of coding
style issues found by the checkpatch.pl tool.
Signed-off-by: Johan Meiring <johanmeiring@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4c510e95aef6138242ed4bc7fe29ee184bea413f
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Sun Nov 7 12:22:18 2010 -0600
staging: r8712u: Remove extraneous variables from osdep_service.h
Jesper Juhl submitted a patch to remove one extraneous variable in
this file; however, there are several others.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Reviewed-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a2ac9d69d69d8df88d4096903f5f76fe2de2345b
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Sun Nov 7 12:22:18 2010 -0600
staging: r8712u: Remove unneeded local variable in _malloc in osdep_service.h header
The variable 'pbuf' is not needed.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 268dfede46e24eef55a2ef7a10a462617936771e
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:11:36 2010 +0000
staging/easycap: Improve interface to the videodev module
The changes here represent an intermediate step towards bringing the
driver within the V4L2 framework.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ae59dad4fef271222d65ac6afe2889eb12ea6ca9
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:09:19 2010 +0000
staging/easycap: Eliminate BKL
No locking is required for normal operation of the driver, but locking
is needed to prevent an Oops during some hot-unplugging scenarios. The
BKL is replaced here by mutex locks together with traps to detect null
pointers following asynchronous device disconnection.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2a87a0b9220f8e0e6f204b0f61dc6e15ad64ccd4
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:07:12 2010 +0000
staging/easycap: Avoid compiler warning about frame size ... larger than ...
Replacing some of the large automatic variables by dynamically allocated
variables in the IOCTL routines gets rid of the compiler warning.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 94155cf4195bb3be0068481dc21e8688eda2e051
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:05:51 2010 +0000
staging/easycap: Add option to set the hardware audio gain
A new module parameter adjusts the gain of the AC'97 audio chip, if
one is present. Attenuation as well as amplification should be possible
according to the datasheet, but attenuation seems not to work yet.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 849322a0f114e52d05e16fe8349843c980cff2c6
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:03:50 2010 +0000
staging/easycap: Add option to show conspicuous indication of signal loss
A new module parameter turns on the option of displaying a testcard when
the analogue input signal is lost (more precisely: when the hardware
detects no field/frame synchronization). This feature has been requested
in the context of security cameras used at night.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 40b8d50ac98f8c8779aea7459f805e5a69fdb726
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:02:15 2010 +0000
staging/easycap: Implement interlaced modes and reduced framerates
Interlaced modes are requested by tvtime. Reduced framerates are
preferred by some userspace programs, e.g. astronomy applications.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f36bc37a48148f31f936557b811431b98dbfe347
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 20:00:35 2010 +0000
staging/easycap: Improve hardware initialization
Sometimes at startup the video urbs consistently and persistently deliver
bad data, each video frame (not isoc frame) containing an excess of
precisely two bytes. A brute-force cure implemented here is to
repeatedly reinitialize the registers of the SAA7113H chip and the
STK1160 USB bridge until good behaviour is obtained.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e68703cfe8dd2f5605c53b46fae6c9c027e7ef50
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 19:58:55 2010 +0000
staging/easycap: Make code re-entrant
In order to allow multiple EasyCAP dongles to operate simultaneously
without mutual interference all static variables have been eliminated
except for a persistent inventory of plugged-in dongles at module level.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ce36cedab3f865969653bf4360f7e364ab0937e4
Author: Mike Thomas <rmthomas@xxxxxxxxxxx>
Date: Sun Nov 7 19:56:40 2010 +0000
staging/easycap: Remove obsolete routines
The so-called bridger routine has proved unnecessary following general
improvements elsewhere. The explain_() functions were a convenience
during early development, but are unnecessary and inappropriate now.
Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 050afc92ee394ccdd953f91dcbbf9af863af8efc
Merge: 391a169e99c789d59ef2a6b0cb80d1c6f63238dd 5bf68592e72eb0ded154efaaf43b39aab6964fc3
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 9 16:12:37 2010 -0800
Staging: Merge Ben Collins solo6x10 tree with upstream
There were some duplicate changes that needed to be hand-merged due to
fixes needed to keep .37 building and working properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 391a169e99c789d59ef2a6b0cb80d1c6f63238dd
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Thu Nov 4 22:27:42 2010 +0100
pohmelfs: remove unneeded conditionals before calls to crypto_destroy_tfm wrappers.
Hi,
crypto_free_hash() and crypto_free_ablkcipher() are just wrappers around
crypto_free_tfm() which is itself just a wrapper around
crypto_destroy_tfm().
Passing crypto_destroy_tfm() a NULL pointer is valid, so there's no reason
to check for NULL first.
Removing the unneeded conditionals (which is what the patch does) brings
us the benefit of having to execute a few fewer test/branch instructions
and also reduces object code size slightly:
before:
text data bss dec hex filename
8630 112 3312 12054 2f16 drivers/staging/pohmelfs/crypto.o
0000000000000cbe <pohmelfs_crypto_engine_exit>:
cbe: 55 push %rbp
cbf: 48 89 e5 mov %rsp,%rbp
cc2: 53 push %rbx
cc3: 48 83 ec 08 sub $0x8,%rsp
cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe>
ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15>
cd3: 48 89 fb mov %rdi,%rbx
cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi
cda: 48 85 ff test %rdi,%rdi
cdd: 74 0c je ceb <pohmelfs_crypto_engine_exit+0x2d>
cdf: 48 ff 05 00 00 00 00 incq 0x0(%rip) # ce6 <pohmelfs_crypto_engine_exit+0x28>
ce6: e8 58 fa ff ff callq 743 <crypto_free_hash>
ceb: 48 8b 7b 28 mov 0x28(%rbx),%rdi
cef: 48 85 ff test %rdi,%rdi
cf2: 75 09 jne cfd <pohmelfs_crypto_engine_exit+0x3f>
cf4: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfb <pohmelfs_crypto_engine_exit+0x3d>
cfb: eb 16 jmp d13 <pohmelfs_crypto_engine_exit+0x55>
cfd: 48 89 fe mov %rdi,%rsi
d00: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d07 <pohmelfs_crypto_engine_exit+0x49>
d07: e8 00 00 00 00 callq d0c <pohmelfs_crypto_engine_exit+0x4e>
d0c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d13 <pohmelfs_crypto_engine_exit+0x55>
d13: 48 8b 7b 18 mov 0x18(%rbx),%rdi
d17: e8 00 00 00 00 callq d1c <pohmelfs_crypto_engine_exit+0x5e>
d1c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d23 <pohmelfs_crypto_engine_exit+0x65>
d23: 5e pop %rsi
d24: 5b pop %rbx
d25: c9 leaveq
d26: c3 retq
after:
text data bss dec hex filename
8604 112 3296 12012 2eec drivers/staging/pohmelfs/crypto.o
0000000000000cbe <pohmelfs_crypto_engine_exit>:
cbe: 55 push %rbp
cbf: 48 89 e5 mov %rsp,%rbp
cc2: 53 push %rbx
cc3: 48 83 ec 08 sub $0x8,%rsp
cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe>
ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15>
cd3: 48 89 fb mov %rdi,%rbx
cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi
cda: e8 64 fa ff ff callq 743 <crypto_free_hash>
cdf: 48 8b 7b 28 mov 0x28(%rbx),%rdi
ce3: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cea <pohmelfs_crypto_engine_exit+0x2c>
cea: 48 89 fe mov %rdi,%rsi
ced: e8 00 00 00 00 callq cf2 <pohmelfs_crypto_engine_exit+0x34>
cf2: 48 8b 7b 18 mov 0x18(%rbx),%rdi
cf6: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfd <pohmelfs_crypto_engine_exit+0x3f>
cfd: e8 00 00 00 00 callq d02 <pohmelfs_crypto_engine_exit+0x44>
d02: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d09 <pohmelfs_crypto_engine_exit+0x4b>
d09: 5e pop %rsi
d0a: 5b pop %rbx
d0b: c9 leaveq
d0c: c3 retq
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Acked-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c
Author: Tobias Klauser <tklauser@xxxxxxxxxx>
Date: Wed Nov 3 10:59:02 2010 +0100
staging: batman-adv: Use linux/etherdevice.h address helper functions
Replace custom ethernet address check functions by calls to the helpers
in linux/etherdevice.h
In one case where the address was tested for broadcast and multicast
address, the broadcast address check can be omitted as broadcast is also
a multicast address.
The patch is only compile-tested.
Cc: Marek Lindner <lindner_marek@xxxxxxxx>
Cc: Simon Wunderlich <siwu@xxxxxxxxxxxxxxxxxx>
Cc: Andrew Lunn <andrew@xxxxxxx>
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e09f138e06d4f1ea63079e25bb55ee1dacff7933
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:55 2010 +0100
staging: ft1000: Get rid of UINT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c613f6f50f9d98015b8640f9aeff3b0c8e07548e
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:54 2010 +0100
staging: ft1000: Get rid of PCHAR typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 81584137d8c97ab6bd87c2b4091f6105f600e66e
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Thu Nov 4 07:37:13 2010 +0100
staging: ft1000: Get rid of BOOLEAN typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 84b7801d135ca90903df3a9170b9db5978fe8fce
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:52 2010 +0100
staging: ft1000: Get rid of ULONG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d44d76f93dafdbaeac0f1d541f3867777de65c8a
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:51 2010 +0100
staging: ft1000: Get rid of PULONG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fc549a05e74edf9535862a4e517e63ade3908f75
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:50 2010 +0100
staging: ft1000: Get rid of USHORT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d1674983e0fdf3a18dbc4ac7f1f0912f7b1c246e
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:49 2010 +0100
staging: ft1000: GEt rid of PUSHORT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c8f775c88b1b84909d5d73b171a48302bf46b2f8
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:48 2010 +0100
staging: ft1000: Get rid of UCHAR typedef.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e2cb7da1671eb659c8edc81be9838afdd0b6b2cc
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Wed Nov 3 11:19:47 2010 +0100
staging: ft1000: Get rid of PUCHAR typedef.
PUCHAR typedef was replaces by u8 *.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 95112cb448b5962daeee68db8ee523b71266e28b
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 14:51:47 2010 +0100
staging: ft1000: Check return value.
Function ft1000_submit_rx_urb() could fail so add checking
for return value.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d7780865164f2efe3ea2fa6f1ebdf61ecc1f2a4d
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 14:51:46 2010 +0100
staging: ft1000: Correct return error values.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3b3291e868695194096591c4a5e3e302939e4c2b
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 14:51:45 2010 +0100
staging: ft1000: Use common return point.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 35e9403b052ff6cad71bc5d9a075385e0c62ab96
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 14:51:44 2010 +0100
staging: ft1000: Use specific error codes instead self defined.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d2b07455b85d20c72e4182fe7d53d8c70838f984
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 13:44:10 2010 +0100
staging: ft1000: Pseudo header handlig improved.
Handling for pseudo header was done by directly copying
data to tx buffer. This hide a functionality and make
code unreadable.
Use approach where fill pseudo_hdr structure first with data and then copy
to beginning of buffer.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 019bd3f825a7fc438b1e9ce7d145b03f13102aee
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 13:44:09 2010 +0100
staging: ft1000: Remove dead code.
Remove functions which was used nowhere. Also remove dead
variables used by this functions.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit eb21c1587ac3272d58592e775dc55af6266f7403
Author: Marek Belisko <marek.belisko@xxxxxxxxx>
Date: Tue Nov 2 13:44:08 2010 +0100
staging: ft1000: Use memset instead looping with for.
Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4d26d7e6ba3fffd224560acd586526bf2f2f4f73
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Mon Nov 1 22:29:31 2010 +0200
Staging: w35und: Kill struct hwdata ->SurpriseRemoveCount
This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not
used at all so it's safe to remove it.
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 87cb9a6310bc5183de196b25ef6adfda3080a744
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Mon Nov 1 22:29:30 2010 +0200
Staging: w35und: Kill struct hwdata ->HwStop
This patch kills the ->HwStop member of struct hwdata. It's a read-only
variable that's always zero so it's safe to remove it.
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4d0d302257d3d0eccf371aab49c74b41797bebc3
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Mon Nov 1 22:29:29 2010 +0200
Staging: w35und: Kill struct hwdata ->NullPacketCount
This patch kills the NullPacketCount member of struct hwdata. It's not used for
anything so it's safe to remove it.
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6112063d804aa0afc8d4462b22e36fc259393b64
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Mon Nov 1 22:29:28 2010 +0200
Staging: w35und: Kill empty Mds_Destroy function
The Mds_Destroy() function doesn't do anything so kill it.
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9dd5f271441bbe85578c2b7841820d8bca26096c
Author: Mauro Schilman <maurito.s@xxxxxxxxx>
Date: Mon Nov 1 14:12:05 2010 -0300
Staging: frontier: fix space and * coding style issues in alphatrack.c
This is a patch to the alphatrack.c file that fixes up a space warning
and a space after '*' warning found by the checkpatch.pl tool
Signed-off-by: Mauro Schilman <maurito.s@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b5ef076141acc223e55aa298abd2d2f5fb844874
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Mon Nov 1 21:50:06 2010 +0200
Staging: w35und: Rename wbhal_s.h to wbhal.h
This patch renames the wbhal_s.h header file to wbhal.h now that it contains
both structure and function definitions.
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 72ca8819f7f4ac4ddf82ab72ee614075821a3d00
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Mon Nov 1 21:50:05 2010 +0200
Staging: w35und: Merge wbhal_f.h to wbhal_s.h
This patch merges HAL struct and function definitions into one header file.
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ba5c2b3ddcb7a6a0e942c7c2434f048d152f08c5
Author: Felipe Andres Besoain Pino <guest02@tux.(none)>
Date: Fri Oct 29 19:15:58 2010 -0300
staging: vt6656: resolved checkpatch finding
removed spaces at the start of a lines.
Signed-off-by: Felipe Andres Besoain Pino <fbesoain@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 99b7bbb9b57da48f602732aaa107d7add49c842d
Author: Ariel Savini <arielsavini@xxxxxxxxx>
Date: Fri Oct 29 19:19:20 2010 -0300
staging: vt6656 resolved parenthesis not spaces
removes before parenthesis
Signed-off-by: Ariel Savini <arielsavini@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4a499de2d13786de626c3f689022d7ec25230911
Author: Mariano Reingart <reingart@xxxxxxxxx>
Date: Fri Oct 29 19:15:26 2010 -0300
staging: vt6656: resolved checkpatch finding
removed a C99 '//' comment and added a space around '='
Signed-off-by: Mariano Reingart <reingart@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fc4f55860254566b43e066bed0962c7cca72da84
Author: Matias De la Puente <mfpuente.ar@xxxxxxxxx>
Date: Fri Oct 29 19:07:45 2010 -0300
staging: vt6656: resolved checkpatch finding
removed parentesis and spaces at the start of a line of a return
Signed-off-by: Matias De la Puente <mfpuente.ar@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit cc8b59d41fa597bb62bdca2c200e8509bc8bec2a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 14:08:38 2010 -0700
Staging: solo6x10: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8892384803af7082056fe29faef02fd0c762493e
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Oct 29 15:19:27 2010 +0200
staging: get rid of dev_base_lock
dev_base_lock was the legacy rwlock used to protect netdevice list, and
is expected to vanish.
We now use RTNL and RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e1ffd62b8fc87e842431cc693821d7f1ac70b9de
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:22 2010 -0400
staging: iio: adis16209: tuning spi delay to make hardware more stable
Looks like one spot was missed in the previous spi tune patch.
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 817e5c65c511d4a83686333ae75507deb4b55d5e
Author: Graf Yang <graf.yang@xxxxxxxxxx>
Date: Wed Oct 27 21:44:21 2010 -0400
staging: iio: resolver: new driver for AD2S1210 devices
Signed-off-by: Graf Yang <graf.yang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ffd7a62f0dffa92409dc769562a4997eb424a7d3
Author: Graf Yang <graf.yang@xxxxxxxxxx>
Date: Wed Oct 27 21:44:20 2010 -0400
staging: iio: resolver: new driver for AD2S1200/1205 devices
Signed-off-by: Graf Yang <graf.yang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f46d9f154ac3001b90e75ca646400a13b499a49e
Author: Graf Yang <graf.yang@xxxxxxxxxx>
Date: Wed Oct 27 21:44:19 2010 -0400
staging: iio: resolver: new driver for AD2S90 devices
This also kicks off the new resolver subsection.
Signed-off-by: Graf Yang <graf.yang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 5b264a624ebc9a082873aa06ea641cbdc760e6e1
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:18 2010 -0400
staging: iio: meter: new driver for ADE7854/58/68/78 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2919fa54ef643364eab69bfff5a72e4aa50d3e39
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:17 2010 -0400
staging: iio: meter: new driver for ADE7759 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8210cfe9bd99fd63fae0b60c40fa793b8454e381
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:16 2010 -0400
staging: iio: meter: new driver for ADE7758 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8d97a5877b85ab0a2b346c2c111a8192d336495f
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:15 2010 -0400
staging: iio: meter: new driver for ADE7754 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 09434ef7c2eedca448d2701ffce229b5ccade64f
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:14 2010 -0400
staging: iio: meter: new driver for ADE7753/6 devices
This also kicks off the new meter subsection.
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 0152a0585281a03d734f38effcfe9515874b7d48
Author: Cliff Cai <cliff.cai@xxxxxxxxxx>
Date: Wed Oct 27 21:44:13 2010 -0400
staging: iio: dds: new driver for AD9951 devices
Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2996a2dc38c58f96432a28fdd7f81ccfd692637d
Author: Cliff Cai <cliff.cai@xxxxxxxxxx>
Date: Wed Oct 27 21:44:12 2010 -0400
staging: iio: dds: new driver for AD9910 devices
Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a886689f6c36ccad01d9600a92029f80a2a6279f
Author: Cliff Cai <cliff.cai@xxxxxxxxxx>
Date: Wed Oct 27 21:44:11 2010 -0400
staging: iio: dds: new driver for AD9852/4 devices
Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a82ab27aa758e4b02f130d86be5c2fedf29c0c0a
Author: Cliff Cai <cliff.cai@xxxxxxxxxx>
Date: Wed Oct 27 21:44:10 2010 -0400
staging: iio: dds: new driver for AD9850/1 devices
Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4a8e6c33e88b09a3fdef022d1711dc13ce8cb7db
Author: Cliff Cai <cliff.cai@xxxxxxxxxx>
Date: Wed Oct 27 21:44:09 2010 -0400
staging: iio: dds: new driver for AD9832/3/4/5 devices
Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit da6fcbdf764cbc8f539333a725411183a4253cfa
Author: Cliff Cai <cliff.cai@xxxxxxxxxx>
Date: Wed Oct 27 21:44:08 2010 -0400
staging: iio: dds: new driver for AD5930/2 devices
This is the initial driver in the new Direct Digital Synthesis section.
Signed-off-by: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6790e29fef61b20b213bd1cf5a025dc3412a4765
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:07 2010 -0400
staging: iio: dac: new driver for AD5624R devices
This is used to convert digital streams into voltages.
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7a83f60d7bdf619cb7a37b5e0f6c128a91c6ecd0
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:06 2010 -0400
staging: iio: gyro: new driver for ADIS16130 digital output gyros
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 1b2f99e1ae79b6039340571312ebbe0551d39c16
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:05 2010 -0400
staging: iio: gyro: new driver for ADIS16080 digital output gyros
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e071f6b8e47834e9c91a299a5e773bebffe10e67
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:04 2010 -0400
staging: iio: gyro: new driver for ADIS16060 digital output gyros
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4f0cd86d66a81fd77912504d0e0b5883c473512e
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:44:03 2010 -0400
staging: iio: gyro: new driver for ADIS16251 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 06b86a75b148e44d489a960c047a8fc6926c841d
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:44:02 2010 -0400
staging: iio: adc: new driver for ADT7410 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a5d8c6bc2f87c1c5cb69fb3a22d1ef0110a9eacc
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:44:01 2010 -0400
staging: iio: adc: new driver for ADT7310 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d7713b6c56472b41e04ebcbdfdf85df84c8e82d6
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:44:00 2010 -0400
staging: iio: adc: new driver for ADT75 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7924425db04a6107e49312edf53c158590d52aae
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:43:59 2010 -0400
staging: iio: adc: new driver for AD7816 devices
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 671d85f2aa3dadc6e221b6f6f7e087bf487275e7
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:43:58 2010 -0400
staging: iio: adc: new driver for AD7745/6/7 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f84c26e61eedaa9eb21fe8a238d38fffb8d3c394
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:43:57 2010 -0400
staging: iio: adc: new driver for AD7314 devices
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e8ada962bc2e34e964d370f721994387df7b1363
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:43:56 2010 -0400
staging: iio: adc: new driver for AD7298 devices
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ddaecd5ba8cc3bc68b65b01cc8dbfedcac87254e
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:43:55 2010 -0400
staging: iio: adc: new driver for AD7291 devices
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a20ebd930081edaf21f354db195e7bb9820b18d8
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:43:54 2010 -0400
staging: iio: adc: new driver for AD7152/3 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 54c5be349bf66ed0c50c2e293803057d148a4c95
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:43:53 2010 -0400
staging: iio: adc: new driver for AD7150/1/6 devices
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 35f6b6b86ede34a9f8c029943842640b2ffbfa19
Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Date: Wed Oct 27 21:43:52 2010 -0400
staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver
IIO driver for temperature sensor, ADC and DAC devices over SPI and I2C.
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit bb6f19eafe3a1a5dd937ce66668e70aeaa1b0bf4
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:43:51 2010 -0400
staging: iio: new adis16204 driver
IIO driver for Programmable High-g Digital Impact Sensor and Recorder.
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f11ba4f5774957415aa15eea7c8c8717126907ee
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:43:50 2010 -0400
staging: iio: new adis16203 driver
IIO driver for Programmable 360 Degrees Inclinometer adis16203 parts.
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f7fe1d1dd5a512a44f0ada40ff7f120664e2e082
Author: Barry Song <barry.song@xxxxxxxxxx>
Date: Wed Oct 27 21:43:49 2010 -0400
staging: iio: new adis16201 driver
IIO driver for dual Axis Accelerometer/inclinometer adis16201 parts.
Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 6f125f17945a65e0bed37a4dfd7e5397a2c7a886
Author: Mike Frysinger <vapier@xxxxxxxxxx>
Date: Wed Oct 27 21:43:48 2010 -0400
staging: iio: add ADI info to TODO
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit f733d02ab61787239d1ca05c30f6f393275a7899
Author: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Date: Wed Oct 27 21:43:47 2010 -0400
staging: iio: gyro: make sure grep can find the ADIS16265 support
Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 61a4295b492f96878b4b47d577a173568530ecff
Author: Mike Frysinger <vapier@xxxxxxxxxx>
Date: Wed Oct 27 21:43:46 2010 -0400
staging: iio: adis16350: add missing reference to temp offset
We declare this attr but never link it in to the attr list.
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 3b785a8cfc6ac1bc837b0a1424056b6a4a1e544e
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date: Tue Nov 9 00:10:02 2010 +0100
Staging: brcm80211: Remove unnecessary casts of void ptr returning alloc function return values
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/brcm80211/
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d4fcdc68564f49cbb4fdaf9b0ebfb5c3d02c81d3
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Sun Nov 7 17:20:37 2010 +0000
Staging: brcmfmac: Fix MAC header lookup on 64-bit architectures
Fix direct use of sk_buff::mac_header which is an offset rather
than a pointer on 64-bit architectures.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 69ec303a99ff68cfb5dbc6cefb043e53b6ba8945
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Fri Nov 5 19:20:16 2010 -0700
staging: brcm80211: migrate #includes from headers into .c files.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 997dd24fe9aadf6e0b3652580e7c79372ccb600c
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Wed Nov 3 19:53:59 2010 -0700
staging: brcm80211: Remove pkttag from osl
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit df0d8bb8daa1e8c3c2afcf93c46ef0294c78ac26
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Wed Nov 3 19:53:58 2010 -0700
staging: brcm80211: Remove 'failed' field from osh
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 2578f7edf895fd4aad278134452cde1dc1b2fef5
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date: Sat Oct 30 00:10:29 2010 +0200
Staging: brcm80211: simplify expression
Simplify: ((a && b) || !a) => (b || !a)
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a28792e78669dc1bb984dd7798f0bccda741acbb
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Mon Nov 1 17:10:18 2010 -0700
staging: brcm80211: Remove cruft from wlioctl.h
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 9014378bf42912533299d37f14677f9dfa21268a
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Mon Nov 1 17:10:17 2010 -0700
staging: brcm80211: Remove OSL_ERROR entry point
Get rid of generic OSL_ERROR and error code
translation to the only place that needs it: dhd.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 683ab518a19fe55de9b9f682c94f672951315fe2
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Mon Nov 1 17:10:16 2010 -0700
staging: brcm80211: Remove dead code from osl.h
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 8fb6b18884703d447af4c5ed1eeec02b489aa54b
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Mon Nov 1 17:10:15 2010 -0700
staging: brcm80211: Remove abstraction layer for dma alignment
Directly align buffers instead of abstracting it.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 4766ae6ce7c5098a26136241576cd8a287d20484
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Wed Oct 27 15:47:53 2010 -0700
staging: brcm80211: purge epivers.h
Purge include/epivers.h moving individual lines to where
they are needed and delete unused refs.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit eb8160364f007c668c423614e262b9b7fc7b2c74
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Oct 26 18:37:24 2010 -0700
staging: brcm80211: Separate fullmac vs softmac defs in shared file
wlioctl.h is shared by fullmac and softmac but mostly fullmac. Separate out
fullmac to purge extranous code in softmac and possibly as a step towards it own file.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 7f7c3dbb3f6d8624109ee30ad5a8f6b23f0a72f4
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Oct 26 15:23:09 2010 -0700
staging: brcm80211: Move #include from bcmutils.h out to .c files
Part of effort to move #includes out of .h files and unwind the include mess.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Oct 26 11:55:23 2010 -0700
staging: brcm80211: Purge linuxver.h and redistribute #includes as required
Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed.
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit a52ba66cf2e06dc7b9ad655b74324e81f756dbd3
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Oct 26 09:17:06 2010 -0700
staging: brcm80211: Move #includes out of d11.h
Move #includes out of d11.h and into .c files
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit ded6d25baa6bb0b3a41fa50a0427258c5d09ea7f
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Oct 26 09:17:05 2010 -0700
staging: brcm80211: Purge unused includes from d11.h
Purge unused #includes from d11.h
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 53b6b34dfaa0263128d1e03bed0ba6fb40df88f8
Author: Brett Rudley <brudley@xxxxxxxxxxxx>
Date: Tue Oct 26 09:17:04 2010 -0700
staging: brcm80211: Purge unused lines from bcmdefs.h/wlc_pub.h
Purge unused lines
Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit e38b67c7cd3d2e377868e4c8ff4772f14ec7c45b
Author: Sven Eckelmann <sven.eckelmann@xxxxxx>
Date: Mon Oct 25 23:43:14 2010 +0200
Staging: batman-adv: Remove useless braces
77099f0afe94928b5b0066a7efa5fa9f81696b54 added changes to vis.c which
trigger a checkpatch.pl warning about braces which are not necessary
anymore.
WARNING: braces {} are not necessary for any arm of this statement
+ if (entry->primary)
[...]
+ else {
[...]
Signed-off-by: Sven Eckelmann <sven.eckelmann@xxxxxx>
Cc: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Cc: Marek Lindner <lindner_marek@xxxxxxxx>
Cc: Simon Wunderlich <siwu@xxxxxxxxxxxxxxxxxx>
Cc: Andrew Lunn <andrew@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit eba499d3e376983f4d521bac05bf7e9a634ace2f
Author: Naveen Kumar Gaddipati <naveen.gaddipati@xxxxxxxxxxxxxx>
Date: Tue Nov 2 17:38:45 2010 +0530
Staging: add Synaptics RMI4 touchpad driver support
Added the Synaptics RMI4 touchpad driver support.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@xxxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Christopher Heiny <cheiny@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 78fd115e21087133be74bc6dd7a9bc1969aea8f8
Author: Ramesh Agarwal <ramesh.agarwal@xxxxxxxxx>
Date: Fri Oct 22 14:00:20 2010 +0100
Staging: add Synaptics TM1217 Touchscreen Controller driver
This is submitted as a staging driver because there is a more generic driver
"on the way" for all these devices and has been for some time. The intent is
that as soon as the general drivers are in the mainstream this one will get
any leftovers integrated and then be dumped. Until this unspecified future
data at least people can actually use their hardware.
As its interface is simply input layer we can do that without pain.
Some clean up by Alan Cox
- Extract gpio support and IRQ support more sanely
- Tidying
Signed-off-by: Ramesh Agarwal <ramesh.agarwal@xxxxxxxxx>
[avoid deference NULL ts if kzalloc fails]
[finger_touched may be used uninitialized]
[fix missing sync which confused twm]
Signed-off-by: Hong Liu <hong.liu@xxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit fc2347e2023221ef04c6d9ce84019aa8c7e0ad6d
Author: Atul Sowani <sowani@xxxxxxxxx>
Date: Wed Nov 3 18:40:56 2010 +0530
Staging: xgifb: change obsolete pci_find_device() with pci_get_device()
Replaced obsolete pci_find_device() calls with pci_get_device() calls.
This is recommended in pci.txt filei in PCI Documentation.
Signed-off-by: Atul Sowani <sowani@xxxxxxxxx>
Acked-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit af02b584bc0e1f46cf1477ad54ae18ec3842b6f4
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Oct 26 21:57:53 2010 +0200
Staging: trivial: fix typos concerning "controller"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit c4fb2bab7dea7780452e57166bd00cdfa9dba6ef
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Tue Oct 26 21:57:52 2010 +0200
Staging: trivial: fix typos concerning "configure"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit dec34f85c62845a4d190a45aa5b5e9dd96797880
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date: Fri Oct 22 17:30:28 2010 -0400
Staging: msm: Makefile: replace the use of <module>-objs with <module>-y
Changed <module>-objs to <module>-y in Makefile.
Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Wed Oct 20 18:51:06 2010 -0700
Staging: intel_sst: Use pr_fmt, fix misspellings
Remove leading "sst: " from format strings.
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Prefix is changed from "sst: " to "snd_intel_sst: "
Add missing newlines
Trim trailing spaces after newlines
Fix several different misspellings
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Vinod Koul <vinod.koul@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit 074e61ec3751da9ab88ee66d3818574556c03489
Author: James Morris <jmorris@xxxxxxxxx>
Date: Wed Nov 10 09:01:31 2010 +1100
kernel: add roundup() code comment from akpm
Add roundup() code comment from akpm.
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: James Morris <jmorris@xxxxxxxxx>
commit 2ff81110de696f37a32cca2de50bf0cfbaf56733
Merge: a7bcf21e60c73cb7f7c13fad928967d7e47c3cac e5837cef1d8356e8303585bd13611ecb3edb5747
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 9 13:43:45 2010 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/beceem into work-next
commit edb40a23c8dc5b5be219bf4561074b6233bba65f
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Oct 19 16:56:54 2010 +0900
ath5k: Add channel time to survey data
Include the channel utilization (busy, rx, tx) in the survey results.
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 3dd0923de491d72a041f82a9d0aaccc473fd2c42
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date: Tue Oct 19 16:56:48 2010 +0900
ath5k: Optimize descriptor alignment
Similar to Felix Fietkau <nbd@xxxxxxxxxxx> "ath9k_hw: optimize all descriptor
access functions" (13db2a80244908833502189a24de82a856668b8a).
Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 123f5b8e6f411d342f2fc8a15c4d9349ace5074a
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date: Mon Oct 18 11:37:17 2010 +0530
ath9k: Remove the median function in rate control
With the current rate control selection method the median function is
nowhere used, so remove it.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit ada9f1cacb66b74a68254521bb5e3ca4eb8fa871
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Sat Oct 16 01:01:48 2010 +0200
ath9k_hw: optimize all descriptor access functions
Because all of the descriptor data structures are marked as __packed, GCC
assumes the worst case wrt. alignment and generates unaligned load/store
instructions on MIPS for access to all fields.
Since descriptors always have to be 4-byte-aligned, we can just mark the
data structures with __aligned(4), which allows GCC to generate much more
efficient code.
Verified through disassembly and OProfile comparisons.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit f0e94b479c987abef17eb18e5c8e0ed178d00cd4
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Sat Oct 16 00:36:17 2010 +0200
ath9k: Convert to new PCI PM framework
The ath9k driver uses the legacy PCI power management (suspend
and resume) callbacks that apparently cause intermittent problems
to happen (the adapter sometimes doesn't resume correctly on my
Acer Ferrari One). Make it use the new PCI PM and let the PCI core
code handle the PCI-specific details of power transitions.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 191d6a1186f65bc86c24b9d6d9d91acc155285ba
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date: Fri Oct 15 13:27:49 2010 -0700
ath9k: fix sparse complaint on aphy for debugfs
This fixes this sparse complaint:
CHECK drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.c:548:34: warning: symbol 'aphy' shadows an earlier one
drivers/net/wireless/ath/ath9k/debug.c:491:26: originally declared here
Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 744bcb42a1ff1b9200e82dd074468877e31ff161
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Oct 15 20:03:33 2010 +0200
ath9k_hw: make ath9k_hw_gettsf32 static
It is now only used in hw.c
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 8eb1dabbd10e067cff671935d3e0c819f8e80d54
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Oct 15 20:03:32 2010 +0200
ath9k: remove a redundant call to ath9k_hw_gettsf32
When the timer_next argument to ath9k_gen_timer_start is behind the tsf value,
tsf + timer_period is used, which is what ath_btcoex_period_timer was setting
it to.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 9fa23e1741404207c414fad69212a8763c138bf0
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Oct 15 20:03:31 2010 +0200
ath9k: optimize/fix ANI RSSI processing
ANI needs the RSSI average only in station mode, and only for tracking
the signal strength of beacons of the AP that it is connected to.
Adjust the code to track on the beacon RSSI, and store the average of that
in the ath_wiphy struct.
With these changes, we can get rid of this extra station lookup in the
rx path, which saves precious CPU cycles.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit e0e9bc82fb0813fd353b0abbba0f1d6a680cc77c
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Oct 15 20:03:30 2010 +0200
ath9k_hw: optimize tx status descriptor processing
Disassembly shows, that at least on MIPS, the compiler generates a lot of
memory accesses to the same location in the descriptor field parsing.
Since it is operating on uncached memory, this can be quite expensive in
this hot path.
Change the code a bit to help the compiler optimize it properly, and get
rid of some unused fields in the ath_tx_status struct.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 45684c75f9aa80eb477465bddcf79c9ad95206c7
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Fri Oct 15 20:03:29 2010 +0200
ath9k_hw: small optimization in ar9002_hw_get_isr
ah->config.rx_intr_mitigation does not need to be checked before checking
the rx interrupt mask for AR_ISR_RXMINTR or AR_ISR_RXINTM, as those
interrupts will be masked out if rx interrupt mitigation is disabled.
Avoid reading AR_ISR_S5_S twice by reordering the code to be more concise.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 4df3071ebd92ef7115b409da64d0eb405d24a631
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date: Mon Nov 8 20:54:47 2010 +0100
ath9k_hw: optimize interrupt mask changes
OProfile showed that ath9k was spending way too much time in
ath9k_hw_set_interrupts. Since most of the interrupt mask changes only
need to globally enable/disable interrupts, it makes sense to split
this part into separate functions, replacing all calls to
ath9k_hw_set_interrupts(ah, 0) with ath9k_hw_disable_interrupts(ah).
ath9k_hw_set_interrupts(ah, ah->imask) only gets changed to
ath9k_hw_enable_interrupts(ah), whenever ah->imask was not changed
since the point where interrupts were disabled.
Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 790a11f268373b60069bc1371dc05143107c607c
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Oct 14 23:04:40 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Cc: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Cc: Nohee Ko <noheek@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 794830e691a6b61d2de3fa9daeb609fd4ef4a4e7
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Sun Oct 17 15:38:51 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Cc: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Cc: Nohee Ko <noheek@xxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 038aaa382eb0a8fd6a0bbae7abc1383b9b57c543
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date: Thu Oct 14 23:01:02 2010 +0200
b43: N-PHY: define channel table struct for rev3+ devices
Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
commit 27b1fec2caa668c162cd1a862c69e087df277fae
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Sep 28 21:02:58 2010 +0530
OMAP: I2C: Convert i2c driver to use PM runtime api's
This patch converts the i2c driver to use PM runtime apis
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Cc: Paul Walmsley <paul@xxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Acked-by: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 4d17aeb1c5b2375769446d13012a98e6d265ec13
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Tue Sep 21 19:37:15 2010 +0530
OMAP: I2C: split device registration and convert OMAP2+ to omap_device
Split the OMAP1 and OMAP2+ platform_device build and register code.
Convert the OMAP2+ variant to use omap_device.
This patch was developed in collaboration with Rajendra Nayak
<rnayak@xxxxxx>.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit f776471f620a07be234f40288a1fd9932d039e26
Author: Benoit Cousson <b-cousson@xxxxxx>
Date: Tue Sep 21 19:37:14 2010 +0530
OMAP4: hwmod: add I2C hwmods for OMAP4430
Add hwmod structures for I2C controllers on OMAP4430.
Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 4fe20e97c8b1082d16b38e9f4c53feeed143ab98
Author: Rajendra Nayak <rnayak@xxxxxx>
Date: Tue Sep 21 19:37:13 2010 +0530
OMAP3: hwmod: add I2C hwmods for OMAP3430
Add hwmod structures for I2C controllers on OMAP3430.
This patch was developed in collaboration with Paul Walmsley
<paul@xxxxxxxxx>.
OMAP3 fixes for correct IDLEST bit monitoring from
G, Manjunath Kondaiah <manjugk@xxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: G, Manjunath Kondaiah <manjugk@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 2004290f55f03c52e22044a5843928cf0f6cc56a
Author: Paul Walmsley <paul@xxxxxxxxx>
Date: Thu Sep 30 02:40:12 2010 +0530
OMAP2xxx: hwmod: add I2C hwmods for OMAP2420, 2430
Add hwmod structures for I2C controllers on OMAP2420/2430.
NOTE: I2C module on OMAP2420 has 16bit registers and causes imprecise
aborts if 32bits are read/written to it. Use the HWMOD_16BIT_REG flag
to notify the hmwod framework of this hard requirement so that
__raw_writew/readw is used to read /write the mdoule registers.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
commit 2af6fd8b18ceed416c9dfa675287c765aabf7d43
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 11:08:53 2010 +0000
net/ipv4/tcp.c: Update WARN uses
Coalesce long formats.
Align arguments.
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b194a3674fba6d9f9e470084d192c7cb99194a62
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 11:08:52 2010 +0000
net/core/dev.c: Update WARN uses
Coalesce long formats.
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9c413ed55d5b52159e85a3937cda7f210a318048
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 11:08:34 2010 +0000
drivers/net/usb: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c389ff80d4b598f57d56aa807d396d4351cac8a4
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Sat Oct 30 11:08:33 2010 +0000
drivers/net/can: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Wed Nov 3 22:49:35 2010 +0000
drivers/net: normalize TX_TIMEOUT
Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of
old kernels.
Convert these definitions to include HZ, since HZ can be 1000 these
days.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e658e9fe65306346e827676a121eca3534ad75ff
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date: Tue Nov 9 09:12:42 2010 -0800
driver core: the development tree has switched to git
So change the MAINTAINERS file to show where the tree now is at.
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
commit b884a94ed16d1a633e76f80fb1bd75d0e7373ce3
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Tue Sep 21 16:37:26 2010 +0100
viafb: Add OLPC XO-1.5 port configs
The OLPC XO-1.5 does not use the standard port wiring suggested
in the viafb driver.
This is required for the upcoming OLPC DCON and via-camera drivers,
to be submitted soon.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
[fts: removed useless ifdef's and corrected comment]
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
commit 67eb6f9617a24dfb033b584d6b1b42b39cc9297a
Author: Jonathan Corbet <corbet@xxxxxxx>
Date: Thu Oct 28 18:23:21 2010 +0100
viafb: suspend/resume for GPIOs
Be sure to re-enable GPIO lines on resume. Users still have to
be sure to set them properly.
Signed-off-by: Jonathan Corbet <corbet@xxxxxxx>
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
commit 751305d9b2fd3e03eaab7808e976241d85ca4353
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date: Thu Oct 28 18:23:01 2010 +0100
viafb: General power management infrastructure
Multiple devices need S/R hooks (framebuffer, GPIO, camera).
Add infrastructure and convert existing framebuffer code to the new
model.
This patch should create no functional change.
Based on earlier work by Jonathan Corbet.
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
Acked-by: Jonathan Corbet <corbet@xxxxxxx>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
commit 7f05dec3dd70f086870fdc1d40dbe30db1fe0994
Author: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
Date: Tue Nov 9 11:28:43 2010 +0000
x86: mrst: Parse SFI timer table for all timer configs
Penwell has APB timer based watchdog timers, it requires platform code to parse
SFI MTMR tables in order to claim its timer.
This patch will always parse SFI MTMR regardless of system timer configuration
choices. Otherwise, SFI MTMR table may not get parsed if running on Medfield
with always-on local APIC timers and constant TSC. Watchdog timer driver will
then not get a timer to use.
Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
LKML-Reference: <20101109112800.20591.10802.stgit@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 1da4b1c6a4dfb5a13d7147a27c1ac53fed09befd
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date: Tue Nov 9 11:22:58 2010 +0000
x86/mrst: Add SFI platform device parsing code
SFI provides a series of tables. These describe the platform devices present
including SPI and I²C devices, as well as various sensors, keypads and other
glue as well as interfaces provided via the SCU IPC mechanism (intel_scu_ipc.c)
This patch is a merge of the core elements and relevant fixes from the
Intel development code by Feng, Alek, myself into a single coherent patch
for upstream submission.
It provides the needed infrastructure to register I2C, SPI and platform devices
described by the tables, as well as handlers for some of the hardware already
supported in kernel. The 0.8 firmware also provides GPIO tables.
Devices are created at boot time or if they are SCU dependant at the point an
SCU is discovered. The existing Linux device mechanisms will then handle the
device binding. At an abstract level this is an SFI to Linux device translator.
Device/platform specific setup/glue is in this file. This is done so that the
drivers for the generic I²C and SPI bus devices remain cross platform as they
should.
(Updated from RFC version to correct the emc1403 name used by the firmware
and a wrongly used #define)
Signed-off-by: Alek Du <alek.du@xxxxxxxxxxxxxxx>
LKML-Reference: <20101109112158.20013.6158.stgit@xxxxxxxxxxxxxxxxxxxxx>
[Clean ups, removal of 0.7 support]
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxxxxxxxx>
[Clean ups]
Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit d6ff7d0fe22cdf3ea41c48b50da9a9181500d1bf
Author: Alexey Charkov <alchark@xxxxxxxxx>
Date: Tue Nov 9 02:42:39 2010 +0300
ARM: Add support for the display controllers in VT8500 and WM8505
This adds drivers for the LCD controller found in VIA VT8500 SoC,
GOVR display controller found in WonderMedia WM8505 SoC and for the
Graphics Engine present in both of them that provides hardware
accelerated raster operations (used for copyarea and fillrect).
Signed-off-by: Alexey Charkov <alchark@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit cf655c36fad7b6488a56f18ab56f7d608ca6552b
Merge: a7bcf21e60c73cb7f7c13fad928967d7e47c3cac 2e351ec61c35fac01ed1fb1ce35c183bf85e780c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 9 16:53:33 2010 +0900
Merge branch 'rmobile/core' into rmobile-latest
commit 5c4986b8a9ddd9cf649abe38a102866f7809b1d2
Merge: a9b27bcc6acf2491609f51aa592ec67311d4518d 37b7a97884ba64bf7d403351ac2a9476ab4f1bba 99870bd784ff9eb2405eab060125c0ded74968cd
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 9 16:51:46 2010 +0900
Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest
commit a9b27bcc6acf2491609f51aa592ec67311d4518d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 12:44:25 2010 -0400
sh: Break out cpuinfo_op procfs bits.
Presently this is all inlined in setup.c, which is not really the place
for it. Follow the x86 example and split it out into its own file.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f020c92de48246510623162fb22d60d91810cc56
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 12:24:48 2010 -0400
sh: Enable optional gpiolib for all CPUs with pinmux tables.
All of the CPUs with pinmux tables support gpiolib. At present the boards
that depend on it for initialization manually select gpiolib as needed,
but there is no reason why it can't be exposed generically to the user
regardless.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 16b259203c513ed28bd31cc9a981e0d3ad517943
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 12:18:48 2010 -0400
sh: migrate SH_CLK_MD to mode pin API.
This kills off the hardcoded SH_CLK_MD introduced by the SH-2 boards and
converts over to the mode pin API.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 973a34aa8593dbfe84386343c694f5beecb51d8a
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Oct 31 05:38:25 2010 +0000
af_unix: optimize unix_dgram_poll()
unix_dgram_poll() is pretty expensive to check POLLOUT status, because
it has to lock the socket to get its peer, take a reference on the peer
to check its receive queue status, and queue another poll_wait on
peer_wait. This all can be avoided if the process calling
unix_dgram_poll() is not interested in POLLOUT status. It makes
unix_dgram_recvmsg() faster by not queueing irrelevant pollers in
peer_wait.
On a test program provided by Alan Crequy :
Before:
real 0m0.211s
user 0m0.000s
sys 0m0.208s
After:
real 0m0.044s
user 0m0.000s
sys 0m0.040s
Suggested-by: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Reported-by: Alban Crequy <alban.crequy@xxxxxxxxxxxxxxx>
Acked-by: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5456f09aaf88731e16dbcea7522cb330b6846415
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Sun Oct 31 05:36:23 2010 +0000
af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event
Alban Crequy reported a problem with connected dgram af_unix sockets and
provided a test program. epoll() would miss to send an EPOLLOUT event
when a thread unqueues a packet from the other peer, making its receive
queue not full.
This is because unix_dgram_poll() fails to call sock_poll_wait(file,
&unix_sk(other)->peer_wait, wait);
if the socket is not writeable at the time epoll_ctl(ADD) is called.
We must call sock_poll_wait(), regardless of 'writable' status, so that
epoll can be notified later of states changes.
Misc: avoids testing twice (sk->sk_shutdown & RCV_SHUTDOWN)
Reported-by: Alban Crequy <alban.crequy@xxxxxxxxxxxxxxx>
Cc: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 67426b756c4d52c511c4b22b269accea171692a8
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Oct 29 20:44:44 2010 +0000
af_unix: use keyed wakeups
Instead of wakeup all sleepers, use wake_up_interruptible_sync_poll() to
wakeup only ones interested into writing the socket.
This patch is a specialization of commit 37e5540b3c9d (epoll keyed
wakeups: make sockets use keyed wakeups).
On a test program provided by Alan Crequy :
Before:
real 0m3.101s
user 0m0.000s
sys 0m6.104s
After:
real 0m0.211s
user 0m0.000s
sys 0m0.208s
Reported-by: Alban Crequy <alban.crequy@xxxxxxxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Oct 29 03:09:24 2010 +0000
decnet: RCU conversion and get rid of dev_base_lock
While tracking dev_base_lock users, I found decnet used it in
dnet_select_source(), but for a wrong purpose:
Writers only hold RTNL, not dev_base_lock, so readers must use RCU if
they cannot use RTNL.
Adds an rcu_head in struct dn_ifaddr and handle proper RCU management.
Adds __rcu annotation in dn_route as well.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4a7b93bd5d84e1e79917d024d17d745d190fc9a
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Oct 29 01:52:46 2010 +0000
bonding: remove dev_base_lock use
bond_info_seq_start() uses a read_lock(&dev_base_lock) to make sure
device doesnâ??t disappear. Same goal can be achieved using RCU.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 840a185dddfd098b78b96a30da4cad722a7aef18
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date: Fri Oct 29 01:15:29 2010 +0000
aoe: remove dev_base_lock use from aoecmd_cfg_pkts()
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert aoecmd_cfg_pkts() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: "Ed L. Cashin" <ecashin@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1d5439b9a29b1386d44a617cbaf2f7acde1d697c
Author: Arce, Abraham <x0066660@xxxxxx>
Date: Thu Oct 28 18:57:20 2010 +0000
ks8851: suspend resume support
Add suspend/resume support using default open/stop interface methods
to do hardware dependant operations.
On suspend, same low power state (soft power mode) will be kept, the
following blocks will be disabled:
- Internal PLL Clock
- Tx/Rx PHY
- MAC
- SPI Interface
Signed-off-by: Abraham Arce <x0066660@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d0eaeec8e8dfdc31815941054802dcccd7c3fe1d
Merge: a7bcf21e60c73cb7f7c13fad928967d7e47c3cac aa58163a76a3aef33c7220931543d45d0fe43753
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Mon Nov 8 12:38:28 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 5bf68592e72eb0ded154efaaf43b39aab6964fc3
Author: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Date: Mon Nov 8 10:07:42 2010 -0500
solo6x10: [P2M] Fix memory leak
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxxxxxx>
commit 6f80dfe55fcbde1e588bc2cfa1273403b710872d
Author: Christoph Hellwig <hch@xxxxxxxxxx>
Date: Sun Nov 7 23:01:17 2010 +0100
hfsplus: fix option parsing during remount
hfsplus only actually uses the force option during remount, but it uses
the full option parser with a fake superblock to do so. This means remount
will fail if any nls option is set (which happens frequently with older
mount tools), even if it is the same.
Fix this by adding a simpler version of the parser that only parses the force
option for remount.
Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxx>
commit 98072e4d977aabe6a39abb95951cd8bf2c2202d5
Author: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
Date: Thu Oct 28 13:50:37 2010 +0400
slub: Fix slub_lock down/up imbalance
There are two places, that do not release the slub_lock.
Respective bugs were introduced by sysfs changes ab4d5ed5 (slub: Enable
sysfs support for !CONFIG_SLUB_DEBUG) and 2bce6485 ( slub: Allow removal
of slab caches during boot).
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Pavel Emelyanov <xemul@xxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 716ce5d4a6f81653507c21b152eb7629d150ce7a
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date: Wed Oct 27 18:17:38 2010 +0300
slub: Fix build breakage in Documentation/vm
This patch fixes a build breakage introduced by commit
f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move slabinfo.c to
tools/slub/slabinfo.c") that was repoted by Stephen:
After merging the slab tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
gcc: /scratch/sfr/next/Documentation/vm/slabinfo.c: No such file or directory
gcc: no input files
Caused by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move
slabinfo.c to tools/slub/slabinfo.c"). Missing update to
Documentation/vm/Makefile?
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 4a92379bdfb48680a5e6775dd53a586df7b6b0b1
Author: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Date: Thu Oct 21 10:29:19 2010 +0100
slub tracing: move trace calls out of always inlined functions to reduce kernel code size
Having the trace calls defined in the always inlined kmalloc functions
in include/linux/slub_def.h causes a lot of code duplication as the
trace functions get instantiated for each kamalloc call site. This can
simply be removed by pushing the trace calls down into the functions in
slub.c.
On my x86_64 built this patch shrinks the code size of the kernel by
approx 36K and also shrinks the code size of many modules -- too many to
list here ;)
size vmlinux (2.6.36) reports
text data bss dec hex filename
5410611 743172 828928 6982711 6a8c37 vmlinux
5373738 744244 828928 6946910 6a005e vmlinux + patch
The resulting kernel has had some testing & kmalloc trace still seems to
work.
This patch
- moves trace_kmalloc out of the inlined kmalloc() and pushes it down
into kmem_cache_alloc_trace() so this it only get instantiated once.
- rename kmem_cache_alloc_notrace() to kmem_cache_alloc_trace() to
indicate that now is does have tracing. (maybe this would better being
called something like kmalloc_kmem_cache ?)
- adds a new function kmalloc_order() to handle allocation and tracing
of large allocations of page order.
- removes tracing from the inlined kmalloc_large() replacing them with a
call to kmalloc_order();
- move tracing out of inlined kmalloc_node() and pushing it down into
kmem_cache_alloc_node_trace
- rename kmem_cache_alloc_node_notrace() to
kmem_cache_alloc_node_trace()
- removes the include of trace/events/kmem.h from slub_def.h.
v2
- keep kmalloc_order_trace inline when !CONFIG_TRACE
Signed-off-by: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 0d24db337e6d81c0c620ab65cc6947bd6553f742
Author: Christoph Lameter <cl@xxxxxxxxx>
Date: Thu Oct 21 13:01:56 2010 -0500
slub: move slabinfo.c to tools/slub/slabinfo.c
We now have a tools directory for these things.
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
commit 62d69e6a57c5b5d52a607b1ce73ff6af65c992eb
Author: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Date: Sat Oct 23 16:48:58 2010 +0000
omap3: IGEP v2: Remove onenand_setup no-op function
Set onenand_setup to NULL instead of adding a no-op function.
Signed-off-by: Enric Balletbo i Serra <eballetbo@xxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
commit 0e4de059d90c96930ab237e7d4fbb7e3814afcb6
Author: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Date: Fri Nov 5 10:29:33 2010 -0400
solo6x10: Implement working P2M descriptor more DMA
We have to insert 1 dead descriptor first (all zereos), and then the real
data descriptors after that.
Everything uses descriptor mode now (8800 interrupts per second for display
v4l2 is now down to ~96).
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxxxxxx>
commit 319fb3bacc517829cbd4d758f3b8969fdbde5c92
Author: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Date: Thu Nov 4 23:20:31 2010 -0400
solo6x10: Updates to videobuf-dma-sg functions for latest kernel
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxxxxxx>
commit f62de9be26ce2144ad0dcf292727e4f58577d401
Author: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Date: Thu Nov 4 22:51:17 2010 -0400
solo6x10: Conversion to videobuf-dma-sg (from dma-cont)
Full rewrite of the P2M DMA Engine to support scatter gather and take
advantage of some of the features of the hardware. This includes using
repeat DMA operations and line-mode transfers (for copying OSG and
video display buffers).
What isn't working: For some reason, descriptor mode is not working. I've
implemented a psuedo version (still has one-interrupt per DMA operation),
but we would get huge improvements if we could hand off a ring of
descriptors to the P2M and get back one interrupt when it was done with
all of them.
Documentation is very vague on this, and even the ODM example code
half attempts to get it right, but comments it out of the driver
because it just doesn't work *sigh*
Converts all v4l2 to dma-sg. So long slow dma-contiguous, but hello
more interrupts :(
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxxxxxx>
commit 1194cf4308d786c69b808ec3aa8704d01d130e94
Author: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Date: Thu Nov 4 22:42:25 2010 -0400
solo6x10: Update TODO
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxxxxxx>
commit 98e2d5a802518694465368406c5f1b020f4df998
Author: Ben Collins <bcollins@xxxxxxxxxxxxxx>
Date: Thu Nov 4 22:37:15 2010 -0400
solo6x10: Spaces to tabs
Signed-off-by: Ben Collins <bcollins@xxxxxxxxxxxxxx>
commit 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b
Author: Rob Herring <r.herring@xxxxxxxxxxxxx>
Date: Wed Oct 6 16:18:08 2010 +0100
ARM: 6432/1: move timer-sp.c from versatile to common
From: Rob Herring <rob.herring@xxxxxxxxxxxxxxxx>
The timer-sp h/w used on versatile platforms can also be used for other
platforms, so move it to a common location.
Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 64d2dc384e41e2b7acead6804593ddaaf8aad8e1
Author: Leif Lindholm <leif.lindholm@xxxxxxx>
Date: Thu Sep 16 18:00:47 2010 +0100
ARM: 6396/1: Add SWP/SWPB emulation for ARMv7 processors
The SWP instruction was deprecated in the ARMv6 architecture,
superseded by the LDREX/STREX family of instructions for
load-linked/store-conditional operations. The ARMv7 multiprocessing
extensions mandate that SWP/SWPB instructions are treated as undefined
from reset, with the ability to enable them through the System Control
Register SW bit.
This patch adds the alternative solution to emulate the SWP and SWPB
instructions using LDREX/STREX sequences, and log statistics to
/proc/cpu/swp_emulation. To correctly deal with copy-on-write, it also
modifies cpu_v7_set_pte_ext to change the mappings to priviliged RO when
user RO.
Signed-off-by: Leif Lindholm <leif.lindholm@xxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Acked-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 247055aa21ffef1c49dd64710d5e94c2aee19b58
Author: Catalin Marinas <catalin.marinas@xxxxxxx>
Date: Mon Sep 13 16:03:21 2010 +0100
ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs
This patch removes the domain switching functionality via the set_fs and
__switch_to functions on cores that have a TLS register.
Currently, the ioremap and vmalloc areas share the same level 1 page
tables and therefore have the same domain (DOMAIN_KERNEL). When the
kernel domain is modified from Client to Manager (via the __set_fs or in
the __switch_to function), the XN (eXecute Never) bit is overridden and
newer CPUs can speculatively prefetch the ioremap'ed memory.
Linux performs the kernel domain switching to allow user-specific
functions (copy_to/from_user, get/put_user etc.) to access kernel
memory. In order for these functions to work with the kernel domain set
to Client, the patch modifies the LDRT/STRT and related instructions to
the LDR/STR ones.
The user pages access rights are also modified for kernel read-only
access rather than read/write so that the copy-on-write mechanism still
works. CPU_USE_DOMAINS gets disabled only if the hardware has a TLS register
(CPU_32v6K is defined) since writing the TLS value to the high vectors page
isn't possible.
The user addresses passed to the kernel are checked by the access_ok()
function so that they do not point to the kernel space.
Tested-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
commit 5a39ce5b491a10f4a15bd30b26e55d3533b5f587
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date: Wed Oct 13 15:58:17 2010 +0200
HID: egalax: Use kzalloc
To avoid unnecessary explicit initialization, allocate zeroed memory.
Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 8b7347aab6865ae8a2e5a8b0f1deea12da3d3aff
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Sun Sep 19 15:56:30 2010 +0200
vhost: get/put_user -> __get/__put_user
We do access_ok checks on all ring values on an ioctl,
so we don't need to redo them on each access.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit dfe5ac5b18be5b10d01a17e734a9905c0def6088
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Tue Sep 21 14:18:01 2010 +0200
vhost: copy_to_user -> __copy_to_user
We do access_ok checks at setup time, so we don't need to
redo them on each access.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit 64e1c80748afca3b4818ebb232a9668bf529886d
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Wed Oct 6 15:34:45 2010 +0200
vhost-net: batch use/unuse mm
Move use/unuse mm to vhost.c which makes it possible to batch these
operations.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit 533a19b4b88fcf81da3106b94f0ac4ac8b33a248
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Wed Oct 6 15:34:38 2010 +0200
vhost: put mm after thread stop
makes it possible to batch use/unuse mm
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit a4bc6926d05b60bf70aab2db2c6715e15118cbdc
Author: Jiri Kosina <jkosina@xxxxxxx>
Date: Wed Nov 3 10:42:02 2010 -0400
HID: make translation table selection more clear
Reshuffle the code a little bit so that the translation table selection
is more obvious and there is only one place performing the actual
translation using the selected table.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 99b9f758bbc904f22faffcf4d83205f4a5e7bc0c
Author: Edgar (gimli) Hucek <gimli@xxxxxxxxxxxxxx>
Date: Wed Nov 3 10:36:18 2010 -0400
HID: add MacBookAir 3,1 and 3,2 support
This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the hid
driver.
Signed-off-by: Edgar (gimli) Hucek <gimli@xxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 587d145200f26758940099fbbc301fdd43d3f391
Author: Joe Perches <joe@xxxxxxxxxxx>
Date: Mon Oct 25 19:44:21 2010 -0700
HID: Remove KERN_DEBUG from dbg_hid use
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 8b32a92b600e2728c5c438a748a4dc3132c98ef3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 17:05:30 2010 -0400
sh: Add EHCI support for SH7786.
This adds in the platform device for SH7786 USB EHCI.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 63c845522263b2da08f70deba760ed0ab51e841d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 17:03:27 2010 -0400
usb: ehci-hcd: Add support for SuperH EHCI.
This adds a trivial stub for supporting EHCI mode of the on-chip
SH USB host controllers.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9cc563968066b55b067bcff132e4d566b020687d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 17:01:27 2010 -0400
usb: ohci-sh: Set IRQ as shared.
The SH USB interface has both OHCI and EHCI modes that share the
same interrupt. Flag the OHCI IRQ as shared in preparation for EHCI
support.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 04561c5aa243c98cae93cde27e05740df787e692
Author: Ignaz Forster <ignaz.forster@xxxxxx>
Date: Mon Nov 1 15:13:37 2010 -0400
HID: Add Force Feedback support for EMS Trio Linker Plus II
The device has connections for GameCube, PlayStation 2 and Dreamcast
controllers, however Force Feedback is only supported for PS2 and GC
controllers.
When using a PS2 controller it may be necessary to press the "Analog" button to
enable support for both motors (this behavior is identical to the Windows
driver, I have found no way to avoid that).
Signed-off-by: Ignaz Forster <ignaz.forster@xxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit e5837cef1d8356e8303585bd13611ecb3edb5747
Merge: c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 2932af344a86cb1bd84ca8cc217ee016e8fb5255
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 14:37:23 2010 -0400
Merge branch 'master' of ../mine
commit 2932af344a86cb1bd84ca8cc217ee016e8fb5255
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 14:18:16 2010 -0400
beceem: update TODO list
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 349fa79498df313c70e2a4b7c16688be0a91dd0b
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 14:09:05 2010 -0400
beceem: dump control packet information
Add control packet information is useful for debugging.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 4ea4f7a0d3d7a9961bf77f0860df8dd4a213b8a3
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 14:06:24 2010 -0400
beceem: change startup messages
Change the regsister/unregister routines to generate better
messages, and control arrival of new frames when USB device is
unplugged.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 9c5d77009db6ff09d02a7b0a99a70c0dfd3af6c6
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 13:59:01 2010 -0400
beceem: don't overrun user buffer on read
Serious bug in original code, if app reads 10 bytes but 20 byte msg
received memory would get overwritten.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 5cf084f44ac24189ef3373010da49e26d651aa06
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 13:57:35 2010 -0400
beceem: eliminate unused bcm_jiffies
Unused, unneeded, and bogus.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 78afa9990fdbbf01227104300a657be3f3caa167
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 13:54:21 2010 -0400
beceem: fix definition of VLAN header type
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit cacd92222dd4e04424fa532cf1a222e67c30709b
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 13:34:35 2010 -0400
beceem: statistics and transmit queue changes
Use standard network statistics variables and routines.
Transmit counters are per queue, and skb mapping is already in
skb and does not need to be recomputed. Move SearchVcId to only
place it is used.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit b5ebd85b2bcc0c0a2171e4cc74c61debdc903ddf
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:28:39 2010 -0400
beceem: do classification even if device is offline
Since classification and queue control are separate, allow
classification even if device is down now; this avoids races
on startup/shutdown.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 429a5908fe3bc4d9ca2512b94cd10b69d50bf91f
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:27:20 2010 -0400
beceem: off by one on queue index
The driver allocates 18 queues (0..16) are for traffic, and 17
is a bit bucket.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 9dd47ee7dd535649a2c32d509631c7a3d793f2e1
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:24:00 2010 -0400
beceem: make local functions static
Use namespace tool from kernel scripts to identify dead code and
functions that should be static.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 45400554923867c8479621e55a76e0612192dafb
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:21:32 2010 -0400
beceem: remove unused code to dump header
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit ac1b1ae7f84dcde6d6fefc7f8ca27c4e5bd92c22
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:20:09 2010 -0400
beceem: transmit code cleanup
Eliminate global variable in transmit path
The Leader can be on the stack, and get rid of unnecessary timeval.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 1da9badcf02dd6532df9bde8fc05648e74982f2c
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 11:58:01 2010 -0400
beceem: allow multicast/broadcast
Even though wimax isn't really a broadcast medium, pretend it is.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 9ec4475bf10bb2c30cd5e927bc453aa307f58123
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:18:36 2010 -0400
beceem: debug message format changes
Add more debug messages and make them similar to other drivers
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit e4d46254da76106e48b7cadc59fb410291e2da4b
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 11:39:05 2010 -0400
beceem: use get_seconds for elapsed time
get_seconds is lower overhead and fine if all driver wants to do
is keep track of seconds.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 2d08748ae53bf07fe6fcaf4f3d40449b471ce351
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:14:01 2010 -0400
beceem: module initialization
Get rid of boot messages and put in correct place.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 4fd64dd0c1b9317ffe6fdaf3de788e14df880d8d
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 12:12:31 2010 -0400
beceem: add network device message level control
Provide standard interface to control verbosity of debug messages
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit e39e3be66eed17f27a9de322e5220d33e70a90a6
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 11:14:29 2010 -0400
beceem: change format of debug message
Statistic point is now u32 (like it has to be).
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 3349d95b3f8c3becb9e6dbe0be978bf663174fef
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 11:12:56 2010 -0400
beceem: clean up adapter structure
Remove dead fields, change fields that only have true/false to boolean;
and rearrange to save space.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 9e0a3169a34ba5fd04bde058a63fa0a36f2d7ed3
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 10:17:54 2010 -0400
beceem: create class on module installation
First step to supporting multiple devices, create device class
when module is initialized.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 46c3790eb523931a803bb3c28c5bf8bbfc8acf48
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 10:16:29 2010 -0400
beceem: convert to kernel coding style
Change indentation etc, to conform to acceptable kernel style
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 5afb5145a13ac26f3c7ab273140a83958bc038f0
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 10:07:20 2010 -0400
beceem: remove useless debug function entry messages
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 957ea3b57056e79c945d8bc39fd6eeb3c2a7ed9e
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 10:05:34 2010 -0400
beceem: remove problematic debug print messages
Not worth bothering to change printf format of messages which
are basically noise.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 032100f65295d594fc0481e840efe8b6c1e398af
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 10:03:29 2010 -0400
beceem: remove unnecessary usb class
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit ada692b09f4707a8e06b087b1546d9f5b3f2d37d
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 09:26:47 2010 -0400
beceem: fix character device ioctl
Sparse caught several places where ioctl interface was incorrectly using user
memory. Fix all the ioctl cases for casting and __user annotation.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit c5ebe2278ba600ff48663ec84c6e7f34d291503f
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 08:42:44 2010 -0400
beceem: fix printf format strings
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 0980f2e8144ea0021a09be41176b736d76ca3db7
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 00:04:52 2010 -0400
beceem: reserve one queue for bit-bucket
This preserves the semantics of the original driver (unclassified packets
are dropped), but does it in a clean way; and fixes crash when packet
is sent to offline device.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 3644c1a2f12b15e1c8bfb9ebfaacbd177011a72d
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 00:03:03 2010 -0400
beceem: remove dead code
Remove commented out with '#if 0'
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 937110581650eaa517f045fb7b86b9828ba693ad
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Sun Oct 31 23:55:21 2010 -0400
beceem: support multiple queues
Current kernels have multi-queue support which can be used by
this device. This has the advantage that a single type of traffic
will not block other types.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 20f48653fcf51f6d1246b5f3f86b40ed779385b2
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Sun Oct 31 23:52:36 2010 -0400
beceem: get rid of unnecessary inline usage
Many routines were tagged with inline_ but GCC does a better
job of deciding this.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 26a0e39ac8ed1f38b31baeb901bc76501466d34e
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Sun Oct 31 23:47:35 2010 -0400
beceem: fold unregister_netdevice into AdapterFree
The function unregister_netdevice only called unregister_netdev.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 7441698fe9eb0eb473cf1699d9cd8dd06dfeaf77
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 09:53:58 2010 -0400
beceem: remove ARP spoofing
Linux support NOARP flag, so the whole Arp spoofing routines
are not needed.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 6ba8fe77ddd3a25daa8409333295b90c26a43bae
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Sun Oct 31 23:43:55 2010 -0400
beceem: print better message on bad ioctl
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit e614e28eac1afcdc3d1275f3e1478aa3e5acc500
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 09:52:14 2010 -0400
beceem: remove indirection to Adapter structure
Allocate Adapter structure as part of network device.
Signed-off-by: Stephen Hemminber <shemminger@xxxxxxxxxx>
commit 2515ab628f227b0711393993fe3228e167cc988f
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 21:39:54 2010 -0700
beceem: Add proper carrier and link management
Start with carrier off.
Don't track up/down status in driver private flag.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit d7affd0f58c9f68441b4ce631d07fad2e6a448db
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 17:15:06 2010 -0700
beceem: reduce transmit queue len
Reduce transmit queue length to avoid excess buffering
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 9c6e9aa830071a442fb72ab05c15e2b2609636e3
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 17:13:52 2010 -0700
beceem: remove dead code
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit d21d6dde0280f0897ce6de1948bfaa5633867b28
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 17:12:37 2010 -0700
beceem: add ethtool support
This adds basic ethtool support to get driver info and settings
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 71e253b1699fb777be68cb1028a90e21ea6ff8d8
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 09:49:30 2010 -0400
beceem: make transmit thread interruptible
Kernel complains loudly if thread does long uninterruptible sleep.
Also, dont wake up every 10ms even if no data present (wastes power).
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 37b7a97884ba64bf7d403351ac2a9476ab4f1bba
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Nov 1 09:49:04 2010 -0400
sh: machvec IO death.
This takes a bit of a sledgehammer to the machvec I/O routines. The
iomem case requires no special casing and so can just be dropped
outright. This only leaves the ioport casing for PCI and SuperIO
mangling. With the SuperIO case going through the standard ioport
mapping, it's possible to replace everything with generic routines.
With this done the standard I/O routines are tidied up and NO_IOPORT
now gets default-enabled for the vast majority of boards.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit de85f9858969f50467bf39ee992ef871ae2492d3
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 17:02:39 2010 -0700
beceem: name threads with device name
This is the convention used by Intel Wimax
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 082e889b475c46e71be6e779f15ab095f888e03f
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Mon Nov 1 09:35:21 2010 -0400
beceem: remove OS wrapper library
Use native kernel functions for kmalloc/kfree directly
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit c5113e3c111b03c8eaf3fb0ef39e33dc25171adc
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 21:26:06 2010 -0700
beceem: use kernel print_hex_dump function
No longer need special hex dump routine
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 4b6ba8aacbb3185703b797286547d0f8f3859b02
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Tue Oct 26 15:07:13 2010 -0700
of/net: Move of_get_mac_address() to a common source file.
There are two identical implementations of of_get_mac_address(), one
each in arch/powerpc/kernel/prom_parse.c and
arch/microblaze/kernel/prom_parse.c. Move this function to a new
common file of_net.{c,h} and adjust all the callers to include the new
header.
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
[grant.likely@xxxxxxxxxxxx: protect header with #ifdef]
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 0ad008fcbc39572ab7078975cdf7e902fbc39ce6
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 16:44:07 2010 -0700
beceem: cleanup network device setup
Change how network device is setup:
* set pointer to device object so sysfs has eth0/device symlink
* set network device type
* eliminate all the compatiablity with older kernels.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 92bc60580e55d18494a23ba8ae642a464ebfd7a6
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:22:10 2010 -0700
beceem: get rid of OS dependent data structure
The only part of this structure still used was the network
device stats, and in recent kernel these are available in
network device itself.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 2b5e625882a7130c339e4ad2ac2b8f0422f11919
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:20:11 2010 -0700
beceem: eliminate dead code
Get rid of empty header file and unused declarations
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit d52db0b4b34410019e1546e3ccbe761b9e4ddd76
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:18:27 2010 -0700
beceem: eliminate network registered state variable
Just use presence of pointer
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 3705a843bd98b3ccb7c4b6addfc182fe805a73ed
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:14:16 2010 -0700
beceem: remove bogus network device notifier
Network device should not be messing with refcounts directly.
See Documentation/networking/netdevices.txt
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 2564a148d5326f1d36202e497b3dd0a17422c636
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:11:12 2010 -0700
beceem: cleanup debug level infrastructure
Add module parameter to control debug level and do code cleanup
The whole debug stuff should eventually be removed.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 047a5f2b503d0ba17704c9714b296cbf06ec087e
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:04:18 2010 -0700
beceem: eliminate unused USB stubs
USB layer does not require these reset function stubs
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 5abe61ade9a137b35aa29919334dde7f3a30b248
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 08:02:08 2010 -0700
beceem: remove version ifdef's
Remove code to support older kernel API's
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 91d29ee1a82fedcd7d1bbf24007b31a49c47e90a
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 07:51:47 2010 -0700
beceem: remove ifdef's
There were a lot of ifdef's for driver options which have no
configuration options. Choose the current value and remove the
ifdef.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit 2e44f765dfd3a8592c2d6b6005be061eccdee137
Author: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx>
Date: Fri Oct 29 07:44:45 2010 -0700
beceem: add module information
Add description and version information to the driver.
Make USB device table exported as alias so device will be
autoloaded. Get rid of useless noise message on boot.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
commit b690c425fe07c725e7f1f7d40303588416cba67f
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date: Fri Oct 29 13:25:24 2010 -0700
SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ
Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3fcedec752108de5d99b9f0373ff880756a1e87d
Author: Julia Lawall <julia@xxxxxxx>
Date: Tue Oct 26 12:25:32 2010 +0200
drivers/vhost/vhost.c: delete double assignment
Delete successive assignments to the same location.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
commit eb48c9cb2053e7bb5f7f8f0371cb578a0d439450
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Mon Oct 25 16:03:39 2010 +0200
apic, amd: Make firmware bug messages more meaningful
This improves error messages in case the BIOS was setting up
wrong LVT offsets.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
LKML-Reference: <1288015419-29543-6-git-send-email-robert.richter@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 0a17941e71f089b128514f7b5b486e20072ca7dc
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Mon Oct 25 16:03:38 2010 +0200
mce, amd: Remove goto in threshold_create_device()
Removing the goto in threshold_create_device().
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
LKML-Reference: <1288015419-29543-5-git-send-email-robert.richter@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bbaff08dca3c34d0fb6b4c4051354184e33e3df8
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Mon Oct 25 16:03:37 2010 +0200
mce, amd: Add helper functions to setup APIC
This patch reworks and cleans up mce_amd_feature_init() by
introducing helper functions to setup and check the LVT offset.
It also fixes line endings in pr_err() calls.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
LKML-Reference: <1288015419-29543-4-git-send-email-robert.richter@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7203a0494084541575bac6dfc4e153f9e28869b8
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Mon Oct 25 16:03:36 2010 +0200
mce, amd: Shorten local variables mci_misc_{hi,lo}
Shorten this variables to make later changes more readable.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
LKML-Reference: <1288015419-29543-3-git-send-email-robert.richter@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 9c37c9d89773ee9da9f6af28ee37d931bd045711
Author: Robert Richter <robert.richter@xxxxxxx>
Date: Mon Oct 25 16:03:35 2010 +0200
mce, amd: Implement mce_threshold_block_init() helper function
This patch adds a helper function for the initial setup of an
mce threshold block. The LVT offset is passed as argument. Also
making variable threshold_defaults local as it is only used in
function mce_amd_feature_init(). Function
threshold_restart_bank() is extended to setup the LVT offset,
the change is backward compatible. Thus, now there is only a
single wrmsrl() to setup the block.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
LKML-Reference: <1288015419-29543-2-git-send-email-robert.richter@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 7fb2b870d6a3b92f6750ac2b72858fd098dc9e3f
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Sun Oct 24 11:11:22 2010 +0200
x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage
Stupid me forgot to change the function name for the
CONFIG_X86_IO_APIC=n case in commit 23f9b2671 (x86: apic: Move
probe_nr_irqs_gsi() into ioapic_init_mappings())
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit fe7de49f9d4e53f24ec9ef762a503f70b562341c
Author: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Date: Wed Oct 20 16:01:12 2010 -0700
sched: Make sched_param argument static in sched_setscheduler() callers
Andrew Morton pointed out almost all sched_setscheduler() callers are
using fixed parameters and can be converted to static. It reduces runtime
memory use a little.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Reported-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Acked-by: James Morris <jmorris@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 23f9b267159b4c7ff59d2e6c8ed31693eff841e3
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Fri Oct 15 15:38:50 2010 -0700
x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
probe_br_irqs_gsi() is called right after ioapic_init_mappings() and
there are no other users. Move it into ioapic_init_mappings() so the
declaration can disappear and the function can become static.
Rename ioapic_init_mappings() to ioapic_and_gsi_init() to reflect that
change.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <1287510389-8388-2-git-send-email-dirk.brandewie@xxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@xxxxxxxxx>
commit 5a7ae78fd478624df3059cb6f55056b85d074acc
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue Oct 19 10:46:28 2010 -0700
x86: Allow platforms to force enable apic
Some embedded x86 platforms don't setup the APIC in the
BIOS/bootloader and would be forced to add "lapic" on the kernel
command line. That's a bit akward.
Split out the force enable code from detect_init_APIC() and allow
platform code to call it from the platform setup. That avoids the
command line parameter and possible replication of the MSR dance in
the force enable code.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <1287510389-8388-1-git-send-email-dirk.brandewie@xxxxxxxxx>
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@xxxxxxxxx>
commit fd35fbcdd1b2579a6e00a1545f7124e4005d0474
Author: H. Peter Anvin <hpa@xxxxxxxxx>
Date: Fri Oct 22 15:33:38 2010 -0700
x86-64, asm: Use fxsaveq/fxrestorq in more places
Checkin d7acb92fea932ad2e7846480aeacddc2c03c8485 made use of fxsaveq
in fpu_fxsave() if the assembler supports it; this adds
fxsaveq/fxrstorq to fxrstor_checking() and fxsave_user() as well.
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
LKML-Reference: <AANLkTi=RKyHLNTq6iomZOXkc6Zw1j9iAgsq8388XmzwN@xxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 466bd3030973910118ca601da8072be97a1e2209
Author: Yong Zhang <yong.zhang@xxxxxxxxxxxxx>
Date: Wed Oct 20 15:57:33 2010 -0700
timer: Warn when del_timer_sync() is called in hardirq context
Add explict warning when del_timer_sync() is called in hardirq
context.
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 1118e2cd33d47254854e1ba3ba8e32802ff14fdf
Author: Yong Zhang <yong.zhang@xxxxxxxxxxxxx>
Date: Wed Oct 20 15:57:32 2010 -0700
timer: Del_timer_sync() can be used in softirq context
Actually we have used del_timer_sync() in softirq context for a long time,
e.g. in __dst_free()::cancel_delayed_work().
So change the comments of it to warn on hardirq context only, and make
lockdep know about this change.
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 6f1bc451e6a79470b122a37ee1fc6bbca450f444
Author: Yong Zhang <yong.zhang@xxxxxxxxxxxxx>
Date: Wed Oct 20 15:57:31 2010 -0700
timer: Make try_to_del_timer_sync() the same on SMP and UP
On UP try_to_del_timer_sync() is mapped to del_timer() which does not
take the running timer callback into account, so it has different
semantics.
Remove the SMP dependency of try_to_del_timer_sync() by using
base->running_timer in the UP case as well.
[ tglx: Removed set_running_timer() inline and tweaked the changelog ]
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 20f33a03f0cf87e51165f7084f697acfb68e865b
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date: Wed Oct 20 15:57:34 2010 -0700
posix-timers: Annotate lock_timer()
lock_timer() conditionally grabs it_lock in case of returning non-NULL
but unlock_timer() releases it unconditionally. This leads sparse to
complain about the lock context imbalance. Rename and wrap lock_timer
using __cond_lock() macro to make sparse happy.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit dd6414b50fa2b1cd247a8aa8f8bd42414b7453e1
Author: Phil Carmody <ext-phil.2.carmody@xxxxxxxxx>
Date: Wed Oct 20 15:57:33 2010 -0700
timer: Permit statically-declared work with deferrable timers
Currently, you have to just define a delayed_work uninitialised, and then
initialise it before first use. That's a tad clumsy. At risk of playing
mind-games with the compiler, fooling it into doing pointer arithmetic
with compile-time-constants, this lets clients properly initialise delayed
work with deferrable timers statically.
This patch was inspired by the issues which lead Artem Bityutskiy to
commit 8eab945c5616fc984 ("sunrpc: make the cache cleaner workqueue
deferrable").
Signed-off-by: Phil Carmody <ext-phil.2.carmody@xxxxxxxxx>
Acked-by: Artem Bityutskiy <Artem.Bityutskiy@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 2bf1c05e3c406925e498d06da66b4828f0209ea6
Author: Nikitas Angelinas <nikitasangelinas@xxxxxxxxxxxxxx>
Date: Wed Oct 20 15:57:31 2010 -0700
time: Use ARRAY_SIZE macro in timecompare.c
Replace sizeof(buffer)/sizeof(buffer[0]) with ARRAY_SIZE(buffer) in
kernel/time/timecompare.c
Signed-off-by: Nikitas Angelinas <nikitasangelinas@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit aaabe31c25a439b92cc281b14ca18b85bae7e7a6
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date: Wed Oct 20 15:57:30 2010 -0700
timer: Initialize the field slack of timer_list
TIMER_INITIALIZER() should initialize the field slack of timer_list as
__init_timer() does.
Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd
Author: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Date: Wed Oct 20 15:57:30 2010 -0700
timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS
Reorder struct timer_list to remove 8 bytes of alignment padding on 64
bit builds when CONFIG_TIMER_STATS is selected.
timer_list is widely used across the kernel so many structures will
benefit and shrink in size.
For example, with my config on x86_64
per_cpu_dm_data shrinks from 136 to 128 bytes
and
ahci_port_priv shrinks from 1032 to 968 bytes.
Signed-off-by: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit a386b5af8edda1c742ce9f77891e112eefffc005
Author: Kasper Pedersen <kkp2010@xxxxxxxxxxx>
Date: Wed Oct 20 15:55:15 2010 -0700
time: Compensate for rounding on odd-frequency clocksources
When the clocksource is not a multiple of HZ, the clock will be off. For
acpi_pm, HZ=1000 the error is 127.111 ppm:
The rounding of cycle_interval ends up generating a false error term in
ntp_error accumulation since xtime_interval is not exactly 1/HZ. So, we
subtract out the error caused by the rounding.
This has been visible since 2.6.32-rc2
commit a092ff0f90cae22b2ac8028ecd2c6f6c1a9e4601
time: Implement logarithmic time accumulation
That commit raised NTP_INTERVAL_FREQ and exposed the rounding error.
testing tool: http://n1.taur.dk/permanent/testpmt.c
Also tested with ntpd and a frequency counter.
Signed-off-by: Kasper Pedersen <kkp2010@xxxxxxxxxxx>
Acked-by: john stultz <johnstul@xxxxxxxxxx>
Cc: John Kacur <jkacur@xxxxxxxxxx>
Cc: Clark Williams <williams@xxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 8e8be45e8e55daa381028aec339829929ddb53a5
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Date: Thu Sep 2 16:16:14 2010 -0700
rcu: add priority-inversion testing to rcutorture
Add an optional test to force long-term preemption of RCU read-side
critical sections, controlled by new test_boost, test_boost_interval,
and test_boost_duration module parameters. This is to be used to
test RCU priority boosting.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
commit d3b8f889a220aed825accc28eb64ce283a0d51ac
Author: john stultz <johnstul@xxxxxxxxxx>
Date: Mon Aug 17 16:40:47 2009 -0700
x86: Make tsc=reliable override boot time stability checks
This patch makes the tsc=reliable option disable the boot time
stability checks. Currently the option only disables the runtime
watchdog checks. This change allows folks who want to override the
boot time TSC stability checks and use the TSC when the system would
otherwise disqualify it.
There still are some situations that the TSC will be disqualified,
such as cpufreq scaling. But these are situations where the box will
hang if allowed.
Patch also includes a fix for an issue found by Thomas Gleixner, where
the TSC disqualification message wouldn't be printed after a call to
unsynchronized_tsc().
Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: akataria@xxxxxxxxxx
Cc: Stephen Hemminger <shemminger@xxxxxxxxxx>
LKML-Reference: <1250552447.7212.92.camel@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
-----------------------------------------------------------------------
hooks/post-receive
--
XFS development tree
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
