1. 11 Apr, 2013 4 commits
    • Ralf Baechle's avatar
      MIPS: Get rid of the use of .macro in C code. · 02b849f7
      Ralf Baechle authored
      It fails with LTO and probably has always been a fragile.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      02b849f7
    • Ralf Baechle's avatar
      MIPS: Make declarations and definitions of tlbmiss_handler_setup_pgd match. · 0bfbf6a2
      Ralf Baechle authored
      tlbmiss_handler_setup_pgd is run-time generated code and it was convenient
      to pretend the symbol was an array in the generator but a function for
      the users.  LTO gcc won't tolerate this kind of lie anymore so solve the
      problem through a cast and function pointer instead.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      0bfbf6a2
    • Ralf Baechle's avatar
      MIPS: Make tlb exception handler definitions and declarations match. · 86a1708a
      Ralf Baechle authored
      The code was written as it is because it's more expressive, a bit easier.
      But it's always been dirty, if not a bug.  But we can't cheat with LTO
      compilers, so this results in:
      
      [...]
        LDFINAL vmlinux.o
      In file included from arch/mips/kernel/topology.c:604:0,
                       from arch/mips/kernel/time.c:212,
                       from arch/mips/kernel/syscall.c:300,
                       from arch/mips/kernel/signal.c:853,
                       from arch/mips/kernel/setup.c:1030,
                       from arch/mips/kernel/reset.c:354,
                       from arch/mips/kernel/ptrace.c:562,
                       from arch/mips/kernel/process.c:770,
                       from arch/mips/kernel/irq.c:350,
                       from arch/mips/kernel/branch.c:321,
                       from arch/mips/kernel/cpu-probe.c:1370,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:345,
                       from arch/mips/sgi-ip22/ip22-gio.c:660,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/sgialib.h:219,
                       from arch/mips/sgi-ip22/ip22-reset.c:224,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/paccess.h:116,
                       from arch/mips/sgi-ip22/ip22-nvram.c:334,
                       from include/linux/kernel_stat.h:79,
                       from arch/mips/sgi-ip22/ip22-int.c:592,
                       from arch/mips/sgi-ip22/ip22-hpc.c:470,
                       from arch/mips/sgi-ip22/ip22-mc.c:135,
                       from init/init_task.c:54,
                       from init/calibrate.c:744,
                       from init/noinitramfs.c:62,
                       from init/do_mounts.c:573,
                       from init/version.c:1009,
                       from init/main.c:777,
                       from :729:
      arch/mips/kernel/traps.c:63:49: error: variable ‘handle_tlbl’ redeclared as function
      In file included from arch/mips/mm/page.c:310:0,
                       from arch/mips/mm/mmap.c:208,
                       from arch/mips/mm/init.c:641,
                       from arch/mips/mm/gup.c:811,
                       from arch/mips/mm/fault.c:659,
                       from include/linux/module.h:682,
                       from arch/mips/mm/dma-default.c:161,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:397,
                       from arch/mips/kernel/i8253.c:538,
                       from arch/mips/kernel/proc.c:145,
                       from arch/mips/kernel/irq_cpu.c:129,
                       from arch/mips/kernel/i8259.c:229,
                       from include/uapi/linux/elf.h:251,
                       from arch/mips/kernel/mips_ksyms.c:129,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/time.h:50,
                       from arch/mips/kernel/cevt-r4k.c:90,
                       from arch/mips/kernel/vdso.c:136,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:351,
                       from arch/mips/kernel/unaligned.c:809,
                       from arch/mips/kernel/traps.c:1720,
                       from arch/mips/kernel/topology.c:684,
                       from arch/mips/kernel/time.c:212,
                       from arch/mips/kernel/syscall.c:300,
                       from arch/mips/kernel/signal.c:853,
                       from arch/mips/kernel/setup.c:1030,
                       from arch/mips/kernel/reset.c:354,
                       from arch/mips/kernel/ptrace.c:562,
                       from arch/mips/kernel/process.c:770,
                       from arch/mips/kernel/irq.c:350,
                       from arch/mips/kernel/branch.c:321,
                       from arch/mips/kernel/cpu-probe.c:1370,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:345,
                       from arch/mips/sgi-ip22/ip22-gio.c:660,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/sgialib.h:219,
                       from arch/mips/sgi-ip22/ip22-reset.c:224,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/paccess.h:116,
                       from arch/mips/sgi-ip22/ip22-nvram.c:334,
                       from include/linux/kernel_stat.h:79,
                       from arch/mips/sgi-ip22/ip22-int.c:592,
                       from arch/mips/sgi-ip22/ip22-hpc.c:470,
                       from arch/mips/sgi-ip22/ip22-mc.c:135,
                       from init/init_task.c:54,
                       from init/calibrate.c:744,
                       from init/noinitramfs.c:62,
                       from init/do_mounts.c:573,
                       from init/version.c:1009,
                       from init/main.c:777,
                       from :729:
      arch/mips/mm/tlbex.c:1448:5: note: previously declared here
      In file included from arch/mips/kernel/topology.c:604:0,
                       from arch/mips/kernel/time.c:212,
                       from arch/mips/kernel/syscall.c:300,
                       from arch/mips/kernel/signal.c:853,
                       from arch/mips/kernel/setup.c:1030,
                       from arch/mips/kernel/reset.c:354,
                       from arch/mips/kernel/ptrace.c:562,
                       from arch/mips/kernel/process.c:770,
                       from arch/mips/kernel/irq.c:350,
                       from arch/mips/kernel/branch.c:321,
                       from arch/mips/kernel/cpu-probe.c:1370,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:345,
                       from arch/mips/sgi-ip22/ip22-gio.c:660,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/sgialib.h:219,
                       from arch/mips/sgi-ip22/ip22-reset.c:224,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/paccess.h:116,
                       from arch/mips/sgi-ip22/ip22-nvram.c:334,
                       from include/linux/kernel_stat.h:79,
                       from arch/mips/sgi-ip22/ip22-int.c:592,
                       from arch/mips/sgi-ip22/ip22-hpc.c:470,
                       from arch/mips/sgi-ip22/ip22-mc.c:135,
                       from init/init_task.c:54,
                       from init/calibrate.c:744,
                       from init/noinitramfs.c:62,
                       from init/do_mounts.c:573,
                       from init/version.c:1009,
                       from init/main.c:777,
                       from :729:
      arch/mips/kernel/traps.c:62:49: error: variable ‘handle_tlbm’ redeclared as function
      In file included from arch/mips/mm/page.c:310:0,
                       from arch/mips/mm/mmap.c:208,
                       from arch/mips/mm/init.c:641,
                       from arch/mips/mm/gup.c:811,
                       from arch/mips/mm/fault.c:659,
                       from include/linux/module.h:682,
                       from arch/mips/mm/dma-default.c:161,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:397,
                       from arch/mips/kernel/i8253.c:538,
                       from arch/mips/kernel/proc.c:145,
                       from arch/mips/kernel/irq_cpu.c:129,
                       from arch/mips/kernel/i8259.c:229,
                       from include/uapi/linux/elf.h:251,
                       from arch/mips/kernel/mips_ksyms.c:129,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/time.h:50,
                       from arch/mips/kernel/cevt-r4k.c:90,
                       from arch/mips/kernel/vdso.c:136,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:351,
                       from arch/mips/kernel/unaligned.c:809,
                       from arch/mips/kernel/traps.c:1720,
                       from arch/mips/kernel/topology.c:684,
                       from arch/mips/kernel/time.c:212,
                       from arch/mips/kernel/syscall.c:300,
                       from arch/mips/kernel/signal.c:853,
                       from arch/mips/kernel/setup.c:1030,
                       from arch/mips/kernel/reset.c:354,
                       from arch/mips/kernel/ptrace.c:562,
                       from arch/mips/kernel/process.c:770,
                       from arch/mips/kernel/irq.c:350,
                       from arch/mips/kernel/branch.c:321,
                       from arch/mips/kernel/cpu-probe.c:1370,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:345,
                       from arch/mips/sgi-ip22/ip22-gio.c:660,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/sgialib.h:219,
                       from arch/mips/sgi-ip22/ip22-reset.c:224,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/paccess.h:116,
                       from arch/mips/sgi-ip22/ip22-nvram.c:334,
                       from include/linux/kernel_stat.h:79,
                       from arch/mips/sgi-ip22/ip22-int.c:592,
                       from arch/mips/sgi-ip22/ip22-hpc.c:470,
                       from arch/mips/sgi-ip22/ip22-mc.c:135,
                       from init/init_task.c:54,
                       from init/calibrate.c:744,
                       from init/noinitramfs.c:62,
                       from init/do_mounts.c:573,
                       from init/version.c:1009,
                       from init/main.c:777,
                       from :729:
      arch/mips/mm/tlbex.c:1450:5: note: previously declared here
      In file included from arch/mips/kernel/topology.c:604:0,
                       from arch/mips/kernel/time.c:212,
                       from arch/mips/kernel/syscall.c:300,
                       from arch/mips/kernel/signal.c:853,
                       from arch/mips/kernel/setup.c:1030,
                       from arch/mips/kernel/reset.c:354,
                       from arch/mips/kernel/ptrace.c:562,
                       from arch/mips/kernel/process.c:770,
                       from arch/mips/kernel/irq.c:350,
                       from arch/mips/kernel/branch.c:321,
                       from arch/mips/kernel/cpu-probe.c:1370,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:345,
                       from arch/mips/sgi-ip22/ip22-gio.c:660,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/sgialib.h:219,
                       from arch/mips/sgi-ip22/ip22-reset.c:224,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/paccess.h:116,
                       from arch/mips/sgi-ip22/ip22-nvram.c:334,
                       from include/linux/kernel_stat.h:79,
                       from arch/mips/sgi-ip22/ip22-int.c:592,
                       from arch/mips/sgi-ip22/ip22-hpc.c:470,
                       from arch/mips/sgi-ip22/ip22-mc.c:135,
                       from init/init_task.c:54,
                       from init/calibrate.c:744,
                       from init/noinitramfs.c:62,
                       from init/do_mounts.c:573,
                       from init/version.c:1009,
                       from init/main.c:777,
                       from :729:
      arch/mips/kernel/traps.c:64:49: error: variable ‘handle_tlbs’ redeclared as function
      In file included from arch/mips/mm/page.c:310:0,
                       from arch/mips/mm/mmap.c:208,
                       from arch/mips/mm/init.c:641,
                       from arch/mips/mm/gup.c:811,
                       from arch/mips/mm/fault.c:659,
                       from include/linux/module.h:682,
                       from arch/mips/mm/dma-default.c:161,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:397,
                       from arch/mips/kernel/i8253.c:538,
                       from arch/mips/kernel/proc.c:145,
                       from arch/mips/kernel/irq_cpu.c:129,
                       from arch/mips/kernel/i8259.c:229,
                       from include/uapi/linux/elf.h:251,
                       from arch/mips/kernel/mips_ksyms.c:129,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/time.h:50,
                       from arch/mips/kernel/cevt-r4k.c:90,
                       from arch/mips/kernel/vdso.c:136,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:351,
                       from arch/mips/kernel/unaligned.c:809,
                       from arch/mips/kernel/traps.c:1720,
                       from arch/mips/kernel/topology.c:684,
                       from arch/mips/kernel/time.c:212,
                       from arch/mips/kernel/syscall.c:300,
                       from arch/mips/kernel/signal.c:853,
                       from arch/mips/kernel/setup.c:1030,
                       from arch/mips/kernel/reset.c:354,
                       from arch/mips/kernel/ptrace.c:562,
                       from arch/mips/kernel/process.c:770,
                       from arch/mips/kernel/irq.c:350,
                       from arch/mips/kernel/branch.c:321,
                       from arch/mips/kernel/cpu-probe.c:1370,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/thread_info.h:345,
                       from arch/mips/sgi-ip22/ip22-gio.c:660,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/sgialib.h:219,
                       from arch/mips/sgi-ip22/ip22-reset.c:224,
                       from /fluff/home/ralf/src/linux/lto/linux-misc/arch/mips/include/asm/paccess.h:116,
                       from arch/mips/sgi-ip22/ip22-nvram.c:334,
                       from include/linux/kernel_stat.h:79,
                       from arch/mips/sgi-ip22/ip22-int.c:592,
                       from arch/mips/sgi-ip22/ip22-hpc.c:470,
                       from arch/mips/sgi-ip22/ip22-mc.c:135,
                       from init/init_task.c:54,
                       from init/calibrate.c:744,
                       from init/noinitramfs.c:62,
                       from init/do_mounts.c:573,
                       from init/version.c:1009,
                       from init/main.c:777,
                       from :729:
      arch/mips/mm/tlbex.c:1449:5: note: previously declared here
      lto1: fatal error: errors during merging of translation units
      compilation terminated.
      lto-wrapper: /usr/bin/mips-linux-gcc returned 1 exit status
      /usr/lib64/gcc/mips-linux/4.7.1/../../../../mips-linux/bin/ld: lto-wrapper failed
      collect2: error: ld returned 1 exit status
      make: *** [vmlinux] Error 1
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      86a1708a
    • Ralf Baechle's avatar
      MIPS: Use inline function to access current thread pointer. · ad04c2e9
      Ralf Baechle authored
      With LTE this fixes this issue:
      
        LDFINAL vmlinux.o
      arch/mips/built-in.o (symbol from plugin): In function `sgimc_init':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      kernel/built-in.o (symbol from plugin): In function `get_task_mm':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      mm/built-in.o (symbol from plugin): In function `iov_iter_single_seg_count':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      fs/built-in.o (symbol from plugin): In function `finish_no_open':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      ipc/built-in.o (symbol from plugin): In function `ipc_init_ids':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      security/built-in.o (symbol from plugin): In function `key_schedule_gc':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      crypto/built-in.o (symbol from plugin): In function `crypto_find_alg':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      block/built-in.o (symbol from plugin): In function `elv_rb_find':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      argv_split.o (symbol from plugin): In function `argv_free':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      dec_and_lock.o (symbol from plugin): In function `_atomic_dec_and_lock':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      extable.o (symbol from plugin): In function `sort_extable':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      flex_proportions.o (symbol from plugin): In function `fprop_global_init':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      idr.o (symbol from plugin): In function `idr_for_each':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      is_single_threaded.o (symbol from plugin): In function `current_is_single_threaded':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      kobject.o (symbol from plugin): In function `kobject_get':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      kobject_uevent.o (symbol from plugin): In function `add_uevent_var':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      plist.o (symbol from plugin): In function `plist_add':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      radix-tree.o (symbol from plugin): In function `radix_tree_lookup_slot':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      ratelimit.o (symbol from plugin): In function `___ratelimit':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      rwsem-spinlock.o (symbol from plugin): In function `__init_rwsem':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      show_mem.o (symbol from plugin): In function `show_mem':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      timerqueue.o (symbol from plugin): In function `timerqueue_iterate_next':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      vsprintf.o (symbol from plugin): In function `simple_strtoull':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      delay.o (symbol from plugin): In function `__delay':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      mips-atomic.o (symbol from plugin): In function `arch_local_irq_disable':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      uncached.o (symbol from plugin): In function `run_uncached':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      lib/built-in.o (symbol from plugin): In function `_bcd2bin':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      arch/mips/lib/built-in.o (symbol from plugin): In function `ioread8':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      drivers/built-in.o (symbol from plugin): In function `fb_notifier_call_chain':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      net/built-in.o (symbol from plugin): In function `sock_from_file':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      klist.o (symbol from plugin): In function `klist_init':
      (.text+0x0): multiple definition of `$28'
      init/built-in.o (symbol from plugin):(.text+0x0): first defined here
      
      It also makes the code a little more readable, so let's merge it.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ad04c2e9
  2. 08 Apr, 2013 1 commit
  3. 12 Mar, 2013 6 commits
  4. 11 Mar, 2013 1 commit
  5. 10 Mar, 2013 2 commits
    • Linus Torvalds's avatar
      Linux 3.9-rc2 · f6161aa1
      Linus Torvalds authored
      f6161aa1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 72932611
      Linus Torvalds authored
      Pull namespace bugfixes from Eric Biederman:
       "This is three simple fixes against 3.9-rc1.  I have tested each of
        these fixes and verified they work correctly.
      
        The userns oops in key_change_session_keyring and the BUG_ON triggered
        by proc_ns_follow_link were found by Dave Jones.
      
        I am including the enhancement for mount to only trigger requests of
        filesystem modules here instead of delaying this for the 3.10 merge
        window because it is both trivial and the kind of change that tends to
        bit-rot if left untouched for two months."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        proc: Use nd_jump_link in proc_ns_follow_link
        fs: Limit sys_mount to only request filesystem modules (Part 2).
        fs: Limit sys_mount to only request filesystem modules.
        userns: Stop oopsing in key_change_session_keyring
      72932611
  6. 09 Mar, 2013 5 commits
    • Linus Torvalds's avatar
      Atmel MXT touchscreen: increase reset timeouts · 8343bce1
      Linus Torvalds authored
      There is a more complete atmel patch-series out by Nick Dyer that fixes
      this and other things, but in the meantime this is the minimal thing to
      get the touchscreen going on (at least my) Pixel Chromebook.
      
      Not that I want my dirty fingers near that beautiful screen, but it
      seems that a non-initialized touchscreen will also end up being a
      constant wakeup source, so you have to disable it to go to sleep.  And
      it's easier to just fix the initialization sequence.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8343bce1
    • Eric W. Biederman's avatar
      proc: Use nd_jump_link in proc_ns_follow_link · db04dc67
      Eric W. Biederman authored
      Update proc_ns_follow_link to use nd_jump_link instead of just
      manually updating nd.path.dentry.
      
      This fixes the BUG_ON(nd->inode != parent->d_inode) reported by Dave
      Jones and reproduced trivially with mkdir /proc/self/ns/uts/a.
      
      Sigh it looks like the VFS change to require use of nd_jump_link
      happend while proc_ns_follow_link was baking and since the common case
      of proc_ns_follow_link continued to work without problems the need for
      making this change was overlooked.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      db04dc67
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 0aefda3e
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "These are scattered fixes and one performance improvement.  The
        biggest functional change is in how we throttle metadata changes.  The
        new code bumps our average file creation rate up by ~13% in fs_mark,
        and lowers CPU usage.
      
        Stefan bisected out a regression in our allocation code that made
        balance loop on extents larger than 256MB."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: improve the delayed inode throttling
        Btrfs: fix a mismerge in btrfs_balance()
        Btrfs: enforce min_bytes parameter during extent allocation
        Btrfs: allow running defrag in parallel to administrative tasks
        Btrfs: avoid deadlock on transaction waiting list
        Btrfs: do not BUG_ON on aborted situation
        Btrfs: do not BUG_ON in prepare_to_reloc
        Btrfs: free all recorded tree blocks on error
        Btrfs: build up error handling for merge_reloc_roots
        Btrfs: check for NULL pointer in updating reloc roots
        Btrfs: fix unclosed transaction handler when the async transaction commitment fails
        Btrfs: fix wrong handle at error path of create_snapshot() when the commit fails
        Btrfs: use set_nlink if our i_nlink is 0
      0aefda3e
    • Benson Leung's avatar
      Platform: x86: chromeos_laptop : Add basic platform data for atmel devices · 2ef39204
      Benson Leung authored
      Add basic platform data to get the current upstream driver working
      with the 224s touchpad and 1664s touchscreen.
      We will be using NULL config so we will use the settings from the
      devices' NVRAMs.
      Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
      Tested-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2ef39204
    • Daniel Kurtz's avatar
      Input: atmel_mxt_ts - Support for touchpad variant · 22dfab7f
      Daniel Kurtz authored
      This same driver can be used by atmel based touchscreens and touchpads
      (buttonpads). Platform data may specify a device is a touchpad
      using the is_tp flag.
      
      This will cause the driver to perform some touchpad specific
      initializations, such as:
        * register input device name "Atmel maXTouch Touchpad" instead of
        Touchscreen.
        * register BTN_LEFT & BTN_TOOL_* event types.
        * register axis resolution (as a fixed constant, for now)
        * register BUTTONPAD property
        * process GPIO buttons using reportid T19
      
      Input event GPIO mapping is done by the platform data key_map array.
      
      key_map[x] should contain the KEY or BTN code to send when processing
      GPIOx from T19. To specify a GPIO as not an input source, populate
      with KEY_RESERVED, or 0.
      Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
      Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
      Signed-off-by: default avatarNick Dyer <nick.dyer@itdev.co.uk>
      Tested-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      22dfab7f
  7. 08 Mar, 2013 19 commits
  8. 07 Mar, 2013 2 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 47b3bc90
      Linus Torvalds authored
      Pull x86 fixes from Peter Anvin:
       "Several boot fixes (MacBook, legacy EFI bootloaders), another
        please-don't-brick fix, and some minor stuff."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Do not try to sync identity map for non-mapped pages
        x86, doc: Be explicit about what the x86 struct boot_params requires
        x86: Don't clear efi_info even if the sentinel hits
        x86, mm: Make sure to find a 2M free block for the first mapped area
        x86: Fix 32-bit *_cpu_data initializers
        efivarfs: return accurate error code in efivarfs_fill_super()
        efivars: efivarfs_valid_name() should handle pstore syntax
        efi: be more paranoid about available space when creating variables
        iommu, x86: Add DMA remap fault reason
        x86, smpboot: Remove unused variable
      47b3bc90
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · af2841cd
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Misc radeon, nouveau, mgag200 and intel fixes.
      
        The intel fixes should contain the fix for the touchpad on the
        Chromebook - hey I'm an input maintainer now!"
      
      Hate to pee on your parade, Dave, but I don't think being an input
      maintainer is necessarily something to strive for..
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (25 commits)
        drm/tegra: drop "select DRM_HDMI"
        drm: Documentation typo fixes
        drm/mgag200: Bug fix: Renesas board now selects native resolution.
        drm/mgag200: Reject modes that are too big for VRAM
        drm/mgag200: 'fbdev_list' in 'struct mga_fbdev' is not used
        drm/radeon: don't check mipmap alignment if MIP_ADDRESS is FMASK
        drm/radeon: skip MC reset as it's probably not hung
        drm/radeon: add primary dac adj quirk for R200 board
        drm/radeon: don't set hpd, afmt interrupts when interrupts are disabled
        drm/i915: Turn off hsync and vsync on ADPA when disabling crt
        drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits
        drm/i915: also disable south interrupts when handling them
        drm/i915: enable irqs earlier when resuming
        drm/i915: Increase the RC6p threshold.
        DRM/i915: On G45 enable cursor plane briefly after enabling the display plane.
        drm/nv50-: prevent some races between modesetting and page flipping
        drm/nouveau/i2c: drop parent refcount when creating ports
        drm/nv84: fix regression in page flipping
        drm/nouveau: Fix typo in init_idx_addr_latched().
        drm/nouveau: Disable AGP on PowerPC again.
        ...
      af2841cd