1. 16 12月, 2011 1 次提交
  2. 15 12月, 2011 3 次提交
  3. 13 12月, 2011 6 次提交
    • E
      sch_gred: should not use GFP_KERNEL while holding a spinlock · 3f1e6d3f
      Eric Dumazet 提交于
      gred_change_vq() is called under sch_tree_lock(sch).
      
      This means a spinlock is held, and we are not allowed to sleep in this
      context.
      
      We might pre-allocate memory using GFP_KERNEL before taking spinlock,
      but this is not suitable for stable material.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3f1e6d3f
    • T
      ipip, sit: copy parms.name after register_netdevice · 72b36015
      Ted Feng 提交于
      Same fix as 731abb9c for ipip and sit tunnel.
      Commit 1c5cae81 removed an explicit call to dev_alloc_name in
      ipip_tunnel_locate and ipip6_tunnel_locate, because register_netdevice
      will now create a valid name, however the tunnel keeps a copy of the
      name in the private parms structure. Fix this by copying the name back
      after register_netdevice has successfully returned.
      
      This shows up if you do a simple tunnel add, followed by a tunnel show:
      
      $ sudo ip tunnel add mode ipip remote 10.2.20.211
      $ ip tunnel
      tunl0: ip/ip  remote any  local any  ttl inherit  nopmtudisc
      tunl%d: ip/ip  remote 10.2.20.211  local any  ttl inherit
      $ sudo ip tunnel add mode sit remote 10.2.20.212
      $ ip tunnel
      sit0: ipv6/ip  remote any  local any  ttl 64  nopmtudisc 6rd-prefix 2002::/16
      sit%d: ioctl 89f8 failed: No such device
      sit%d: ipv6/ip  remote 10.2.20.212  local any  ttl inherit
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NTed Feng <artisdom@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      72b36015
    • L
      ipv6: Fix for adding multicast route for loopback device automatically. · 4af04aba
      Li Wei 提交于
      There is no obvious reason to add a default multicast route for loopback
      devices, otherwise there would be a route entry whose dst.error set to
      -ENETUNREACH that would blocking all multicast packets.
      
      ====================
      
      [ more detailed explanation ]
      
      The problem is that the resulting routing table depends on the sequence
      of interface's initialization and in some situation, that would block all
      muticast packets. Suppose there are two interfaces on my computer
      (lo and eth0), if we initailize 'lo' before 'eth0', the resuting routing
      table(for multicast) would be
      
      # ip -6 route show | grep ff00::
      unreachable ff00::/8 dev lo metric 256 error -101
      ff00::/8 dev eth0 metric 256
      
      When sending multicasting packets, routing subsystem will return the first
      route entry which with a error set to -101(ENETUNREACH).
      
      I know the kernel will set the default ipv6 address for 'lo' when it is up
      and won't set the default multicast route for it, but there is no reason to
      stop 'init' program from setting address for 'lo', and that is exactly what
      systemd did.
      
      I am sure there is something wrong with kernel or systemd, currently I preferred
      kernel caused this problem.
      
      ====================
      Signed-off-by: NLi Wei <lw@cn.fujitsu.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4af04aba
    • R
      ath9k: fix max phy rate at rate control init · 10636bc2
      Rajkumar Manoharan 提交于
      The stations always chooses 1Mbps for all trasmitting frames,
      whenever the AP is configured to lock the supported rates.
      As the max phy rate is always set with the 4th from highest phy rate,
      this assumption might be wrong if we have less than that. Fix that.
      
      Cc: stable@kernel.org
      Cc: Paul Stewart <pstew@google.com>
      Reported-by: NAjay Gummalla <agummalla@google.com>
      Signed-off-by: NRajkumar Manoharan <rmanohar@qca.qualcomm.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      10636bc2
    • D
      nfc: signedness bug in __nci_request() · f8c141c3
      Dan Carpenter 提交于
      wait_for_completion_interruptible_timeout() returns -ERESTARTSYS if
      interrupted so completion_rc needs to be signed.  The current code
      probably returns -ETIMEDOUT if we hit this situation, but after this
      patch is applied it will return -ERESTARTSYS.
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      f8c141c3
    • W
      iwlwifi: do not set the sequence control bit is not needed · 123877b8
      Wey-Yi Guy 提交于
      Check the IEEE80211_TX_CTL_ASSIGN_SEQ flag from mac80211, then decide how to
      set the TX_CMD_FLG_SEQ_CTL_MSK bit. Setting the wrong bit in BAR frame whill
      make the firmware to increment the sequence number which is incorrect and
      cause unknown behavior.
      
      CC: stable@vger.kernel.org #3.0+
      Signed-off-by: NWey-Yi Guy <wey-yi.w.guy@intel.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      123877b8
  4. 10 12月, 2011 1 次提交
  5. 09 12月, 2011 1 次提交
    • H
      ssb: fix init regression with SoCs · 329456d1
      Hauke Mehrtens 提交于
      This fixes a Data bus error on some SoCs. The first fix for this
      problem did not solve it on all devices.
          commit 6ae8ec27
          Author: Rafał Miłecki <zajec5@gmail.com>
          Date:   Tue Jul 5 17:25:32 2011 +0200
              ssb: fix init regression of hostmode PCI core
      
      In ssb_pcicore_fix_sprom_core_index() the sprom on the PCI core is
      accessed, but the sprom only exists when the ssb bus is connected over
      a PCI bus to the rest of the system and not when the SSB Bus is the
      main system bus. SoCs sometimes have a PCI host controller and there
      this code will not be executed, but there are some old SoCs with an PCI
      controller in client mode around and ssb_pcicore_fix_sprom_core_index()
      should not be called on these devices too. The PCI controller on these
      devices are unused, but without this fix it results in an Data bus
      error when it gets initialized.
      
      Cc: Michael Buesch <m@bues.ch>
      Cc: Rafał Miłecki <zajec5@gmail.com>
      Signed-off-by: NHauke Mehrtens <hauke@hauke-m.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      329456d1
  6. 08 12月, 2011 6 次提交
  7. 07 12月, 2011 8 次提交
  8. 06 12月, 2011 14 次提交
    • B
      pasemi_mac: Fix building as module · 65e9d805
      Ben Hutchings 提交于
      Commit ded19add ('pasemic_mac*: Move
      the PA Semi driver') inadvertently split pasemi_mac into two separate
      modules with unresolved symbols.  Change it back into a single module.
      Signed-off-by: NBen Hutchings <ben@decadent.org.uk>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      65e9d805
    • W
      netback: Fix alert message. · 6b84bd16
      Wei Liu 提交于
      The original message in netback_init was 'kthread_run() fails', which should be
      'kthread_create() fails'.
      Signed-off-by: NWei Liu <wei.liu2@citrix.com>
      Acked-by: NIan Campbell <ian.campbell@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6b84bd16
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · 4fb1db33
      Linus Torvalds 提交于
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
        toshiba_acpi: Fix machines that don't support HCI_SYSTEM_EVENT
      4fb1db33
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 45e713ef
      Linus Torvalds 提交于
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        intr_remapping: Fix section mismatch in ir_dev_scope_init()
        intel-iommu: Fix section mismatch in dmar_parse_rmrr_atsr_dev()
        x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions
        x86, AMD: Correct align_va_addr documentation
        x86/rtc, mrst: Don't register a platform RTC device for for Intel MID platforms
        x86/mrst: Battery fixes
        x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
        x86: Fix "Acer Aspire 1" reboot hang
        x86/mtrr: Resolve inconsistency with Intel processor manual
        x86: Document rdmsr_safe restrictions
        x86, microcode: Fix the failure path of microcode update driver init code
        Add TAINT_FIRMWARE_WORKAROUND on MTRR fixup
        x86/mpparse: Account for bus types other than ISA and PCI
        x86, mrst: Change the pmic_gpio device type to IPC
        mrst: Added some platform data for the SFI translations
        x86,mrst: Power control commands update
        x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot
        x86, UV: Fix UV2 hub part number
        x86: Add user_mode_vm check in stack_overflow_check
      45e713ef
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 232ea344
      Linus Torvalds 提交于
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Fix loss of notification with multi-event
        perf, x86: Force IBS LVT offset assignment for family 10h
        perf, x86: Disable PEBS on SandyBridge chips
        trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter
        perf session: Fix crash with invalid CPU list
        perf python: Fix undefined symbol problem
        perf/x86: Enable raw event access to Intel offcore events
        perf: Don't use -ENOSPC for out of PMU resources
        perf: Do not set task_ctx pointer in cpuctx if there are no events in the context
        perf/x86: Fix PEBS instruction unwind
        oprofile, x86: Fix crash when unloading module (nmi timer mode)
        oprofile: Fix crash when unloading module (hr timer mode)
      232ea344
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 40c043b0
      Linus Torvalds 提交于
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clockevents: Set noop handler in clockevents_exchange_device()
        tick-broadcast: Stop active broadcast device when replacing it
        clocksource: Fix bug with max_deferment margin calculation
        rtc: Fix some bugs that allowed accumulating time drift in suspend/resume
        rtc: Disable the alarm in the hardware
      40c043b0
    • L
      Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of... · f14aa871
      Linus Torvalds 提交于
      Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        slab, lockdep: Fix silly bug
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Fix race condition when stopping the irq thread
      f14aa871
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7125face
      Linus Torvalds 提交于
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched, x86: Avoid unnecessary overflow in sched_clock
        sched: Fix buglet in return_cfs_rq_runtime()
        sched: Avoid SMT siblings in select_idle_sibling() if possible
        sched: Set the command name of the idle tasks in SMP kernels
        sched, rt: Provide means of disabling cross-cpu bandwidth sharing
        sched: Document wait_for_completion_*() return values
        sched_fair: Fix a typo in the comment describing update_sd_lb_stats
        sched: Add a comment to effective_load() since it's a pain
      7125face
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 35337c83
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] ap: Setup timer for sending messages after reset.
        [S390] cio: fix chsc_chp_vary
        [S390] cio: provide fake irb for transport mode IO
        [S390] cio: disallow driver io for known to be broken paths
        [S390] hibernate: directly trigger subchannel evaluation
        [S390] remove reset of system call restart on psw changes
        [S390] add missing .set function for NT_S390_LAST_BREAK regset
        [S390] fix page change underindication in pgste_update_all
        [S390] ptrace inferior call interactions with TIF_SYSCALL
        [S390] kdump: Replace is_kdump_kernel() with OLDMEM_BASE check
      35337c83
    • F
      r8169: fix Rx index race between FIFO overflow recovery and NAPI handler. · c7c2c39b
      françois romieu 提交于
      Since 92fc43b4, rtl8169_tx_timeout ends up
      resetting Rx and Tx indexes and thus racing with the NAPI handler via
      -> rtl8169_hw_reset
         -> rtl_hw_reset
            -> rtl8169_init_ring_indexes
      
      What about returning to the original state ?
      
      rtl_hw_reset is only used by rtl8169_hw_reset and rtl8169_init_one.
      
      The latter does not need rtl8169_init_ring_indexes because the indexes
      still contain their original values from the newly allocated network
      device private data area (i.e. 0).
      
      rtl8169_hw_reset is used by:
      1. rtl8169_down
         Helper for rtl8169_close. rtl8169_open explicitely inits the indexes
         anyway.
      2. rtl8169_pcierr_interrupt
         Indexes are set by rtl8169_reinit_task.
      3. rtl8169_interrupt
         rtl8169_hw_reset is needed when the device goes down. See 1.
      4. rtl_shutdown
         System shutdown handler. Indexes are irrelevant.
      5. rtl8169_reset_task
         Indexes must be set before rtl_hw_start is called.
      6. rtl8169_tx_timeout
         Indexes should not be set. This is the job of rtl8169_reset_task anyway.
      
      The removal of rtl8169_hw_reset in rtl8169_tx_timeout and its move in
      rtl8169_reset_task do not change the analysis.
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Cc: hayeswang <hayeswang@realtek.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c7c2c39b
    • F
      r8169: Rx FIFO overflow fixes. · 811fd301
      françois romieu 提交于
      Realtek has specified that the post 8168c gigabit chips and the post
      8105e fast ethernet chips recover automatically from a Rx FIFO overflow.
      The driver does not need to clear the RxFIFOOver bit of IntrStatus and
      it should rather avoid messing it.
      
      The implementation deserves some explanation:
      1. events outside of the intr_event bit mask are now ignored. It enforces
         a no-processing policy for the events that either should not be there
         or should be ignored.
      
      2. RxFIFOOver was already ignored in rtl_cfg_infos[RTL_CFG_1] for the
         whole 8168 line of chips with two exceptions:
         - RTL_GIGA_MAC_VER_22 since b5ba6d12
           ("use RxFIFO overflow workaround for 8168c chipset.").
           This one should now be correctly handled.
         - RTL_GIGA_MAC_VER_11 (8168b) which requires a different Rx FIFO
           overflow processing.
      
         Though it does not conform to Realtek suggestion above, the updated
         driver includes no change for RTL_GIGA_MAC_VER_12 and RTL_GIGA_MAC_VER_17.
         Both are 8168b. RTL_GIGA_MAC_VER_12 is common and a bit old so I'd rather
         wait for experimental evidence that the change suggested by Realtek really
         helps or does not hurt in unexpected ways.
      
         Removed case statements in rtl8169_interrupt are only 8168 relevant.
      
      3. RxFIFOOver is masked for post 8105e 810x chips, namely the sole 8105e
         (RTL_GIGA_MAC_VER_30) itself.
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Cc: hayeswang <hayeswang@realtek.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      811fd301
    • L
      gpio: fix a build failure on KS8695 GPIO · 8c9b0434
      Linus Walleij 提交于
      I screwed up by compiling that driver for the machine rather
      than the arch. Correcting this fixes the build error.
      
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Reported-by: NMike Frysinger <vapier@gentoo.org>
      Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8c9b0434
    • S
      ftrace: Fix hash record accounting bug · ddf6e0e5
      Steven Rostedt 提交于
      If the set_ftrace_filter is cleared by writing just whitespace to
      it, then the filter hash refcounts will be decremented but not
      updated. This causes two bugs:
      
      1) No functions will be enabled for tracing when they all should be
      
      2) If the users clears the set_ftrace_filter twice, it will crash ftrace:
      
      ------------[ cut here ]------------
      WARNING: at /home/rostedt/work/git/linux-trace.git/kernel/trace/ftrace.c:1384 __ftrace_hash_rec_update.part.27+0x157/0x1a7()
      Modules linked in:
      Pid: 2330, comm: bash Not tainted 3.1.0-test+ #32
      Call Trace:
       [<ffffffff81051828>] warn_slowpath_common+0x83/0x9b
       [<ffffffff8105185a>] warn_slowpath_null+0x1a/0x1c
       [<ffffffff810ba362>] __ftrace_hash_rec_update.part.27+0x157/0x1a7
       [<ffffffff810ba6e8>] ? ftrace_regex_release+0xa7/0x10f
       [<ffffffff8111bdfe>] ? kfree+0xe5/0x115
       [<ffffffff810ba51e>] ftrace_hash_move+0x2e/0x151
       [<ffffffff810ba6fb>] ftrace_regex_release+0xba/0x10f
       [<ffffffff8112e49a>] fput+0xfd/0x1c2
       [<ffffffff8112b54c>] filp_close+0x6d/0x78
       [<ffffffff8113a92d>] sys_dup3+0x197/0x1c1
       [<ffffffff8113a9a6>] sys_dup2+0x4f/0x54
       [<ffffffff8150cac2>] system_call_fastpath+0x16/0x1b
      ---[ end trace 77a3a7ee73794a02 ]---
      
      Link: http://lkml.kernel.org/r/20111101141420.GA4918@debianReported-by: NRabin Vincent <rabin@rab.in>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      ddf6e0e5
    • S
      perf: Fix parsing of __print_flags() in TP_printk() · d06c27b2
      Steven Rostedt 提交于
      A update is made to the sched:sched_switch event that adds some
      logic to the first parameter of the __print_flags() that shows the
      state of tasks. This change cause perf to fail parsing the flags.
      
      A simple fix is needed to have the parser be able to process ops
      within the argument.
      
      Cc: stable@vger.kernel.org
      Reported-by: NAndrew Vagin <avagin@openvz.org>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      d06c27b2
新手
引导
客服 返回
顶部