1. 05 Nov, 2010 1 commit
  2. 03 Nov, 2010 8 commits
    • Wu Fengguang's avatar
      vmstat: fix offset calculation on void* · ff8b16d7
      Wu Fengguang authored
      Fix regression introduced by commit 79da826a ("writeback: report
      dirty thresholds in /proc/vmstat").
      
      The incorrect pointer arithmetic can result in problems like this:
      
        BUG: unable to handle kernel paging request at 07c06d16
        IP: [<c050c336>] strnlen+0x6/0x20
        Call Trace:
         [<c050a249>] ? string+0x39/0xe0
         [<c042be6b>] ? __wake_up_common+0x4b/0x80
         [<c050afcc>] ? vsnprintf+0x1ec/0x380
         [<c04b380e>] ? seq_printf+0x2e/0x60
         [<c04829a6>] ? vmstat_show+0x26/0x30
         [<c04b3bb6>] ? seq_read+0xa6/0x380
         [<c04b3b10>] ? seq_read+0x0/0x380
         [<c04d5d2f>] ? proc_reg_read+0x5f/0x90
         [<c049c4a1>] ? vfs_read+0xa1/0x140
         [<c04d5cd0>] ? proc_reg_read+0x0/0x90
         [<c049c981>] ? sys_read+0x41/0x70
         [<c0402bd0>] ? sysenter_do_call+0x12/0x26
      Reported-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Cc: Michael Rubin <mrubin@google.com>
      Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff8b16d7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 81a6cff6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: tpa6130a2: Get rid of compile warning from tpa6130a2_power
        ALSA: hda - MacBookAir3,1(3,2) alsa support
        ASoC: fix the building issue of missing codec field in 'struct snd_soc_card'
        ALSA: usb-audio - Support for Power/Status LED on Creative USB X-Fi S51
        ALSA: asihpi - Unsafe memory management when allocating control cache
        ASoC: Update WARN uses in wm_hubs
        ASoC: Include cx20442 to SND_SOC_ALL_CODECS
        ASoC: Fix SND_SOC_ALL_CODECS typo for jz4740
        ASoC: Remove volatility from WM8900 POWER1 register
        ALSA: lx6464es - make 1 bit signed bitfield unsigned
        ALSA: cs46xx memory management fixes for cs46xx_dsp_spos_create()
        ALSA: usb - driver neglects kmalloc return value check and may deref NULL
        ASoC: tpa6130a2: Fix unbalanced regulator disables
        ASoC: tlv320dac33: Mode1 FIFO auto configuration fix
        ASoC: tlv320dac33: Limit the US_TO_SAMPLES macro
        ASoC: tlv320dac33: Error handling for broken chip
        ASoC: Check return value of struct_strtoul() in pmdown_time_set()
      81a6cff6
    • Takashi Iwai's avatar
      Merge branch 'fix/asoc' into for-linus · 69dbdd81
      Takashi Iwai authored
      69dbdd81
    • Jarkko Nikula's avatar
      ASoC: tpa6130a2: Get rid of compile warning from tpa6130a2_power · 75e3f313
      Jarkko Nikula authored
      Patch "ASoC: tpa6130a2: Fix unbalanced regulator disables" introduced a
      compiler warning "‘ret’ may be used uninitialized in this function".
      Initialize ret to zero to get rid of it and making sure that the function
      does not return any random error code when the code is falling through.
      Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      75e3f313
    • Takashi Iwai's avatar
      Merge branch 'for-2.6.37' of... · cf78c0c4
      Takashi Iwai authored
      Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
      cf78c0c4
    • Edgar (gimli) Hucek's avatar
      ALSA: hda - MacBookAir3,1(3,2) alsa support · 87232dd4
      Edgar (gimli) Hucek authored
      This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa
      sound system.
      Signed-off-by: default avatarEdgar (gimli) Hucek <gimli@dark-green.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      87232dd4
    • Philippe De Muyter's avatar
      m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h · ed35f654
      Philippe De Muyter authored
      Recent changes to header files made kernel compilation for m68k/m68knommu
      fail with :
        CC      arch/m68knommu/kernel/asm-offsets.s
      In file included from /archives/linux/git/arch/m68k/include/asm/system.h:2,
                       from include/linux/wait.h:25,
                       from include/linux/mmzone.h:9,
                       from include/linux/gfp.h:4,
                       from include/linux/irq.h:20,
                       from include/asm-generic/hardirq.h:12,
                       from /archives/linux/git/arch/m68k/include/asm/hardirq_no.h:17,
                       from /archives/linux/git/arch/m68k/include/asm/hardirq.h:2,
                       from include/linux/hardirq.h:10,
                       from /archives/linux/git/arch/m68k/include/asm/irqflags.h:5,
                       from include/linux/irqflags.h:15,
                       from include/linux/spinlock.h:53,
                       from include/linux/seqlock.h:29,
                       from include/linux/time.h:8,
                       from include/linux/timex.h:56,
                       from include/linux/sched.h:56,
                       from arch/m68knommu/kernel/asm-offsets.c:12:
      /archives/linux/git/arch/m68k/include/asm/system_no.h: In function ‘__xchg’:
      /archives/linux/git/arch/m68k/include/asm/system_no.h:79: error: implicit
      +declaration of function ‘local_irq_save’
      /archives/linux/git/arch/m68k/include/asm/system_no.h:101: error: implicit
      +declaration of function ‘local_irq_restore’
      
      Fix that
      Signed-off-by: default avatarPhilippe De Muyter <phdm@macqel.be>
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      ed35f654
    • Greg Ungerer's avatar
      m68knommu: add back in declaration of do_IRQ · 79c1a903
      Greg Ungerer authored
      The cleanup and merge of machdep should not have removed the do_IRQ
      declaration. It is needed by the 68328 based targets.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      79c1a903
  3. 02 Nov, 2010 7 commits
  4. 01 Nov, 2010 19 commits
  5. 31 Oct, 2010 5 commits