1. 26 Apr, 2012 4 commits
    • Paul Gortmaker's avatar
      xtensa: fix build fail on undefined ack_bad_irq · 8e12a038
      Paul Gortmaker authored
      Commit e520c410
      
          "xtensa: convert to asm-generic/hardirq.h"
      
      converted over to using the asm-generic parts, but it also
      added the sentinel
      
      	#define ack_bad_irq ack_bad_irq
      
      which tells asm-generic to _not_ use the common ack_bad_irq.
      
      Since e520c410 deleted the duplicated code from the arch specific
      file, we _do_ want the asm-generic one in scope.  So delete
      the trigger define above which hides it.  In doing so we'll
      realize that we've got to delete the almost-duplicate prototype
      as well to avoid "static declaration ... follows non-static".
      
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Chris Zankel <chris@zankel.net>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      8e12a038
    • Paul Gortmaker's avatar
      blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c · fa83af7e
      Paul Gortmaker authored
      This file has lots and lots of ifdef, around structure decls
      and structure usages.  The failure issue was that we would
      build the BF538-EZKIT_defconfig and get:
      
       arch/blackfin/mach-bf538/boards/ezkit.c:924:3: error: 'bfin_lq035q1_device'
       undeclared here (not in a function)
      
      even though the same ifdef _appeared_ to enable both the struct
      declaration and the code that used it.  Yet cpp was telling us we
      didn't have the struct, but we still had the usage of it.
      
      However, _appeared_ is the operative word.  After marking all the
      anonymous #endif with their parent #ifdef config options, it was
      _then_ clear that there was a misplaced #endif that was hiding
      the struct declaration.
      
      The real guts of the patch boils down to this:
      
      -#endif
      +#endif /* CONFIG_MTD_M25P80 */
      +#endif /* CONFIG_SPI_BFIN5XX */
       [...]
      -#endif  /* spi master and devices */
      
      but since I had to tag the #endif with their respective #ifdef
      options to find this misplaced SPI endif, it would be silly to
      then go and delete them all.  So they stay.
      
      Cc: Sonic Zhang <sonic.zhang@analog.com>
      Cc: Bob Liu <lliubbo@gmail.com>
      Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      fa83af7e
    • Paul Gortmaker's avatar
      blackfin: fix compile error in bfin-lq035q1-fb.c · bc856a62
      Paul Gortmaker authored
      This file has an implicit dependency on GPIO stuff, showing
      up as the following build failure:
      
      drivers/video/bfin-lq035q1-fb.c:369:6: error: 'GPIOF_OUT_INIT_LOW' undeclared
      
      Other more global bfin build issues prevent an automated bisect, but
      it really doesn't matter - simply add in the appropriate header.
      
      Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
      Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      bc856a62
    • Paul Gortmaker's avatar
      pci: frv architecture needs generic setup-bus infrastructure · cd0a2bfb
      Paul Gortmaker authored
      Otherwise we get this link failure for frv's defconfig:
      
         LD      .tmp_vmlinux1
       drivers/built-in.o: In function `pci_assign_resource':
       (.text+0xbf0c): undefined reference to `pci_cardbus_resource_alignment'
       drivers/built-in.o: In function `pci_setup':
       pci.c:(.init.text+0x174): undefined reference to `pci_realloc_get_opt'
       pci.c:(.init.text+0x1a0): undefined reference to `pci_realloc_get_opt'
       make[1]: *** [.tmp_vmlinux1] Error 1
      
      Cc: David Howells <dhowells@redhat.com>
      Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      cd0a2bfb
  2. 23 Apr, 2012 3 commits
  3. 18 Apr, 2012 1 commit
    • Paul Gortmaker's avatar
      powerpc: fix system.h fallout in sysdev/scom.c [chroma_defconfig] · 1bc68a9e
      Paul Gortmaker authored
      The following shows up in chroma_defconfig:
      
       CC      arch/powerpc/sysdev/scom.o
      arch/powerpc/sysdev/scom.c: In function 'scom_debug_init':
      arch/powerpc/sysdev/scom.c:182:36: error: 'powerpc_debugfs_root' undeclared (first use in this function)
      arch/powerpc/sysdev/scom.c:182:36: note: each undeclared identifier is reported only once for each function it appears in
      make[2]: *** [arch/powerpc/sysdev/scom.o] Error 1
      make[1]: *** [arch/powerpc/sysdev/scom.o] Error 2
      
      A bisect leads to commit 9ffc93f2
      
          "Remove all #inclusions of asm/system.h"
      
      Add the debug header which contains powerpc_debugfs_root.
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      1bc68a9e
  4. 16 Apr, 2012 3 commits
    • 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
  5. 15 Apr, 2012 12 commits
  6. 14 Apr, 2012 13 commits
  7. 13 Apr, 2012 4 commits