1. 27 Oct, 2010 6 commits
  2. 25 Oct, 2010 17 commits
    • Don Fry's avatar
      iwlwifi: quiet a noisy printk · 822395b5
      Don Fry authored
      Timing issues in microcode for some devices can cause a compressed BA to
      be sent to the driver prior to returning any a-MPDU notification.
      Traces show RTS-CTS is exchanged and then the timer fires which causes an
      empty BA to be sent which acknowledges nothing.  This results in a noisy
      printk. Only print the message if the bitmap is non-zero.
      Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
      Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      822395b5
    • Felix Fietkau's avatar
      ath9k: resume aggregation immediately after a hardware reset · fac6b6a0
      Felix Fietkau authored
      Since aggregation is usually triggered by tx completion, a hardware
      reset (because of beacon stuck, tx hang or baseband hang) can
      significantly delay the transmission of the next AMPDU (until the next
      tx completion event).
      Fix this by rescheduling aggregation after such a reset.
      Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      fac6b6a0
    • Christian Lamparter's avatar
      carl9170: fix scheduling while atomic · dafeac38
      Christian Lamparter authored
      This patch fixes the following mishap:
      
      BUG: scheduling while atomic: wpa_supplicant/4164/0x00000002
      Modules linked in: carl9170 mac80211 [...]
      Pid: 4164, comm: wpa_supplicant Not tainted 2.6.36-wl+ #119
      Call Trace:
       [<c13779a9>] ? schedule+0x349/0x4c0
       [<c13780d6>] ? schedule_timeout+0x106/0x1e0
       [<c1037f50>] ? process_timeout+0x0/0x10
       [<c1377e8d>] ? wait_for_common+0x9d/0x140
       [<c1029110>] ? default_wake_function+0x0/0x10
       [<f80c6080>] ? carl9170_exec_cmd+0xf0/0x250 [carl9170]
       [<f80c695e>] ? carl9170_set_mac_reg+0x5e/0x70 [carl9170]
       [<f80c3f76>] ? carl9170_op_add_interface+0x176/0x310 [carl9170]
       [...]
      
      rcu_read_unlock() call was erroneously placed after the
      sync. function carl9170_mod_virtual_mac.
      Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      dafeac38
    • Rajkumar Manoharan's avatar
      mac80211: Fix ibss station got expired immediately · c8716d9d
      Rajkumar Manoharan authored
      Station addition in ieee80211_ibss_rx_queued_mgmt is not updating
      sta->last_rx which is causing station expiry in ieee80211_ibss_work
      path. So sta addition and deletion happens repeatedly.
      
      CC: stable@kernel.org
      Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      c8716d9d
    • Rafał Miłecki's avatar
      30115c22
    • Grazvydas Ignotas's avatar
      wl1251: fix module names · 04348f27
      Grazvydas Ignotas authored
      The wl1251 move accidently renamed wl1251_sdio and wl1251_spi
      modules to just sdio and spi. Restore proper module names.
      Signed-off-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
      Acked-by: default avatarKalle Valo <kvalo@adurom.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      04348f27
    • Felix Fietkau's avatar
      ath9k: fix handling of rate control probe frames · 0299a50a
      Felix Fietkau authored
      The ath9k aggregation code was already checking the rate control probe flag
      to prevent starting an aggregate frame with a sampling rate. What was missing
      was closing an aggregate before adding a probing frame to it.
      Without that, rate control cannot have precise control over probing, which
      delays using faster rates when the channel conditions improve.
      Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      0299a50a
    • Felix Fietkau's avatar
      ath9k: fix crash in ath_update_survey_stats · 0845735e
      Felix Fietkau authored
      If ah->curchan is uninitialized, the channel index is bogus, which leads
      to invalid memory access when the cycle counters are updated.
      Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      0845735e
    • Senthil Balasubramanian's avatar
      ath9k_hw: Fix divide by zero cases in paprd. · 2d3fca18
      Senthil Balasubramanian authored
      We are not handling all divide by zero cases in paprd.
      Add additional checks for divide by zero cases in papard.
      
      This patch has fixes intended for kernel 2.6.36.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      2d3fca18
    • Luis R. Rodriguez's avatar
      ath9k_hw: Fix TX carrier leakage for IEEE compliance on AR9003 2.2 · 0dfa6dbb
      Luis R. Rodriguez authored
      This updates the initvals for the AR9003 2.2 chipsets. The initvals
      are the initial register values we use for our registers upon hardware
      reset. This synchs up the initvals to match what our latest recommendation
      from our systems engineering team.
      
      The description of changes in this update:
      
              Improves ability to support very strong Rx conditions.
              Enhances DFS support for AP-mode.
              Improves performance of Tx carrier leak calibration.
              Adds support for Japan channel 14 Tx filtering requirements.
              Improves Tx power accuracy.
      
      Impact:
      
              Update required to address degraded throughput at very short range.
              Update required for AP-mode DFS certification.
              Update required to comply to IEEE Tx carrier leak specification.
              May not meet expected +/- 2 dB Tx power accuracy without update.
      
      The most important fix here would be the TX carrier leakage required
      to comply with IEEE 802.11 specifications. The group of changes have
      been tested all together in one release.
      
      References:
      
      	Osprey 2.2 header file ver #33
      
      Checksums:
      
      $ ./initvals -f ar9003-2p2
      0x000000004a488fc7        ar9300_2p2_radio_postamble
      0x0000000046cb1300        ar9300Modes_lowest_ob_db_tx_gain_table_2p2
      0x00000000e912711f        ar9300Modes_fast_clock_2p2
      0x0000000037ac0ee8        ar9300_2p2_radio_core
      0x00000000047a7700        ar9300Common_rx_gain_table_merlin_2p2
      0x0000000003f783bb        ar9300_2p2_mac_postamble
      0x00000000301fc841        ar9300_2p2_soc_postamble
      0x000000005ec8075f        ar9200_merlin_2p2_radio_core
      0x0000000083372ffa        ar9300_2p2_baseband_postamble
      0x00000000c4f59974        ar9300_2p2_baseband_core
      0x00000000e20d2e72        ar9300Modes_high_power_tx_gain_table_2p2
      0x000000007fd55c70        ar9300Modes_high_ob_db_tx_gain_table_2p2
      0x0000000029495000        ar9300Common_rx_gain_table_2p2
      0x0000000042cb1300        ar9300Modes_low_ob_db_tx_gain_table_2p2
      0x00000000c4739cd6        ar9300_2p2_mac_core
      0x000000003521a300        ar9300Common_wo_xlna_rx_gain_table_2p2
      0x00000000a15ccf1b        ar9300_2p2_soc_preamble
      0x0000000029734396        ar9300PciePhy_pll_on_clkreq_disable_L1_2p2
      0x000000002d834396        ar9300PciePhy_clkreq_enable_L1_2p2
      0x0000000029834396        ar9300PciePhy_clkreq_disable_L1_2p2
      
      $ ./initvals -f ar9003-2p2 | sha1sum
      0ceddb5cf66737610fb51f04cf3e9ff71870c7b4  -
      
      Cc: stable@kernel.org
      Cc: Yixiang Li <yixiang.li@atheros.com>
      Cc: Don Breslin <don.breslin@atheros.com>
      Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      0dfa6dbb
    • Luis R. Rodriguez's avatar
      cfg80211: fix regression on processing country IEs · a171fba4
      Luis R. Rodriguez authored
      The patch 4f366c5d:
      
      	wireless: only use alpha2 regulatory information from country IE
      
      removed some complex intersection we were always doing between the AP's
      country IE info and what we got from CRDA. When CRDA sent us back a
      regulatory domain we would do some sanity checks on that regulatory
      domain response we just got. Part of these sanity checks included
      checking that we already had performed an intersection for the
      request of NL80211_REGDOM_SET_BY_COUNTRY_IE type.
      
      This mean that cfg80211 was only processing country IEs for cases
      where we already had an intersection, but since we removed enforcing
      this this is no longer required, we should just apply the country
      IE country hint with the data received from CRDA.
      
      This patch has fixes intended for kernels >= 2.6.36.
      
      Cc: stable@kernel.org
      Reported-by: default avatarEaswar Krishnan <easwar.krishnan@atheros.com>
      Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      a171fba4
    • Christian Lamparter's avatar
      carl9170: fix memory leak issue in async cmd macro wrappers · 3d2f2cd0
      Christian Lamparter authored
      This patch continues where the previous commit:
      	"carl9170: fix async command buffer leak"
      left off.
      
      Similar to carl9170_reboot/carl9170_powersave, the
      carl9170_async_regwrite* macros would leak the
      temporary command buffer, if __carl9170_exec_cmd
      fails to upload the command to the device.
      Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      3d2f2cd0
    • Christian Lamparter's avatar
      mac80211: don't sanitize invalid rates · 5f4e6b2d
      Christian Lamparter authored
      I found this bug while poking around with a pure-gn AP.
      
      Commit:
      cfg80211/mac80211: Use more generic bitrate mask for rate control
      
      Added some sanity checks to ensure that each tx rate index
      is included in the configured mask and it would change any
      rate indexes if it wasn't.
      
      But, the current implementation doesn't take into account
      that the invalid rate index "-1" has a special meaning
      (= no further attempts) and it should not be "changed".
      Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      5f4e6b2d
    • Christian Lamparter's avatar
      carl9170: fix async command buffer leak · cae7f953
      Christian Lamparter authored
      If __carl9170_exec_cmd fails to upload an asynchronous
      command to the device, the functions: carl9170_reboot
      and carl9170_powersave will leak the temporary command
      assembly buffer.
      Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      cae7f953
    • Ben Greear's avatar
      ath5k: Properly initialize ath_common->cc_lock. · 9192f715
      Ben Greear authored
      Otherwise, lockdep splats, at the least:
      
      INFO: trying to register non-static key.
      the code is fine but needs lockdep annotation.
      turning off the locking correctness validator.
      Pid: 0, comm: swapper Not tainted 2.6.36-rc8-wl+ #32
      Call Trace:
       [<c075d940>] ? printk+0xf/0x17
       [<c045507a>] register_lock_class+0x5a/0x29e
       [<c0456af5>] __lock_acquire+0xa2/0xb8c
       [<c0455be2>] ? mark_lock+0x1e/0x1de
       [<c041a540>] ? acpi_get_override_irq+0x85/0x8c
       [<c0455536>] ? trace_hardirqs_off+0xb/0xd
       [<c0457639>] lock_acquire+0x5a/0x78
       [<f8126835>] ? ath5k_ani_calibration+0x24/0x52b [ath5k]
       [<c075f6ed>] _raw_spin_lock_bh+0x20/0x2f
       [<f8126835>] ? ath5k_ani_calibration+0x24/0x52b [ath5k]
       [<f8126835>] ath5k_ani_calibration+0x24/0x52b [ath5k]
       [<c0438f99>] ? tasklet_action+0x3b/0xc6
       [<f8123c2b>] ath5k_tasklet_ani+0x18/0x22 [ath5k]
       [<c0438fd1>] tasklet_action+0x73/0xc6
       [<c043945f>] __do_softirq+0x86/0x111
       [<c0439520>] do_softirq+0x36/0x5a
       [<c0439659>] irq_exit+0x35/0x69
       [<c0403fb9>] do_IRQ+0x86/0x9a
       [<c04034ee>] common_interrupt+0x2e/0x40
       [<c045007b>] ? do_adjtimex+0x223/0x55e
       [<c0408245>] ? mwait_idle+0x5c/0x6c
       [<c040227f>] cpu_idle+0x4e/0x6b
       [<c074b6e9>] rest_init+0x8d/0x92
       [<c09758ea>] start_kernel+0x320/0x325
       [<c09750d0>] i386_start_kernel+0xd0/0xd7
      Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
      Acked-by: default avatarBruno Randolf <br1@einfach.org>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      9192f715
    • Ben Greear's avatar
      ath9k: Properly initialize ath_common->cc_lock. · 20b25744
      Ben Greear authored
      Otherwise, lockdep splats, at the least:
      
      INFO: trying to register non-static key.
      the code is fine but needs lockdep annotation.
      turning off the locking correctness validator.
      Pid: 2240, comm: ip Not tainted 2.6.36-rc8-wl+ #32
      Call Trace:
       [<c075d940>] ? printk+0xf/0x17
       [<c045507a>] register_lock_class+0x5a/0x29e
       [<c0455be2>] ? mark_lock+0x1e/0x1de
       [<c0456af5>] __lock_acquire+0xa2/0xb8c
       [<c0455be2>] ? mark_lock+0x1e/0x1de
       [<c0457639>] lock_acquire+0x5a/0x78
       [<f8c5115b>] ? ath9k_config+0x274/0x3d8 [ath9k]
       [<c075f602>] _raw_spin_lock_irqsave+0x2f/0x3f
       [<f8c5115b>] ? ath9k_config+0x274/0x3d8 [ath9k]
       [<f8c5115b>] ath9k_config+0x274/0x3d8 [ath9k]
       [<f8c0ba2e>] ieee80211_hw_config+0x11b/0x125 [mac80211]
       [<f8c17edf>] ieee80211_do_open+0x3c5/0x466 [mac80211]
       [<f8c171d6>] ? ieee80211_check_concurrent_iface+0x21/0x13a [mac80211]
       [<f8c17fdb>] ieee80211_open+0x5b/0x5e [mac80211]
       [<c06ce76b>] __dev_open+0x80/0xae
       [<c06cc99b>] __dev_change_flags+0xa0/0x115
       [<c06ce6bf>] dev_change_flags+0x13/0x3f
       [<c06d7e78>] do_setlink+0x23a/0x51b
       [<c0455037>] ? register_lock_class+0x17/0x29e
       [<c06d847c>] rtnl_newlink+0x269/0x431
       [<c06d8291>] ? rtnl_newlink+0x7e/0x431
       [<c0455be2>] ? mark_lock+0x1e/0x1de
       [<c0455de9>] ? mark_held_locks+0x47/0x5f
       [<c075ebcf>] ? __mutex_lock_common+0x2bb/0x2d6
       [<c0456045>] ? trace_hardirqs_on_caller+0x104/0x125
       [<c075ebe0>] ? __mutex_lock_common+0x2cc/0x2d6
       [<c06d8213>] ? rtnl_newlink+0x0/0x431
       [<c06d79e2>] rtnetlink_rcv_msg+0x182/0x198
       [<c06d7860>] ? rtnetlink_rcv_msg+0x0/0x198
       [<c06e503c>] netlink_rcv_skb+0x30/0x77
       [<c06d7859>] rtnetlink_rcv+0x1b/0x22
       [<c06e4e77>] netlink_unicast+0xbe/0x119
       [<c06e5a15>] netlink_sendmsg+0x234/0x24c
       [<c06bf93a>] __sock_sendmsg+0x51/0x5a
       [<c06bfba4>] sock_sendmsg+0x93/0xa7
       [<c04968cf>] ? might_fault+0x47/0x81
       [<c0496904>] ? might_fault+0x7c/0x81
       [<c06c7904>] ? copy_from_user+0x8/0xa
       [<c06c7c2d>] ? verify_iovec+0x3e/0x6d
       [<c06bfd8c>] sys_sendmsg+0x149/0x193
       [<c0455037>] ? register_lock_class+0x17/0x29e
       [<c0455be2>] ? mark_lock+0x1e/0x1de
       [<c0498d7a>] ? __do_fault+0x1fc/0x3a5
       [<c048690a>] ? unlock_page+0x40/0x43
       [<c0498ef7>] ? __do_fault+0x379/0x3a5
       [<c04576dd>] ? lock_release_non_nested+0x86/0x1d8
       [<c04968cf>] ? might_fault+0x47/0x81
       [<c04968cf>] ? might_fault+0x47/0x81
       [<c06c148b>] sys_socketcall+0x15e/0x1a5
       [<c0402f1c>] sysenter_do_call+0x12/0x38
      Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      20b25744
    • Tejun Heo's avatar
      mac80211: cancel restart_work explicitly instead of depending on flush_scheduled_work() · 99b88a0e
      Tejun Heo authored
      iee80211_hw->restart_work is the only work which uses the system
      workqueue.  Instead of calling flush_scheduled_work() during
      iee80211_exit(), cancel the work during unregistration.
      
      This is to prepare for the deprecation and removal of
      flush_scheduled_work().
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      99b88a0e
  3. 24 Oct, 2010 17 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 229aebb8
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        Update broken web addresses in arch directory.
        Update broken web addresses in the kernel.
        Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
        Revert "Fix typo: configuation => configuration" partially
        ida: document IDA_BITMAP_LONGS calculation
        ext2: fix a typo on comment in ext2/inode.c
        drivers/scsi: Remove unnecessary casts of private_data
        drivers/s390: Remove unnecessary casts of private_data
        net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
        drivers/infiniband: Remove unnecessary casts of private_data
        drivers/gpu/drm: Remove unnecessary casts of private_data
        kernel/pm_qos_params.c: Remove unnecessary casts of private_data
        fs/ecryptfs: Remove unnecessary casts of private_data
        fs/seq_file.c: Remove unnecessary casts of private_data
        arm: uengine.c: remove C99 comments
        arm: scoop.c: remove C99 comments
        Fix typo configue => configure in comments
        Fix typo: configuation => configuration
        Fix typo interrest[ing|ed] => interest[ing|ed]
        Fix various typos of valid in comments
        ...
      
      Fix up trivial conflicts in:
      	drivers/char/ipmi/ipmi_si_intf.c
      	drivers/usb/gadget/rndis.c
      	net/irda/irnet/irnet_ppp.c
      229aebb8
    • Linus Torvalds's avatar
      Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac · 8de547e1
      Linus Torvalds authored
      * 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
        i7300_edac: Properly initialize per-csrow memory size
        V4L/DVB: i7300_edac: better initialize page counts
        MAINTAINERS: Add maintainer for i7300-edac driver
        i7300-edac: CodingStyle cleanup
        i7300_edac: Improve comments
        i7300_edac: Cleanup: reorganize the file contents
        i7300_edac: Properly detect channel on CE errors
        i7300_edac: enrich FBD error info for corrected errors
        i7300_edac: enrich FBD error info for fatal errors
        i7300_edac: pre-allocate a buffer used to prepare err messages
        i7300_edac: Fix MTR x4/x8 detection logic
        i7300_edac: Make the debug messages coherent with the others
        i7300_edac: Cleanup: remove get_error_info logic
        i7300_edac: Add a code to cleanup error registers
        i7300_edac: Add support for reporting FBD errors
        i7300_edac: Properly detect the type of error correction
        i7300_edac: Detect if the device is on single mode
        i7300_edac: Adds detection for enhanced scrub mode on x8
        i7300_edac: Clear the error bit after reading
        i7300_edac: Add error detection code for global errors
        ...
      8de547e1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 76c39e4f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: (27 commits)
        SLUB: Fix memory hotplug with !NUMA
        slub: Move functions to reduce #ifdefs
        slub: Enable sysfs support for !CONFIG_SLUB_DEBUG
        SLUB: Optimize slab_free() debug check
        slub: Move NUMA-related functions under CONFIG_NUMA
        slub: Add lock release annotation
        slub: Fix signedness warnings
        slub: extract common code to remove objects from partial list without locking
        SLUB: Pass active and inactive redzone flags instead of boolean to debug functions
        slub: reduce differences between SMP and NUMA
        Revert "Slub: UP bandaid"
        percpu: clear memory allocated with the km allocator
        percpu: use percpu allocator on UP too
        percpu: reduce PCPU_MIN_UNIT_SIZE to 32k
        vmalloc: pcpu_get/free_vm_areas() aren't needed on UP
        SLUB: Fix merged slab cache names
        Slub: UP bandaid
        slub: fix SLUB_RESILIENCY_TEST for dynamic kmalloc caches
        slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
        slub: Add dummy functions for the !SLUB_DEBUG case
        ...
      76c39e4f
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 1765a1fe
      Linus Torvalds authored
      * 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (321 commits)
        KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
        KVM: Fix signature of kvm_iommu_map_pages stub
        KVM: MCE: Send SRAR SIGBUS directly
        KVM: MCE: Add MCG_SER_P into KVM_MCE_CAP_SUPPORTED
        KVM: fix typo in copyright notice
        KVM: Disable interrupts around get_kernel_ns()
        KVM: MMU: Avoid sign extension in mmu_alloc_direct_roots() pae root address
        KVM: MMU: move access code parsing to FNAME(walk_addr) function
        KVM: MMU: audit: check whether have unsync sps after root sync
        KVM: MMU: audit: introduce audit_printk to cleanup audit code
        KVM: MMU: audit: unregister audit tracepoints before module unloaded
        KVM: MMU: audit: fix vcpu's spte walking
        KVM: MMU: set access bit for direct mapping
        KVM: MMU: cleanup for error mask set while walk guest page table
        KVM: MMU: update 'root_hpa' out of loop in PAE shadow path
        KVM: x86 emulator: Eliminate compilation warning in x86_decode_insn()
        KVM: x86: Fix constant type in kvm_get_time_scale
        KVM: VMX: Add AX to list of registers clobbered by guest switch
        KVM guest: Move a printk that's using the clock before it's ready
        KVM: x86: TSC catchup mode
        ...
      1765a1fe
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · bdaf12b4
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-viapro: Don't log nacks
        i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
        MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
        i2c/mux: Driver for PCA9541 I2C Master Selector
        i2c: Optimize function i2c_detect()
        i2c: Discard warning message on device instantiation from user-space
        i2c-amd8111: Add proper error handling
        i2c: Change to new flag variable
        i2c: Remove unneeded inclusions of <linux/i2c-id.h>
        i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
        i2c: Simplify i2c_parent_is_i2c_adapter
        i2c-pca-platform: Change device name of request_irq
        i2c: Fix Kconfig dependencies
      bdaf12b4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7c024e95
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (47 commits)
        HID: fix mismerge in hid-lg
        HID: hidraw: fix window in hidraw_release
        HID: hid-sony: override usbhid_output_raw_report for Sixaxis
        HID: add absolute axis resolution calculation
        HID: force feedback support for Logitech RumblePad gamepad
        HID: support STmicroelectronics and Sitronix with hid-stantuml driver
        HID: magicmouse: Adjust major / minor axes to scale
        HID: Fix for problems with eGalax/DWAV multi-touch-screen
        HID: waltop: add support for Waltop Slim Tablet 12.1 inch
        HID: add NOGET quirk for AXIS 295 Video Surveillance Joystick
        HID: usbhid: remove unused hiddev_driver
        HID: magicmouse: Use hid-input parsing rather than bypassing it
        HID: trivial formatting fix
        HID: Add support for Logitech Speed Force Wireless gaming wheel
        HID: don't Send Feature Reports on Interrupt Endpoint
        HID: 3m: Adjust major / minor axes to scale
        HID: 3m: Correct touchscreen emulation
        HID: 3m: Convert to MT slots
        HID: 3m: Output proper orientation range
        HID: 3m: Adjust to sequential MT HID protocol
        ...
      7c024e95
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 188e213d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: Makefile - replace the use of <module>-objs with <module>-y
        crypto: hifn_795x - use cancel_delayed_work_sync()
        crypto: talitos - sparse check endian fixes
        crypto: talitos - fix checkpatch warning
        crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
        crypto: cryptd - Adding the AEAD interface type support to cryptd
        crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
        crypto: Kconfig - update broken web addresses
        crypto: omap-sham - Adjust DMA parameters
        crypto: fips - FIPS requires algorithm self-tests
        crypto: omap-aes - OMAP2/3 AES hw accelerator driver
        crypto: updates to enable omap aes
        padata: add missing __percpu markup in include/linux/padata.h
        MAINTAINERS: Add maintainer entries for padata/pcrypt
      188e213d
    • Pekka Enberg's avatar
      Merge branch 'master' into for-linus · 6d4121f6
      Pekka Enberg authored
      Conflicts:
      	include/linux/percpu.h
      	mm/percpu.c
      6d4121f6
    • Jean Delvare's avatar
      i2c-viapro: Don't log nacks · bf5d95c8
      Jean Delvare authored
      Transactions not acked can happen every now and then, in particular
      during device detection, and various transaction types can be used for
      this purpose. So stop logging this event, except when debugging is
      enabled. This is what other similar drivers (e.g. i2c-i801 or
      i2c-piix4) do.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      bf5d95c8
    • Guenter Roeck's avatar
      i2c/pca954x: Remove __devinit and __devexit from probe and remove functions · db79f2a1
      Guenter Roeck authored
      The underlying I2C adapter may or may not be present when this driver
      gets initialized, and may disappear later, so there is no safe time at
      which the probe and remove functions can be discarded.
      Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      db79f2a1
    • Guenter Roeck's avatar
    • Guenter Roeck's avatar
      i2c/mux: Driver for PCA9541 I2C Master Selector · ae63b13b
      Guenter Roeck authored
      This patch adds support for PCA9541, an I2C Bus Master Selector.
      The driver is modeled as single channel I2C Multiplexer to be able to utilize
      the I2C multiplexer framework.
      Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      Reviewed-by: default avatarTom Grennan <tom.grennan@ericsson.com>
      Acked-by: default avatarJean Delvare <khali@linux-fr.org>
      ae63b13b
    • Jean Delvare's avatar
      i2c: Optimize function i2c_detect() · 51b54ba9
      Jean Delvare authored
      Check the class flags before allocating the temporary i2c_client
      structure, to avoid allocating it when we don't need it.
      
      Also optimize the inner loop a bit.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
      51b54ba9
    • Jean Delvare's avatar
      i2c: Discard warning message on device instantiation from user-space · d57558d0
      Jean Delvare authored
      The "new_device" sysfs interface has been there for quite some time
      now, nobody complained about it so it must be good enough. Time to
      remove the warning and call it stable.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarMichael Lawnick <ml.lawnick@gmx.de>
      d57558d0
    • Julia Lawall's avatar
      i2c-amd8111: Add proper error handling · 9cb2c272
      Julia Lawall authored
      The functions the functions amd_ec_wait_write and amd_ec_wait_read have an
      unsigned return type, but return a negative constant to indicate an error
      condition.
      
      A sematic match that finds this problem is as follows:
      (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @exists@
      identifier f;
      constant C;
      @@
      
       unsigned f(...)
       { <+...
      *  return -C;
       ...+> }
      // </smpl>
      
      Fixing amd_ec_wait_write and amd_ec_wait_read leads to the need to adjust
      the return type of the functions amd_ec_write and amd_ec_read, which are
      the only functions that call amd_ec_wait_write and amd_ec_wait_read.
      amd_ec_write and amd_ec_read, in turn, are only called from within the
      function amd8111_access, which already returns a signed typed value.  Each
      of the calls to amd_ec_write and amd_ec_read are updated using the
      following semantic patch:
      
      // <smpl>
      @@
      @@
      
      + status = amd_ec_write
      - amd_ec_write
        (...);
      + if (status) return status;
      
      @@
      @@
      
      + status = amd_ec_read
      - amd_ec_read
        (...);
      + if (status) return status;
      // </smpl>
      
      The patch also adds the declaration of the status variable.
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      9cb2c272
    • matt mooney's avatar
      i2c: Change to new flag variable · ef9d9b8f
      matt mooney authored
      Replace EXTRA_CFLAGS with ccflags-y.
      Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      ef9d9b8f
    • Jean Delvare's avatar
      i2c: Remove unneeded inclusions of <linux/i2c-id.h> · a8d7be81
      Jean Delvare authored
      These drivers don't use anything which is defined in <linux/i2c-id.h>.
      This header file was never meant to be included directly anyway, and
      will be deleted soon.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
      Acked-by: default avatarDave Airlie <airlied@linux.ie>
      Cc: Hans Verkuil <hverkuil@xs4all.nl>
      a8d7be81