1. 16 Nov, 2012 18 commits
  2. 15 Nov, 2012 15 commits
    • Akinobu Mita's avatar
      drm/ttm: remove unneeded preempt_disable/enable · 55aa914e
      Akinobu Mita authored
      It is unnecessary to disable preemption explicitly while calling
      copy_highpage().  Because copy_highpage() will do it again through
      kmap_atomic/kunmap_atomic.
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      55aa914e
    • Zhao Yakui's avatar
      ttm: Clear the ttm page allocated from high memory zone correctly · ac207ed2
      Zhao Yakui authored
      The TTM page can be allocated from high memory. In such case it is
      wrong to use the page_address(page) as the virtual address for the high memory
      page.
      
      bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50241Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ac207ed2
    • Dan Carpenter's avatar
      vmwgfx: return an -EFAULT if copy_to_user() fails · 888155bb
      Dan Carpenter authored
      copy_to_user() returns the number of bytes remaining to be copied, but
      we want to return a negative error code here.  I fixed a couple of these
      last year, but I missed this one.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      888155bb
    • Igor Mazanov's avatar
      clk: remove inline usage from clk-provider.h · 93532c8a
      Igor Mazanov authored
      Users of GCC 4.7 have reported compiler errors due to having inline
      applied to function declarations in clk-provider.h.  The definitions
      exist in drivers/clk/clk.c.  An example error:
      
      In file included from arch/arm/mach-omap2/clockdomain.c:25:0:
      arch/arm/mach-omap2/clockdomain.c: In function ‘clkdm_clk_disable’:
      include/linux/clk-provider.h:338:12: error: inlining failed in call to always_inline ‘__clk_get_enable_count’: function body not available
      arch/arm/mach-omap2/clockdomain.c:1001:28: error: called from here
      make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1
      make: *** [arch/arm/mach-omap2] Error 2
      
      This patch removes the use of inline from include/linux/clk-provider.h
      but keeps the function definitions in drivers/clk/clk.c as inlined since
      they are one-liners.
      Signed-off-by: default avatarIgor Mazanov <i.mazanov@gmail.com>
      Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
      Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
      [mturquette@linaro.org: improved subject, added changelog]
      93532c8a
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/gxt/linux · c5e35d6c
      Linus Torvalds authored
      Pull unicore32 update from Guan Xuetao.
      
      * tag 'for-linus' of git://github.com/gxt/linux:
        arch/unicore32: remove CONFIG_EXPERIMENTAL
        unicore32: switch to generic sys_execve()
        unicore32: switch to generic kernel_thread()/kernel_execve()
        unicore32: Use Kbuild infrastructure for kvm_para.h
        UAPI: (Scripted) Disintegrate arch/unicore32/include/asm
        UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler
        UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
        UniCore32 bugfix: add missed CONFIG_ZONE_DMA
        unicore32/mm/fault.c: Port OOM changes to do_pf
      c5e35d6c
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.7-rc6' of git://git.infradead.org/linux-ubifs · ce95a36b
      Linus Torvalds authored
      Pull UBIFS fixes from Artem Bityutskiy:
       "Two patches which fix a problem reported by several people in the
        past, but only fixed now because no one gave enough material for
        debugging.
      
        Anyway, these fix the problem that sometimes after a power cut the
        file-system is not mountable with the following symptom:
      
      	grab_empty_leb: could not find an empty LEB
      
        The fixes make the file-system mountable again."
      
      * tag 'upstream-3.7-rc6' of git://git.infradead.org/linux-ubifs:
        UBIFS: fix mounting problems after power cuts
        UBIFS: introduce categorized lprops counter
      ce95a36b
    • Linus Torvalds's avatar
      Merge tag 'for-v3.7-fixes' of git://git.infradead.org/users/cbou/linux-pstore · 006b9568
      Linus Torvalds authored
      Pull pstore fix from Anton Vorontsov:
       "A small fixup for the persistent storage subsystem.  The bug can
        prevent kernel booting on a APEI-enabled machines w/ PSTORE_CONSOLE=y
        (this is N by default, though)."
      
      * tag 'for-v3.7-fixes' of git://git.infradead.org/users/cbou/linux-pstore:
        pstore: Fix NULL pointer dereference in console writes
      006b9568
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · e8017454
      Linus Torvalds authored
      Pill i2c fixes from Jean Delvare.
      
      Well, "fixes"..  The biggest patch here is actually Jan marking Wolfram
      Sang as the main i2c subsystem maintainer, with Jan staying on as the PC
      controller maintainer.
      
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-mux-pinctrl: Fix probe error path
        MAINTAINERS: i2c: 7 years, this is it
      e8017454
    • Linus Torvalds's avatar
      Merge tag 'regulator-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 7c96cfcd
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "A few fixes for teardown issues that will be rarely seen, plus a fix
        for a silly bug in regulator_is_supported_voltage() which shows how
        often the answer to the question should be false.
      
        The supported voltage commit is very new as I just edited to add a Cc
        to stable, the code itself has been in -next."
      
      * tag 'regulator-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: fix voltage check in regulator_is_supported_voltage()
        regulator: core: Avoid deadlock when regulator_register fails
        Regulator: core: Unregister when gpio request fails.
      7c96cfcd
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 38216134
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "The only large LOC is seen in WM5102 driver, just writing a bunch of
        register updates, but the actual code change is small.  Other than
        that, all small fixes suitable for rc6."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: Fix mutex deadlock at disconnection
        ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins()
        ALSA: es1968: precedence bug in snd_es1968_tea575x_get_pins()
        ALSA: hda - Add a missing quirk entry for iMac 9,1
        ASoC: core: Double control update err for snd_soc_put_volsw_sx
        ASoC: dapm: Use card_list during DAPM shutdown
        ASoC: cs42l52: fix the return value of cs42l52_set_fmt()
        ASoC: bells: Correct type in sub speaker DAI name for WM5102
        ASoC: wm8978: pll incorrectly configured when codec is master
        ASoC: mxs-saif: Fix channel swap for 24-bit format
        ASoC: bells: Select WM1250-EV1 Springbank audio I/O module
        ASoC: bells: Add missing select of WM0010
        ASoC: mxs-saif: Add MODULE_ALIAS
        ASoC: wm5102: Write register value corrections after SYSCLK is enabled
      38216134
    • Heiko Carstens's avatar
      s390/3215: fix tty close handling · ae289dc1
      Heiko Carstens authored
      The 3215 console always has the RAW3215_FIXED flag set, which causes
      raw3215_shutdown() not to wait for outstanding I/O requests if an attached
      tty gets closed.
      The flag however can be simply removed, so we can guarantee that all requests
      belonging to the tty have been processed when the tty is closed.
      
      However the tasklet that belongs to the 3215 device may be scheduled even if
      there is no tty attached anymore, since we have a race between console and tty
      processing.
      Thefore unconditional tty_wakekup() in raw3215_wakeup() can cause the following
      NULL pointer dereference:
      
      3.465368 Unable to handle kernel pointer dereference at virtual kernel address (null)
      3.465448 Oops: 0004 #1 SMP
      3.465454 Modules linked in:
      3.465459 CPU: 1 Not tainted 3.6.0 #1
      3.465462 Process swapper/1 (pid: 0, task: 000000003ffa4428, ksp: 000000003ffb7ce0)
      3.465466 Krnl PSW : 0404100180000000 0000000000162f86 (__wake_up+0x46/0xb8)
      3.465480            R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3
               Krnl GPRS: fffffffffffffffe 0000000000000000 0000000000000160 0000000000000001
      3.465492            0000000000000001 0000000000000004 0000000000000004 000000000096b490
      3.465499            0000000000000001 0000000000000100 0000000000000001 0000000000000001
      3.465506            070000003fc87d60 0000000000000160 000000003fc87d68 000000003fc87d00
      3.465526 Krnl Code: 0000000000162f76: e3c0f0a80004      lg      %r12,168(%r15)
                          0000000000162f7c: 58000370          l       %r0,880
                         #0000000000162f80: c007ffffffff00    xilf    %r0,4294967295
                         >0000000000162f86: ba102000          cs      %r1,%r0,0(%r2)
                          0000000000162f8a: 1211              ltr     %r1,%r1
                          0000000000162f8c: a774002f          brc     7,162fea
                          0000000000162f90: b904002d          lgr     %r2,%r13
                          0000000000162f94: b904003a          lgr     %r3,%r10
      3.465597 Call Trace:
      3.465599 (<0400000000000000> 0x400000000000000)
      3.465602  <000000000048c77e> raw3215_wakeup+0x2e/0x40
      3.465607  <0000000000134d66> tasklet_action+0x96/0x168
      3.465612  <000000000013423c> __do_softirq+0xd8/0x21c
      3.465615  <0000000000134678> irq_exit+0xa8/0xac
      3.465617  <000000000046c232> do_IRQ+0x182/0x248
      3.465621  <00000000005c8296> io_return+0x0/0x8
      3.465625  <00000000005c7cac> vtime_stop_cpu+0x4c/0xb8
      3.465629 (<0000000000194e06> tick_nohz_idle_enter+0x4e/0x74)
      3.465633  <0000000000104760> cpu_idle+0x170/0x184
      3.465636  <00000000005b5182> smp_start_secondary+0xd6/0xe0
      3.465641  <00000000005c86be> restart_int_handler+0x56/0x6c
      3.465643  <0000000000000000> 0x0
      3.465645 Last Breaking-Event-Address:
      3.465647  <0000000000403136> tty_wakeup+0x46/0x98
      3.465652
      3.465654 Kernel panic - not syncing: Fatal exception in interrupt
      01: HCPGIR450W CP entered; disabled wait PSW 00020001 80000000 00000000 0010F63C
      
      The easiest solution is simply to check if tty is NULL in the tasklet.
      If it is NULL nothing is to do (no tty attached), otherwise tty_wakeup()
      can be called, since we hold a reference to the tty.
      This is not nice... but it is a small patch and it works.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      ae289dc1
    • Alex Deucher's avatar
    • Colin Ian King's avatar
      pstore: Fix NULL pointer dereference in console writes · 70a6f46d
      Colin Ian King authored
      Passing a NULL id causes a NULL pointer deference in writers such as
      erst_writer and efi_pstore_write because they expect to update this id.
      Pass a dummy id instead.
      
      This avoids a cascade of oopses caused when the initial
      pstore_console_write passes a null which in turn causes writes to the
      console causing further oopses in subsequent pstore_console_write calls.
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Acked-by: default avatarKees Cook <keescook@chromium.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
      70a6f46d
    • Mark Brown's avatar
      Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and... · ecb48c33
      Mark Brown authored
      Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and 'regulator/fix/supp-volt' into tmp
      ecb48c33
    • Marek Szyprowski's avatar
      regulator: fix voltage check in regulator_is_supported_voltage() · f0f98b19
      Marek Szyprowski authored
      regulator_is_supported_voltage() should return true only if the voltage
      of fixed/constant regulator is between min_uV and max_uV.
      Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: stable@vger.kernel.org
      f0f98b19
  3. 14 Nov, 2012 7 commits