Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.33-rc1-gi…
Commits on Dec 21, 2009
  1. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_cmd64x: fix overclocking of UDMA0-2 modes
      Revert "pata_cmd64x: implement serialization as per notes"
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      bnx2: Fix bnx2_netif_stop() merge error.
      gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC
      gianfar: Fix stats support
      gianfar: Fix a filer bug
      bnx2: fixing a timout error due not refreshing TX timers correctly
      can/at91: don't check platform_get_irq's return value against zero
      mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion
      bnx2: reset_task is crashing the kernel. Fixing it.
      ipv6: fix an oops when force unload ipv6 module
      TI DaVinci EMAC: Fix MDIO bus frequency configuration
      e100: Fix broken cbs accounting due to missing memset.
      broadcom: bcm54xx_shadow_read() errors ignored in bcm54xx_adjust_rxrefclk()
      e1000e: LED settings in EEPROM ignored on 82571 and 82572
      netxen: use module parameter correctly
      netns: fix net.ipv6.route.gc_min_interval_ms in netns
      Bluetooth: Prevent ill-timed autosuspend in USB driver
      Bluetooth: Fix L2CAP locking scheme regression
      Bluetooth: Ack L2CAP I-frames before retransmit missing packet
      Bluetooth: Fix unset of RemoteBusy flag for L2CAP
      Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()
  3. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …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 hotplug hang
      sched: Restore printk sanity
  4. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (24 commits)
      ALSA: sbawe: fix memory detection
      ALSA: fix incorrect rounding direction in snd_interval_ratnum()
      ALSA: HDA: add powersaving hook for Realtek
      ALSA: HDA: remove useless mixers on Aspire 8930G
      ALSA: HDA: simplify Aspire 8930G verb array
      ALSA: hda: Set Front Mic to input vref 50% for Lenovo 3000 Y410
      ALSA: hda/realtek: Remove extra .capsrc_nids initialization for ALC889_INTEL
      ALSA: Use kzalloc for allocating only one thing
      ALSA: AACI: switch to per-pcm locking
      ALSA: AACI: add double-rate support
      ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params
      ALSA: AACI: cleanup aaci_pcm_hw_params
      ALSA: AACI: simplify codec rate information
      ALSA: aaci - Fix a typo
      ASoC: wm8974: fix a wrong bit definition
      sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer
      ALSA: hda - Fix quirk for Maxdata obook4-1
      ALSA: hda - Fix missing capsrc_nids for ALC88x
      ALSA: hda - Make use of beep device found in Dell Vostro 1015n
      ALSA: hda - Fixed internal mic initialization for Dell Vostro 1015
      ...
  5. @tiwai
  6. @tiwai
  7. @tiwai
  8. @tiwai

    ALSA: sbawe: fix memory detection

    Krzysztof Helt authored tiwai committed
    Memory amount is increased before a successful write-read
    sequence is done. Thus, 512 kB of onboard memory is detected
    on memoryless cards like SB32.
    
    Move the increasing of memory counter after successful read
    is done.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  9. @tiwai

    ALSA: fix incorrect rounding direction in snd_interval_ratnum()

    Krzysztof Helt authored tiwai committed
    The direction of rounding is incorrect in the snd_interval_ratnum()
    It was detected with following parameters (sb8 driver playing
    8kHz stereo file):
     - num is always 1000000
     - requested frequency rate is from 7999 to 7999 (single frequency)
    
    The first loop calculates div_down(num, freq->min) which is 125.
    Thus, a frequency range's minimum value is 1000000 / 125 = 8000 Hz.
    The second loop calculates div_up(num, freq->max) which is 126
    The frequency range's maximum value is 1000000 / 126 = 7936 Hz.
    The range maximum is lower than the range minimum so the function
    fails due to empty result range.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  10. @tiwai
  11. @marcan @tiwai

    ALSA: HDA: add powersaving hook for Realtek

    marcan authored tiwai committed
    The current Realtek code makes no specific provision for turning stuff
    off. The codec chip is placed into low-power mode generically, but this
    doesn't turn off any external hardware connected to it, in particular
    external amplifiers.
    
    This patch creates a hook function that is called by the codec
    suspend/resume functions. It ought to disable any external hardware in a
    device-specific way. I've implemented a generic ALC889 function that
    sets the EAPD pin properly, and used it for the Acer Aspire 8930G which
    can benefit from this feature.
    
    On my laptop, this results in ~0.5W extra savings.
    
    Signed-off-by: Hector Martin <hector@marcansoft.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  12. @marcan @tiwai

    ALSA: HDA: remove useless mixers on Aspire 8930G

    marcan authored tiwai committed
    This patch removes some extra mixers that do nothing on the Acer Aspire
    8930G.
    
    The CD mixer is useless because the SATA DVD/Blu-Ray drive has no analog
    audio output, and the Side mixer is useless because we max out at 6ch
    anyway.
    
    Signed-off-by: Hector Martin <hector@marcansoft.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  13. @marcan @tiwai

    ALSA: HDA: simplify Aspire 8930G verb array

    marcan authored tiwai committed
    This patch just simplifies the 8930G verb array a bit. Just use the
    common ALC889 EAPD verb array to make things more consistent. The file
    is already huge enough already.
    
    Signed-off-by: Hector Martin <hector@marcansoft.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  14. @crimsun @tiwai

    ALSA: hda: Set Front Mic to input vref 50% for Lenovo 3000 Y410

    crimsun authored tiwai committed
    BugLink: https://bugs.launchpad.net/bugs/479373
    
    The OR has verified with hda-verb that the internal microphone needs
    VREF50 set for audible capture.
    
    Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  15. @torvalds

    nfsd: fix "insecure" export option

    J. Bruce Fields authored torvalds committed
    A typo in 12045a6 "nfsd: let "insecure" flag vary by
    pseudoflavor" reversed the sense of the "insecure" flag.
    
    Reported-by: Michael Guntsche <mike@it-loops.com>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @davem330

    bnx2: Fix bnx2_netif_stop() merge error.

    Michael Chan authored davem330 committed
    The error was introduced while merging:
    
    commit 4529819
    bnx2: reset_task is crashing the kernel. Fixing it.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>k
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Dec 20, 2009
  1. sched: Fix hotplug hang

    Peter Zijlstra authored Ingo Molnar committed
    The hot-unplug kstopmachine usage does a wakeup after
    deactivating the cpu, hence we cannot use cpu_active()
    here but must rely on the good olde online.
    
    Reported-by: Sachin Sant <sachinp@in.ibm.com>
    Reported-by: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Tested-by: Jens Axboe <jens.axboe@oracle.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    LKML-Reference: <1261326987.4314.24.camel@laptop>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  2. @bzolnier

    pata_cmd64x: fix overclocking of UDMA0-2 modes

    bzolnier authored Jeff Garzik committed
    adev->dma_mode stores the transfer mode value not UDMA mode number
    so the condition in cmd64x_set_dmamode() is always true and the higher
    UDMA clock is always selected.  This can potentially result in data
    corruption when UDMA33 device is used, when 40-wire cable is used or
    when the error recovery code decides to lower the device speed down.
    
    The issue was introduced in the commit 6a40da0 ("libata cmd64x: whack
    into a shape that looks like the documentation") which goes back to
    kernel 2.6.20.
    
    Cc: stable@kernel.org
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  3. Revert "pata_cmd64x: implement serialization as per notes"

    Jeff Garzik authored Jeff Garzik committed
    This reverts commit d437443, because
    it breaks the boot on several machines (mostly sparc64, at present).
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  4. sched: Restore printk sanity

    Peter Zijlstra authored Ingo Molnar committed
    Revert the braindead pr_* crap. (Commit 663997d "sched: Use
    pr_fmt() and pr_<level>()")
    
    It's dumb and causes stupid "sched: " strings all over the place.
    
    Signed-off-by: Peter Zijlstra <peterz@infradead.org>
    Acked-by: Mike Galbraith <efault@gmx.de>
    Cc: Joe Perches <joe@perches.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    LKML-Reference: <1261315437.4314.6.camel@laptop>
    [ i dont mind the pr_*() patterns that much - but Peter dislikes them with a vengence. ]
    [ - v2: remove spurious diffstat from changelog :-/ ]
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  5. @perexg

    ALSA: hda/realtek: Remove extra .capsrc_nids initialization for ALC88…

    perexg authored
    …9_INTEL
    
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
  6. @perexg

    Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/g…

    perexg authored
    …it/tiwai/sound-2.6 into fixes
Commits on Dec 19, 2009
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mattst88/alpha-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
      alpha: Convert BUG() to use unreachable()
      alpha: Add minimal support for software performance events
      alpha: Wire up missing/new syscalls
  2. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      sata_mv: remove pointless NULL test
      pata_hpt3x2n: fix clock turnaround
      libata: fix reporting of drained bytes when clearing DRQ
      sata_mv: add power management support for the PCI controllers.
      sata_mv: store the board_idx into the host private data
      pata_octeon_cf: use resource_size(), to fix resource sizing bug
      libata: use the WRITE_SAME_16 define
      sata_mv: move the PCI bar description initialization code
      sata_mv: add power management support for the platform driver
      sata_mv: support clkdev framework
      sata_mv: increase PIO IORDY timeout
    
    Fixed crazy mode-change in merge.
  3. @torvalds

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/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 session: Make events_stats u64 to avoid overflow on 32-bit arches
      hw-breakpoints: Fix hardware breakpoints -> perf events dependency
      perf events: Dont report side-band events on each cpu for per-task-per-cpu events
      perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
      perf events, x86/stacktrace: Make stack walking optional
      perf events: Remove unused perf_counter.h header file
      perf probe: Check new event name
      kprobe-tracer: Check new event/group name
      perf probe: Check whether debugfs path is correct
      perf probe: Fix libdwarf include path for Debian
  4. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/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, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system
      Makefile: Unexport LC_ALL instead of clearing it
      x86: Fix objdump version check in arch/x86/tools/chkobjdump.awk
      x86: Reenable TSC sync check at boot, even with NONSTOP_TSC
      x86: Don't use POSIX character classes in gen-insn-attr-x86.awk
      Makefile: set LC_CTYPE, LC_COLLATE, LC_NUMERIC to C
      x86: Increase MAX_EARLY_RES; insufficient on 32-bit NUMA
      x86: Fix checking of SRAT when node 0 ram is not from 0
      x86, cpuid: Add "volatile" to asm in native_cpuid()
      x86, msr: msrs_alloc/free for CONFIG_SMP=n
      x86, amd: Get multi-node CPU info from NodeId MSR instead of PCI config space
      x86: Add IA32_TSC_AUX MSR and use it
      x86, msr/cpuid: Register enough minors for the MSR and CPUID drivers
      initramfs: add missing decompressor error check
      bzip2: Add missing checks for malloc returning NULL
      bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure
  5. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …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: (25 commits)
      sched: Fix broken assertion
      sched: Assert task state bits at build time
      sched: Update task_state_arraypwith new states
      sched: Add missing state chars to TASK_STATE_TO_CHAR_STR
      sched: Move TASK_STATE_TO_CHAR_STR near the TASK_state bits
      sched: Teach might_sleep() about preemptible RCU
      sched: Make warning less noisy
      sched: Simplify set_task_cpu()
      sched: Remove the cfs_rq dependency from set_task_cpu()
      sched: Add pre and post wakeup hooks
      sched: Move kthread_bind() back to kthread.c
      sched: Fix select_task_rq() vs hotplug issues
      sched: Fix sched_exec() balancing
      sched: Ensure set_task_cpu() is never called on blocked tasks
      sched: Use TASK_WAKING for fork wakups
      sched: Select_task_rq_fair() must honour SD_LOAD_BALANCE
      sched: Fix task_hot() test order
      sched: Fix set_cpu_active() in cpu_down()
      sched: Mark boot-cpu active before smp_init()
      sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
      ...
  6. @torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sys: Fix missing rcu protection for __task_cred() access
      signals: Fix more rcu assumptions
      signal: Fix racy access to __task_cred in kill_pid_info_as_uid()
  7. @torvalds

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    torvalds authored
    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      timers: Remove duplicate setting of new_base in __mod_timer()
      clockevents: Prevent clockevent_devices list corruption on cpu hotplug
  8. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] Use strim instead of strstrip to avoid false warnings.
      [S390] qdio: add counter for input queue full condition
      [S390] qdio: remove superfluous log entries and WARN_ONs.
      [S390] ptrace: dont abuse PT_PTRACED
      [S390] cio: fix channel path vary
      [S390] drivers: Correct size given to memset
      [S390] tape: Add pr_fmt() macro to all tape source files
      [S390] rename NT_PRXSTATUS to NT_S390_HIGHREGS
      [S390] tty: PTR_ERR return of wrong pointer in fs3270_open()
      [S390] s390: PTR_ERR return of wrong pointer in fallback_init_cip()
      [S390] dasd: PTR_ERR return of wrong pointer in
      [S390] dasd: move dasd-diag kmsg to dasd
      [S390] cio: fix drvdata usage for the console subchannel
      [S390] wire up sys_recvmmsg
  9. @torvalds

    fix more leaks in audit_tree.c tag_chunk()

    Al Viro authored torvalds committed
    Several leaks in audit_tree didn't get caught by commit
    318b6d3, including the leak on normal
    exit in case of multiple rules refering to the same chunk.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @torvalds

    fix braindamage in audit_tree.c untag_chunk()

    Al Viro authored torvalds committed
    ... aka "Al had badly fscked up when writing that thing and nobody
    noticed until Eric had fixed leaks that used to mask the breakage".
    
    The function essentially creates a copy of old array sans one element
    and replaces the references to elements of original (they are on cyclic
    lists) with those to corresponding elements of new one.  After that the
    old one is fair game for freeing.
    
    First of all, there's a dumb braino: when we get to list_replace_init we
    use indices for wrong arrays - position in new one with the old array
    and vice versa.
    
    Another bug is more subtle - termination condition is wrong if the
    element to be excluded happens to be the last one.  We shouldn't go
    until we fill the new array, we should go until we'd finished the old
    one.  Otherwise the element we are trying to kill will remain on the
    cyclic lists...
    
    That crap used to be masked by several leaks, so it was not quite
    trivial to hit.  Eric had fixed some of those leaks a while ago and the
    shit had hit the fan...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @JuliaLawall @tiwai

    ALSA: Use kzalloc for allocating only one thing

    JuliaLawall authored tiwai committed
    Use kzalloc rather than kcalloc(1,...)
    
    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    @@
    
    - kcalloc(1,
    + kzalloc(
              ...)
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  12. @davem330

    gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC

    Sandeep Gopalpet authored davem330 committed
    Signed-off-by: Sandeep Gopalpet <Sandeep.Kumar@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. @davem330

    gianfar: Fix stats support

    Sandeep Gopalpet authored davem330 committed
    This patch updates the per rx/tx queue stats.
    To update the per rx queue stats a new structure has been
    introduced rx_q_stats.
    The per tx queue stats are updated via the netdev_queue
    structure itself.
    
    Note that we update only the tx_packtes, tx_bytes, rx_packets,
    rx_bytes and rx_dropped stats on a per queue basis.
    
    Signed-off-by: Sandeep Gopalpet <Sandeep.Kumar@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.