1. 19 10月, 2010 1 次提交
  2. 14 10月, 2010 11 次提交
  3. 13 10月, 2010 5 次提交
    • R
      ARM: relax ioremap prohibition (309caa9c) for -final and -stable · 06c10884
      Russell King 提交于
      ... but produce a big warning about the problem as encouragement
      for people to fix their drivers.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      06c10884
    • R
    • M
      ARM: 6440/1: ep93xx: DMA: fix channel_disable · 10d48b39
      Mika Westerberg 提交于
      When channel_disable() is called, it disables per channel interrupts and
      waits until channels state becomes STATE_STALL, and then disables the
      channel. Now, if the DMA transfer is disabled while the channel is in
      STATE_NEXT we will not wait anything and disable the channel immediately.
      This seems to cause weird data corruption for example in audio transfers.
      
      Fix is to wait while we are in STATE_NEXT or STATE_ON and only then
      disable the channel.
      Signed-off-by: NMika Westerberg <mika.westerberg@iki.fi>
      Acked-by: NRyan Mallon <ryan@bluewatersys.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      10d48b39
    • L
      Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 0acc1b2a
      Linus Torvalds 提交于
      * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: x86: Move TSC reset out of vmcb_init
        KVM: x86: Fix SVM VMCB reset
      0acc1b2a
    • S
      ring-buffer: Fix typo of time extends per page · d0134324
      Steven Rostedt 提交于
      Time stamps for the ring buffer are created by the difference between
      two events. Each page of the ring buffer holds a full 64 bit timestamp.
      Each event has a 27 bit delta stamp from the last event. The unit of time
      is nanoseconds, so 27 bits can hold ~134 milliseconds. If two events
      happen more than 134 milliseconds apart, a time extend is inserted
      to add more bits for the delta. The time extend has 59 bits, which
      is good for ~18 years.
      
      Currently the time extend is committed separately from the event.
      If an event is discarded before it is committed, due to filtering,
      the time extend still exists. If all events are being filtered, then
      after ~134 milliseconds a new time extend will be added to the buffer.
      
      This can only happen till the end of the page. Since each page holds
      a full timestamp, there is no reason to add a time extend to the
      beginning of a page. Time extends can only fill a page that has actual
      data at the beginning, so there is no fear that time extends will fill
      more than a page without any data.
      
      When reading an event, a loop is made to skip over time extends
      since they are only used to maintain the time stamp and are never
      given to the caller. As a paranoid check to prevent the loop running
      forever, with the knowledge that time extends may only fill a page,
      a check is made that tests the iteration of the loop, and if the
      iteration is more than the number of time extends that can fit in a page
      a warning is printed and the ring buffer is disabled (all of ftrace
      is also disabled with it).
      
      There is another event type that is called a TIMESTAMP which can
      hold 64 bits of data in the theoretical case that two events happen
      18 years apart. This code has not been implemented, but the name
      of this event exists, as well as the structure for it. The
      size of a TIMESTAMP is 16 bytes, where as a time extend is only
      8 bytes. The macro used to calculate how many time extends can fit on
      a page used the TIMESTAMP size instead of the time extend size
      cutting the amount in half.
      
      The following test case can easily trigger the warning since we only
      need to have half the page filled with time extends to trigger the
      warning:
      
       # cd /sys/kernel/debug/tracing/
       # echo function > current_tracer
       # echo 'common_pid < 0' > events/ftrace/function/filter
       # echo > trace
       # echo 1 > trace_marker
       # sleep 120
       # cat trace
      
      Enabling the function tracer and then setting the filter to only trace
      functions where the process id is negative (no events), then clearing
      the trace buffer to ensure that we have nothing in the buffer,
      then write to trace_marker to add an event to the beginning of a page,
      sleep for 2 minutes (only 35 seconds is probably needed, but this
      guarantees the bug), and then finally reading the trace which will
      trigger the bug.
      
      This patch fixes the typo and prevents the false positive of that warning.
      Reported-by: NHans J. Koch <hjk@linutronix.de>
      Tested-by: NHans J. Koch <hjk@linutronix.de>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Stable Kernel <stable@kernel.org>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      d0134324
  4. 12 10月, 2010 13 次提交
  5. 11 10月, 2010 7 次提交
  6. 10 10月, 2010 3 次提交
    • K
      kbuild: fix oldnoconfig to do the right thing · e9203c98
      Kyle McMartin 提交于
      Commit 861b4ea4 broke oldnoconfig when removed the oldnoconfig checks on
                             if (input_mode == nonint_oldconfig ||
                                 input_mode == oldnoconfig) {
                                     if (input_mode == nonint_oldconfig &&
                                         sym->name &&
                                          !sym_is_choice_value(sym)) {
      to avoid oldnoconfig chugging through the else stanza.
      
      Fix that to restore expected behaviour (which I've confirmed in the
      Fedora kernel build that the configs end up looking the same.)
      Signed-off-by: NKyle McMartin <kyle@redhat.com>
      Acked-by: NSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NMichal Marek <mmarek@suse.cz>
      e9203c98
    • M
      kconfig: Temporarily disable dependency warnings · 71ebc01d
      Michal Marek 提交于
      After fixing a use-after-free bug in kconfig, a 'make defconfig' or
      'make allmodconfig' fills the screen with warnings that were not
      detected before. Given that we are close to the release now, disable the
      warnings temporarily and deal with them after 2.6.36.
      Signed-off-by: NMichal Marek <mmarek@suse.cz>
      71ebc01d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 85a33188
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
        net: clear heap allocation for ETHTOOL_GRXCLSRLALL
        isdn: strcpy() => strlcpy()
        Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"
        mac80211: delete AddBA response timer
        ath9k_hw: fix regression in ANI listen time calculation
        caif: fix two caif_connect() bugs
        bonding: fix WARN_ON when writing to bond_master sysfs file
        skge: add quirk to limit DMA
        MAINTAINERS: update Intel LAN Ethernet info
        e1000e.txt: Add e1000e documentation
        e1000.txt: Update e1000 documentation
        ixgbevf.txt: Update ixgbevf documentation
        cls_u32: signedness bug
        Bluetooth: Disallow to change L2CAP_OPTIONS values when connected
        sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac()
        sctp: prevent reading out-of-bounds memory
        ipv4: correct IGMP behavior on v3 query during v2-compatibility mode
        netdev: Depend on INET before selecting INET_LRO
        Revert "ipv4: Make INET_LRO a bool instead of tristate."
        net: Fix the condition passed to sk_wait_event()
        ...
      85a33188