1. 30 Dec, 2009 4 commits
    • Li Zefan's avatar
      ksym_tracer: Remove trace_stat · 53ab6680
      Li Zefan authored
      
      
      trace_stat is problematic. Don't use it, use seqfile instead.
      
      This fixes a race that reading the stat file is not protected by
      any lock, which can lead to use after free.
      
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <4B3AF203.40200@cn.fujitsu.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      53ab6680
    • Li Zefan's avatar
      ksym_tracer: Fix race when incrementing count · e6d9491b
      Li Zefan authored
      
      
      We are under rcu read section but not holding the write lock, so
      count++ is not atomic. Use atomic64_t instead.
      
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <4B3AF1EC.9010608@cn.fujitsu.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      e6d9491b
    • Li Zefan's avatar
      ksym_tracer: Fix to allow writing newline to ksym_trace_filter · 3d13ec2e
      Li Zefan authored
      It used to work, but now doesn't:
      
       # echo > ksym_filter
       bash: echo: write error: Invalid argument
      
      It's caused by d954fbf0
      
      
      ("tracing: Fix wrong usage of strstrip in trace_ksyms").
      
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <4B3AF1D7.5040400@cn.fujitsu.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      3d13ec2e
    • Li Zefan's avatar
      ksym_tracer: Fix to make the tracer work · 88f7a890
      Li Zefan authored
      
      
      ksym tracer doesn't work:
      
       # echo tasklist_lock:rw- > ksym_trace_filter
       -bash: echo: write error: No such device
      
      It's because we pass to perf_event_create_kernel_counter()
      a cpu number which is not present.
      
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <4B3AF19E.1010201@cn.fujitsu.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      88f7a890
  2. 28 Dec, 2009 1 commit
  3. 22 Dec, 2009 1 commit
  4. 20 Dec, 2009 3 commits
  5. 15 Dec, 2009 1 commit
  6. 14 Dec, 2009 2 commits
  7. 13 Dec, 2009 14 commits
  8. 12 Dec, 2009 14 commits
    • Linus Torvalds's avatar
      Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 · f4054253
      Linus Torvalds authored
      * 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
        IXP4xx: GTWX5715 platform only has two PCI IRQ lines, not four.
        IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files.
        IXP4xx: move Gemtek GTWX5715 platform macros to the platform code.
        IXP4xx: Remove unused Motorola PrPMC1100 platform macros.
        IXP4xx: move FSG platform macros to the platform code.
        IXP4xx: move DSM G600 platform macros to the platform code.
        IXP4xx: move NAS100D platform macros to the platform code.
        IXP4xx: move NSLU2 platform macros to the platform code.
        IXP4xx: move Coyote platform macros to the platform code.
        IXP4xx: move AVILA platform macros to the platform code.
        IXP4xx: move IXDP425 platform macros to the platform code.
        IXP4xx: Extend PCI MMIO indirect address space to 1 GB.
        IXP4xx: Fix compilation failure with CONFIG_IXP4XX_INDIRECT_PCI.
        IXP4xx: Drop "__ixp4xx_" prefix from in/out/ioread/iowrite functions for clarity.
        IXP4xx: Rename indirect MMIO primitives from __ixp4xx_* to __indirect_*.
        IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request().
        ARM: fix insl() and outsl() endianness on IXP4xx architecture.
        IXP4xx: Fix normally-disabled debugging text in drivers/net/arm/ixp4xx_eth.c.
        IXP4xx: change the timer base frequency to 66.666000 MHz.
      f4054253
    • Linus Torvalds's avatar
      [BKL] add 'might_sleep()' to the outermost lock taker · f01eb364
      Linus Torvalds authored
      As shown by the previous patch (6698e347
      
      : "tty: Fix BKL taken under a
      spinlock bug introduced in the BKL split") the BKL removal is prone to
      some subtle issues, where removing the BKL in one place may in fact make
      a previously nested BKL call the new outer call, and then prone to nasty
      deadlocks with other spinlocks.
      
      In general, we should never take the BKL while we're holding a spinlock,
      so let's just add a "might_sleep()" to it (even though the BKL doesn't
      technically sleep - at least not yet), and we'll get nice warnings the
      next time this kind of problem happens during BKL removal.
      
      Acked-and-Tested-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f01eb364
    • Alan Cox's avatar
      tty: Fix BKL taken under a spinlock bug introduced in the BKL split · 6698e347
      Alan Cox authored
      
      
      The fasync path takes the BKL (it probably doesn't need to in fact)
      while holding the file_list spinlock.  You can't do that with the kernel
      lock: it causes lock inversions and deadlocks.
      
      Leave the BKL over that bit for the moment.
      
      Identified by AKPM.
      
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Acked-and-Tested-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6698e347
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 09cea96c
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
        powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
        MAINTAINERS: Add PowerPC patterns
        powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
        powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
        powerpc: Make "intspec" pointers in irq_host->xlate() const
        powerpc/8xx: DTLB Miss cleanup
        powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
        powerpc/8xx: Start using dcbX instructions in various copy routines
        powerpc/8xx: Restore _PAGE_WRITETHRU
        powerpc/8xx: Add missing Guarded setting in DTLB Error.
        powerpc/8xx: Fixup DAR from buggy dcbX instructions.
        powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
        powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
        powerpc/8xx: Invalidate non present TLBs
        powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
        pseries/pseries: Add code to online/offline CPUs of a DLPAR node
        powerpc: stop_this_cpu: remove the cpu from the online map.
        powerpc/pseries: Add kernel based CPU DLPAR handling
        sysfs/cpu: Add probe/release files
        powerpc/pseries: Kernel DLPAR Infrastructure
        ...
      09cea96c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 6eb7365d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Overwrite pin config on intel DG45ID board.
        intelhdmi - dont power off HDA link
        ALSA: hrtimer - Fix lock-up
        ALSA: intelhdmi - add channel mapping for typical configurations
        ALSA: intelhdmi - channel mapping applies to Pin
        ALSA: intelhdmi - accept DisplayPort pin
        ALSA: hda - show HBR(High Bit Rate) pin cap in procfs
        ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs
        ASoC: Fix build of OMAP sound drivers
        ALSA: opti93x: fix irq releasing if the irq cannot be allocated
      6eb7365d
    • Linus Torvalds's avatar
      Merge branch 'omap-for-linus' of... · 9c3936cb
      Linus Torvalds authored
      Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (75 commits)
        omap3: Fix OMAP35XX_REV macros
        omap: serial: fix non-empty uart fifo read abort
        omap3: Zoom2/3: Update hsmmc board config params
        omap3 : Enable TWL4030 Keypad for Zoom2 and Zoom3 boards
        omap3: id code detection 3525 vs 3515
        omap3: rx51: Use wl1251 in SPI mode 3
        omap3: zoom2/3: make MMC slot work again
        omap1: htcherald: Update defconfig to include mux support
        omap1: LCD_DMA: Use some define rather than a hexadecimal
        omap: header: remove unused data-type
        omap: arch/arm/plat-omap/devices.c - sort alphabetically
        omap: Correcting GPMC_CONFIG1_DEVICETYPE_NAND
        OMAP3: serial - allow platforms specify which UARTs to initialize
        omap3: cm-t35: add mux initialization
        OMAP4: Sync up omap4430 defconfig
        OMAP4: Remove the secondary wait loop
        OMAP4: AuxCoreBoot registers only accessible in secure mode
        OMAP4: Fix SRAM base and size
        OMAP4: Fix cpu detection
        omap3: pandora: board file updates for .33
        ...
      9c3936cb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 5de76b18
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        be2net: fix error in rx completion processing.
        igbvf: avoid reset storms due to mailbox issues
        igb: fix handling of mailbox collisions between PF/VF
        usb: remove rare pm primitive for conversion to new API
      5de76b18
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 8d0e7fb9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slab, kmemleak: pass the correct pointer to kmemleak_erase()
        slab, kmemleak: stop calling kmemleak_erase() unconditionally
        SLAB: Fix unlikely() annotation in __cache_alloc_node()
        SLAB: Fix lockdep annotations for CPU hotplug
        SLUB: Fix __GFP_ZERO unlikely() annotation
        slub: allow stats to be cleared
      8d0e7fb9
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · 702a7c76
      Linus Torvalds authored
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/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: (21 commits)
        sched: Remove forced2_migrations stats
        sched: Fix memory leak in two error corner cases
        sched: Fix build warning in get_update_sysctl_factor()
        sched: Update normalized values on user updates via proc
        sched: Make tunable scaling style configurable
        sched: Fix missing sched tunable recalculation on cpu add/remove
        sched: Fix task priority bug
        sched: cgroup: Implement different treatment for idle shares
        sched: Remove unnecessary RCU exclusion
        sched: Discard some old bits
        sched: Clean up check_preempt_wakeup()
        sched: Move update_curr() in check_preempt_wakeup() to avoid redundant call
        sched: Sanitize fork() handling
        sched: Clean up ttwu() rq locking
        sched: Remove rq->clock coupling from set_task_cpu()
        sched: Consolidate select_task_rq() callers
        sched: Remove sysctl.sched_features
        sched: Protect sched_rr_get_param() access to task->sched_class
        sched: Protect task->cpus_allowed access in sched_getaffinity()
        sched: Fix balance vs hotplug race
        ...
      
      Fixed up conflicts in kernel/sysctl.c (due to sysctl cleanup)
      702a7c76
    • Takashi Iwai's avatar
      Merge branch 'topic/hda' into for-linus · 84a3bd06
      Takashi Iwai authored
      84a3bd06
    • Takashi Iwai's avatar
      Merge branch 'topic/asoc' into for-linus · f52d7a43
      Takashi Iwai authored
      f52d7a43
    • Alexey Fisher's avatar
      ALSA: hda - Overwrite pin config on intel DG45ID board. · 52dc4386
      Alexey Fisher authored
      
      
      The pin config provided by BIOS have some problems:
      0x0221401f: [Jack] HP Out at Ext Front  <-- other association and sequence
      0x02a19020: [Jack] Mic at Ext Front     <-- other association
      0x01113014: [Jack] Speaker at Ext Rear  <-- line out (not speaker)
      0x01114010: [Jack] Speaker at Ext Rear  <-- line out
      0x01a19030: [Jack] Mic at Ext Rear      <-- other association
      0x01111012: [Jack] Speaker at Ext Rear  <-- line out
      0x01116011: [Jack] Speaker at Ext Rear  <-- line out
      0x40f000f0: [N/A] Other at Ext N/A
      0x40f000f0: [N/A] Other at Ext N/A
      0x40f000f0: [N/A] Other at Ext N/A
      0x40f000f0: [N/A] Other at Ext N/A
      0x40f000f0: [N/A] Other at Ext N/A
      0x01451140: [Jack] SPDIF Out at Ext Rear
      0x40f000f0: [N/A] Other at Ext N/A
      
      just overwrite it.
      
      Signed-off-by: default avatarAlexey Fisher <bug-track@fisher-privat.net>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      52dc4386
    • Pekka Enberg's avatar
    • Ajit Khaparde's avatar
      be2net: fix error in rx completion processing. · e1187b3b
      Ajit Khaparde authored
      
      
      There are certain skews of the NIC which have multiple bits set in
      adapter->cap.  Use & instead of == to process rx completions.
      
      Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e1187b3b