1. 16 5月, 2012 4 次提交
  2. 15 5月, 2012 4 次提交
    • J
      genirq: export handle_edge_irq() and irq_to_desc() · 3911ff30
      Jiri Kosina 提交于
      Export handle_edge_irq() and irq_to_desc() to modules to allow them to
      do things such as
      
      	__irq_set_handler_locked(...., handle_edge_irq);
      
      This fixes
      
      	ERROR: "handle_edge_irq" [drivers/gpio/gpio-pch.ko] undefined!
      	ERROR: "irq_to_desc" [drivers/gpio/gpio-pch.ko] undefined!
      
      when gpio-pch is being built as a module.
      
      This was introduced by commit df9541a6 ("gpio: pch9: Use proper flow
      type handlers") that added
      
      	__irq_set_handler_locked(d->irq, handle_edge_irq);
      
      but handle_edge_irq() was not exported for modules (and inlined
      __irq_set_handler_locked() requires irq_to_desc() exported as well)
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3911ff30
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · b6255ee3
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "For a some fix patches for v3.4, including a regression fix at DVB core"
      
      Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] gspca - sonixj: Fix a zero divide in isoc interrupt
        [media] media: videobuf2-dma-contig: include header for exported symbols
        [media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer
        [media] media: vb2-memops: Export vb2_get_vma symbol
        [media] s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS
        [media] s5p-fimc: Fix locking in subdev set_crop op
        [media] dvb_frontend: fix a regression with DVB-S zig-zag
        [media] fintek-cir: change || to &&
        [media] V4L: Schedule V4L2_CID_HCENTER, V4L2_CID_VCENTER controls for removal
        [media] rc: Postpone ISR registration
        [media] marvell-cam: fix an ARM build error
        [media] V4L: soc-camera: protect hosts during probing from overzealous user-space
      b6255ee3
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d69c5c2c
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "The main purpose of this pull request is to fix up the erroneous
        bonding patch I applied last round.  I meant to apply v4 of the patch
        from Jiri but I applied v3 by accident.  Mea culpa.
      
        Also, eagle eyed Dan Carpenter noticed that openvswitch has one of
        those "X = alloc(); if (!Y)" mistakes, test the proper pointer
        instead."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        openvswitch: checking wrong variable in queue_userspace_packet()
        bonding: Fix LACPDU rx_dropped commit.
      d69c5c2c
    • A
      tty: Fix LED error return · eea41aee
      Alan Cox 提交于
      3.4-rc introduced a regression when setting the LEDS. We do the right thing
      but then return an error code.
      
      Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43144
      Reported-by: Christian Casteyde
      Signed-off-by: NAlan Cox <alan@linux/intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      eea41aee
  3. 14 5月, 2012 3 次提交
  4. 13 5月, 2012 16 次提交
  5. 12 5月, 2012 13 次提交
    • M
      dm mpath: check if scsi_dh module already loaded before trying to load · 510193a2
      Mike Snitzer 提交于
      If the requested scsi_dh module is already loaded then skip
      request_module().
      
      Multipath table loads can hang in an unnecessary __request_module.
      Reported-by: NBen Marzinski <bmarzins@redhat.com>
      Cc: stable@kernel.org
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      510193a2
    • A
      dm thin: correct module description · 7cab8bf1
      Alasdair G Kergon 提交于
      Remove duplicate copy of string "device-mapper" (DM_NAME) from
      MODULE_DESCRIPTION.
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      7cab8bf1
    • M
      dm thin: fix unprotected use of prepared_discards list · c3a0ce2e
      Mike Snitzer 提交于
      Fix two places in commit 104655fd ("dm thin: support discards") that
      didn't use pool->lock to protect against concurrent changes to the
      prepared_discards list.
      
      Without this fix, thin_endio() can race with process_discard(), leading
      to concurrent list_add()s that result in the processes locking up with
      an error like the following:
      
      WARNING: at lib/list_debug.c:32 __list_add+0x8f/0xa0()
      ...
      list_add corruption. next->prev should be prev (ffff880323b96140), but was ffff8801d2c48440. (next=ffff8801d2c485c0).
      ...
      Pid: 17205, comm: kworker/u:1 Tainted: G        W  O 3.4.0-rc3.snitm+ #1
      Call Trace:
       [<ffffffff8103ca1f>] warn_slowpath_common+0x7f/0xc0
       [<ffffffff8103cb16>] warn_slowpath_fmt+0x46/0x50
       [<ffffffffa04f6ce6>] ? bio_detain+0xc6/0x210 [dm_thin_pool]
       [<ffffffff8124ff3f>] __list_add+0x8f/0xa0
       [<ffffffffa04f70d2>] process_discard+0x2a2/0x2d0 [dm_thin_pool]
       [<ffffffffa04f6a78>] ? remap_and_issue+0x38/0x50 [dm_thin_pool]
       [<ffffffffa04f7c3b>] process_deferred_bios+0x7b/0x230 [dm_thin_pool]
       [<ffffffffa04f7df0>] ? process_deferred_bios+0x230/0x230 [dm_thin_pool]
       [<ffffffffa04f7e42>] do_worker+0x52/0x60 [dm_thin_pool]
       [<ffffffff81056fa9>] process_one_work+0x129/0x450
       [<ffffffff81059b9c>] worker_thread+0x17c/0x3c0
       [<ffffffff81059a20>] ? manage_workers+0x120/0x120
       [<ffffffff8105eabe>] kthread+0x9e/0xb0
       [<ffffffff814ceda4>] kernel_thread_helper+0x4/0x10
       [<ffffffff8105ea20>] ? kthread_freezable_should_stop+0x70/0x70
       [<ffffffff814ceda0>] ? gs_change+0x13/0x13
      ---[ end trace 7e0a523bc5e52692 ]---
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      c3a0ce2e
    • M
      dm thin: reinstate missing mempool_free in cell_release_singleton · 03aaae7c
      Mike Snitzer 提交于
      Fix a significant memory leak inadvertently introduced during
      simplification of cell_release_singleton() in commit
      6f94a4c4 ("dm thin: fix stacked bi_next
      usage").
      
      A cell's hlist_del() must be accompanied by a mempool_free().
      Use __cell_release() to do this, like before.
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
      03aaae7c
    • S
      gpio/exynos: Fix compiler warnings when non-exynos machines are selected · 2760f7ad
      Sachin Kamat 提交于
      Fixes the following compiler warnings:
      
      drivers/gpio/gpio-samsung.c: In function ‘samsung_gpiolib_init’:
      drivers/gpio/gpio-samsung.c:2980:1: warning: label ‘err_ioremap1’ defined but not used [-Wunused-label]
      drivers/gpio/gpio-samsung.c:2978:1: warning: label ‘err_ioremap2’ defined but not used [-Wunused-label]
      drivers/gpio/gpio-samsung.c:2976:1: warning: label ‘err_ioremap3’ defined but not used [-Wunused-label]
      drivers/gpio/gpio-samsung.c:2974:1: warning: label ‘err_ioremap4’ defined but not used [-Wunused-label]
      drivers/gpio/gpio-samsung.c:2722:55: warning: unused variable ‘gpio_base4’ [-Wunused-variable]
      
      drivers/gpio/gpio-samsung.c:455:32: warning: ‘exynos_gpio_cfg’ defined but not used [-Wunused-variable]
      drivers/gpio/gpio-samsung.c:2126:33: warning: ‘exynos4_gpios_1’ defined but not used [-Wunused-variable]
      drivers/gpio/gpio-samsung.c:2228:33: warning: ‘exynos4_gpios_2’ defined but not used [-Wunused-variable]
      drivers/gpio/gpio-samsung.c:2373:33: warning: ‘exynos4_gpios_3’ defined but not used [-Wunused-variable]
      Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      2760f7ad
    • T
      gpio: pch9: Use proper flow type handlers · df9541a6
      Thomas Gleixner 提交于
      Jean-Francois Dagenais reported:
      
       Configuring a gpio pin with the gpio-pch driver with
       "IRQF_TRIGGER_LOW | IRQF_ONESHOT" generates an interrupt storm for
       threaded ISR until the ISR thread actually gets to physically clear
       the interrupt on the triggering chip!! The immediate observable
       symptom is the high CPU usage for my ISR thread task and the
       interrupt count in /proc/interrupts incrementing radically.
      
      The driver is wrong in several ways:
      
      1) Using handle_simple_irq() does not provide proper flow control
         handling. In the case of oneshot threaded handlers for the
         demultiplexed interrupts this results in an interrupt storm because
         the simple handler does not deal with masking/unmasking.  Even
         without threaded oneshot handlers an interrupt storm for level type
         interrupts can easily be triggered when the interrupt is disabled
         and the interrupt line is activated from the device.
      
      2) Acknowlegding the demultiplexed interrupt before calling the
         handler is wrong for level type interrupts.
      
      3) The set_type function unconditionally enables the interrupt. It's
         supposed to set the type and nothing else. The unmasking is done by
         the core code.
      
      Move the acknowledge code into a separate function and add it to the
      demux irqchip callbacks.
      
      Remove the unconditional enabling from the set_type() callback and set
      the proper flow handlers depending on the selected type (level/edge).
      Reported-and-tested-by: NJean-Francois Dagenais <jeff.dagenais@gmail.com>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      df9541a6
    • L
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 · bcc62fb0
      Linus Torvalds 提交于
      Pull GPIO omap bug fix from Grant Likely.
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        gpio/omap: fix incorrect initialization of omap_gpio_mod_init
      bcc62fb0
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · ec53646f
      Linus Torvalds 提交于
      Pull another powerpc irq fix from Benjamin Herrenschmidt:
       "It looks like my previous fix for the lazy irq masking problem wasn't
        quite enough.  There was another problem related to performance
        monitor interrupts acting as NMIs leaving the flags in an incorrect
        state.  Here's a fix that finally seems to make perf solid again."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/irq: Fix another case of lazy IRQ state getting out of sync
      ec53646f
    • L
      Merge branch '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 04e53358
      Linus Torvalds 提交于
      Pull target fix from Nicholas Bellinger:
       "This patch removes some incorrect legacy code to free se_lun_acl
        memory in the NodeACL release path that could potentially trigger an
        OOPS during shutdown once dynamic -> explicit initiator NodeACL
        conversion has occurred.
      
        That said, we've been able to trigger an OOPS in v4.0 code for this
        special case when the associated MappedLUNs had not also been made
        explicit based on active TPG LUN layout during the conversion, so it
        really makes senses to go ahead and drop this extra cruft to avoid any
        possible issues here.
      
        This ends up only effecting iscsi-target module code (it's the only
        user) and is CC'ed to stable."
      
      * '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: Drop incorrect se_lun_acl release for dynamic -> explict ACL conversion
      04e53358
    • B
      powerpc/irq: Fix another case of lazy IRQ state getting out of sync · 7c0482e3
      Benjamin Herrenschmidt 提交于
      So we have another case of paca->irq_happened getting out of
      sync with the HW irq state. This can happen when a perfmon
      interrupt occurs while soft disabled, as it will return to a
      soft disabled but hard enabled context while leaving a stale
      PACA_IRQ_HARD_DIS flag set.
      
      This patch fixes it, and also adds a test for the condition
      of those flags being out of sync in arch_local_irq_restore()
      when CONFIG_TRACE_IRQFLAGS is enabled.
      
      This helps catching those gremlins faster (and so far I
      can't seem see any anymore, so that's good news).
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      7c0482e3
    • S
      ks8851: Update link status during link change interrupt · 062e55e3
      Stephen Boyd 提交于
      If a link change interrupt comes in we just clear the interrupt
      and continue along without notifying the upper networking layers
      that the link has changed. Use the mii_check_link() function to
      update the link status whenever a link change interrupt occurs.
      
      Cc: Ben Dooks <ben-linux@fluff.org>
      Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      062e55e3
    • B
      macvtap: restore vlan header on user read · f09e2249
      Basil Gor 提交于
      Ethernet vlan header is not on the packet and kept in the skb->vlan_tci
      when it comes from lower dev. This patch inserts vlan header in user
      buffer during skb copy on user read.
      Signed-off-by: NBasil Gor <basil.gor@gmail.com>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f09e2249
    • B
      vhost-net: fix handle_rx buffer size · c53cff5e
      Basil Gor 提交于
      Take vlan header length into account, when vlan id is stored as
      vlan_tci. Otherwise tagged packets coming from macvtap will be
      truncated.
      Signed-off-by: NBasil Gor <basil.gor@gmail.com>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c53cff5e