1. 16 Apr, 2012 7 commits
    • Joachim Eastwood's avatar
      ARM: at91: Export at91_matrix_base · ac8c411c
      Joachim Eastwood authored
      at91_matrix_* macro's are used by at91_udc usb gadget driver,
      which can be built as module, therefore we need to export the
      variable containing matrix base address.
      Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      ac8c411c
    • Joachim Eastwood's avatar
      ARM: at91: Export at91_pmc_base · f19b797c
      Joachim Eastwood authored
      After commit b5514952 (ARM: at91/PMC: make register base soc independent)
      building atmel_usba_udc as a module fails with following message
        ERROR: "at91_pmc_base" [drivers/usb/gadget/atmel_usba_udc.ko] undefined!
        make[1]: *** [__modpost] Error 1
        make: *** [modules] Error 2
      
      Export symbol to allow driver to be built as a module again.
      Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      f19b797c
    • Joachim Eastwood's avatar
      ARM: at91: Export at91_ramc_base · 9268c6c6
      Joachim Eastwood authored
      After commit f363c407 (ARM: at91: make sdram/ddr register base soc independent)
      building at91_cf as a module fails with:
        ERROR: "at91_ramc_base" [drivers/pcmcia/at91_cf.ko] undefined!
        make[1]: *** [__modpost] Error 1
        make: *** [modules] Error 2
      
      Export at91_ramc_base symbol to allow drivers using at91_ramc_*
      functions to be built as modules again.
      Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
      [nicolas.ferre@atmel.com: modify slightly commit message]
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      9268c6c6
    • Joachim Eastwood's avatar
      ARM: at91: Export at91_st_base · 9fce85c7
      Joachim Eastwood authored
      After commit 5e9cf5e1 (ARM: at91: make ST (System Timer) soc independent)
      building at91rm9200_wdt as a module fails with following message
        ERROR: "at91_st_base" [drivers/watchdog/at91rm9200_wdt.ko] undefined!
        make[1]: *** [__modpost] Error 1
        make: *** [modules] Error 2
      
      Export symbol to allow wdt driver to be built as a module again.
      Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
      [nicolas.ferre@atmel.com: use EXPORT_SYMBOL_GPL()]
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      9fce85c7
    • Linus Torvalds's avatar
      Linux 3.4-rc3 · e816b57a
      Linus Torvalds authored
      e816b57a
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 9a8e5d41
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Nothing too disasterous, the biggest thing being the removal of the
        regulator support for vcore in the AMBA driver; only one SoC was using
        this and it got broken during the last merge window, which then
        started causing problems for other people.  Mutual agreement was
        reached for it to be removed."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7386/1: jump_label: fixup for rename to static_key
        ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
        ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
        ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
        ARM: 7383/1: nommu: populate vectors page from paging_init
        ARM: 7381/1: nommu: fix typo in mm/Kconfig
        ARM: 7380/1: DT: do not add a zero-sized memory property
        ARM: 7379/1: DT: fix atags_to_fdt() second call site
        ARM: 7366/3: amba: Remove AMBA level regulator support
        ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
        ARM: 7368/1: fault.c: correct how the tsk->[maj|min]_flt gets incremented
      9a8e5d41
    • Linus Torvalds's avatar
      x86-32: fix up strncpy_from_user() sign error · 12e993b8
      Linus Torvalds authored
      The 'max' range needs to be unsigned, since the size of the user address
      space is bigger than 2GB.
      
      We know that 'count' is positive in 'long' (that is checked in the
      caller), so we will truncate 'max' down to something that fits in a
      signed long, but before we actually do that, that comparison needs to be
      done in unsigned.
      
      Bug introduced in commit 92ae03f2 ("x86: merge 32/64-bit versions of
      'strncpy_from_user()' and speed it up").  On x86-64 you can't trigger
      this, since the user address space is much smaller than 63 bits, and on
      x86-32 it works in practice, since you would seldom hit the strncpy
      limits anyway.
      
      I had actually tested the corner-cases, I had only tested them on
      x86-64.  Besides, I had only worried about the case of a pointer *close*
      to the end of the address space, rather than really far away from it ;)
      
      This also changes the "we hit the user-specified maximum" to return
      'res', for the trivial reason that gcc seems to generate better code
      that way.  'res' and 'count' are the same in that case, so it really
      doesn't matter which one we return.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      12e993b8
  2. 15 Apr, 2012 12 commits
  3. 14 Apr, 2012 13 commits
  4. 13 Apr, 2012 8 commits