1. 20 Jun, 2014 18 commits
    • Guan Xuetao's avatar
      UniCore32: Change git tree location information in MAINTAINERS · ceebf4d5
      Guan Xuetao authored
      UniCore32 git repo has moved to github.
      Branch 'unicore32' is used for prepared patches, and automatically merged to linux-next.
      Branch 'unicore32-working' is used for development.
      Signed-off-by: default avatarGuan Xuetao <gxt@mprc.pku.edu.cn>
      ceebf4d5
    • Chen Gang's avatar
      arch: unicore32: ksyms: export '__cpuc_coherent_kern_range' to avoid compiling failure · 92543fd7
      Chen Gang authored
      flush_icache_range() is '__cpuc_coherent_kern_range' under unicore32,
      and lkdtm.ko needs it. At present, '__cpuc_coherent_kern_range' is
      still used by unicore32, so export it to avoid compiling failure.
      
      The related error (with allmodconfig under unicore32):
      
        ERROR: "__cpuc_coherent_kern_range" [drivers/misc/lkdtm.ko] undefined!
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      92543fd7
    • Chen Gang's avatar
      arch: unicore32: ksyms: export 'pm_power_off' to avoid compiling failure. · 3420d49d
      Chen Gang authored
      Two driver modules need 'pm_power_off', so export it.
      
      The related error (with allmodconfig under unicore32):
      
          MODPOST 4039 modules
        ERROR: "pm_power_off" [drivers/mfd/retu-mfd.ko] undefined!
        ERROR: "pm_power_off" [drivers/char/ipmi/ipmi_poweroff.ko] undefined!
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      3420d49d
    • Chen Gang's avatar
      arch: unicore32: ksyms: export additional find_first_*() to avoid compiling failure · 40ad2a67
      Chen Gang authored
      Some modules need find_first_bit() and find_first_zero_bit(), so export
      them.
      
      The related error (with allmodconfig under unicore32):
      
          MODPOST 4039 modules
        ERROR: "find_first_bit" [sound/soc/codecs/snd-soc-uda1380.ko] undefined!
        ERROR: "find_first_zero_bit" [net/sctp/sctp.ko] undefined!
        ...
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      40ad2a67
    • Chen Gang's avatar
      arch:unicore32:mm: add devmem_is_allowed() to support STRICT_DEVMEM · 8a016596
      Chen Gang authored
      unicore32 supports STRICT_DEVMEM, so it needs devmem_is_allowed(), like
      some of other architectures have done (e.g. arm, powerpc, x86 ...).
      
      The related error with allmodconfig:
      
          CC      drivers/char/mem.o
        drivers/char/mem.c: In function ‘range_is_allowed’:
        drivers/char/mem.c:69: error: implicit declaration of function ‘devmem_is_allowed’
        make[2]: *** [drivers/char/mem.o] Error 1
        make[1]: *** [drivers/char] Error 2
        make: *** [drivers] Error 2
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      8a016596
    • Chen Gang's avatar
      unicore32: include: asm: add missing ')' for PAGE_* macros in pgtable.h · aaad6183
      Chen Gang authored
      Missing related ')', the related compiling error:
      
          CC [M]  drivers/gpu/drm/udl/udl_fb.o
        drivers/gpu/drm/udl/udl_fb.c: In function ‘udl_fb_mmap’:
        drivers/gpu/drm/udl/udl_fb.c:273: error: expected ‘)’ before ‘return’
        drivers/gpu/drm/udl/udl_fb.c:281: error: expected expression before ‘}’ token
        make[4]: *** [drivers/gpu/drm/udl/udl_fb.o] Error 1
        make[3]: *** [drivers/gpu/drm/udl] Error 2
        make[2]: *** [drivers/gpu/drm] Error 2
        make[1]: *** [drivers/gpu] Error 2
        make: *** [drivers] Error 2
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      aaad6183
    • Chen Gang's avatar
      arch/unicore32/kernel/setup.c: add generic 'screen_info' to avoid compiling failure · f80561e4
      Chen Gang authored
      Add generic 'screen_info' just like another architectures have done
      (e.g. tile, sh, score, ia64, hexagon, and cris).
      
      The related error (with allmodconfig under unicore32):
      
          LD      init/built-in.o
        drivers/built-in.o: In function `vgacon_save_screen':
        powercap_sys.c:(.text+0x21788): undefined reference to `screen_info'
        drivers/built-in.o: In function `vgacon_resize':
        powercap_sys.c:(.text+0x21b54): undefined reference to `screen_info'
        drivers/built-in.o: In function `vgacon_switch':
        powercap_sys.c:(.text+0x21cb4): undefined reference to `screen_info'
        drivers/built-in.o: In function `vgacon_init':
        powercap_sys.c:(.text+0x2296c): undefined reference to `screen_info'
        drivers/built-in.o: In function `vgacon_startup':
        powercap_sys.c:(.text+0x22e80): undefined reference to `screen_info'
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      f80561e4
    • Chen Gang's avatar
      drivers: scsi: mvsas: fix compiling issue by adding 'MVS_' for "enum pci_interrupt_cause" · 8902b107
      Chen Gang authored
      The direct cause is IRQ_SPI is already defined as a macro in unicore32
      architecture (also, blackfin and mips architectures define it). The
      related error (unicore32  with allmodconfig)
      
          CC [M]  drivers/scsi/mvsas/mv_94xx.o
        In file included from drivers/scsi/mvsas/mv_94xx.c:27:
        drivers/scsi/mvsas/mv_94xx.h:176: error: expected identifier before numeric constant
      
      And IRQ_SAS_A and IRQ_SAS_B are used as 'u32' (although "enum
      pci_interrupt_cause" is not used directly, now).
      
      All together, need add 'MVS_' for "enum pci_interrupt_cause".
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Reviewed-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      8902b107
    • Chen Gang's avatar
      arch: unicore32: kernel: ksyms: remove 'bswapsi2' and 'muldi3' to avoid compiling failure · 80650422
      Chen Gang authored
      After check the code, 'bswapsi2' and 'muldi3' are useless for
      unicore32, so can remove them to avoid compiling failure.
      
      The related error (with allmodconfig under unicore32):
      
          LD      init/built-in.o
        arch/unicore32/kernel/built-in.o:(___ksymtab+__muldi3+0x0): undefined reference to `__muldi3'
        arch/unicore32/kernel/built-in.o:(___ksymtab+__bswapsi2+0x0): undefined reference to `__bswapsi2'
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      80650422
    • Chen Gang's avatar
      arch/unicore32/kernel/ksyms.c: remove 2 export symbols to avoid compiling failure · 5a5ffc99
      Chen Gang authored
      'csum_partial' and 'csum_partial_copy_from_user' have already been
      exported in "lib/", so need not export them again, or it will cause
      compiling error.
      
      The related error (with allmodconfig under unicore32):
      
          LD      vmlinux.o
        lib/built-in.o:(___ksymtab+csum_partial+0x0): multiple definition of `__ksymtab_csum_partial'
        arch/unicore32/kernel/built-in.o:(___ksymtab+csum_partial+0x0): first defined here
        lib/built-in.o:(___ksymtab+csum_partial_copy_from_user+0x0): multiple definition of `__ksymtab_csum_partial_copy_from_user'
        arch/unicore32/kernel/built-in.o:(___ksymtab+csum_partial_copy_from_user+0x0): first defined here
        make: *** [vmlinux] Error 1
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      5a5ffc99
    • Chen Gang's avatar
      drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0 · 73fa5406
      Chen Gang authored
      It is only a typo issue, the related commit:
      
        "1fbc4c4d drivers/rtc/rtc-puv3.c: use dev_dbg() instead of pr_debug()"
      
      The related error (for unicore32 with allmodconfig):
      
          CC [M]  drivers/rtc/rtc-puv3.o
        drivers/rtc/rtc-puv3.c: In function 'puv3_rtc_setalarm':
        drivers/rtc/rtc-puv3.c:143: error: 'struct device' has no member named 'dev'
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      73fa5406
    • Chen Gang's avatar
      drivers/rtc/rtc-puv3.c: use dev_dbg() instead of dev_debug() for typo issue · c863810c
      Chen Gang authored
      It is only a typo issue, the related commit:
      
        "1fbc4c4d drivers/rtc/rtc-puv3.c: use dev_dbg() instead of pr_debug()"
      
      The related error (unicore32 with allmodconfig):
      
          CC [M]  drivers/rtc/rtc-puv3.o
        drivers/rtc/rtc-puv3.c: In function 'puv3_rtc_setpie':
        drivers/rtc/rtc-puv3.c:74: error: implicit declaration of function 'dev_debug'
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      c863810c
    • Chen Gang's avatar
      arch/unicore32/include/asm/io.h: add readl_relaxed() generic definition · 312c6df4
      Chen Gang authored
      Need generic definition for readl_relaxed(), like other architectures
      have done. Or can not pass compiling with allmodconfig, the related
      error:
      
          CC [M]  drivers/message/fusion/mptbase.o
        drivers/message/fusion/mptbase.c: In function 'mpt_send_handshake_request':
        drivers/message/fusion/mptbase.c:1224: error: implicit declaration of function 'readl_relaxed'
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      312c6df4
    • Chen Gang's avatar
      arch/unicore32/include/asm/ptrace.h: add generic definition for profile_pc() · 1febf615
      Chen Gang authored
      Add generic definition just like another architectures have done, or
      can not pass compiling with allmodconfig, the related error:
      
          CC      kernel/profile.o
        kernel/profile.c: In function 'profile_tick':
        kernel/profile.c:419: error: implicit declaration of function 'profile_pc'
        make[1]: *** [kernel/profile.o] Error 1
        make: *** [kernel] Error 2
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      1febf615
    • Chen Gang's avatar
      arch/unicore32/mm/alignment.c: include "asm/pgtable.h" to avoid compiling error · 1ff38c56
      Chen Gang authored
      Need include "asm/pgtable.h" to include "asm-generic/pgtable-nopmd.h",
      so can let 'pmd_t' defined. The related error with allmodconfig:
      
          CC      arch/unicore32/mm/alignment.o
        In file included from arch/unicore32/mm/alignment.c:24:
        arch/unicore32/include/asm/tlbflush.h:135: error: expected .). before .*. token
        arch/unicore32/include/asm/tlbflush.h:154: error: expected .). before .*. token
        In file included from arch/unicore32/mm/alignment.c:27:
        arch/unicore32/mm/mm.h:15: error: expected .=., .,., .;., .sm. or ._attribute__. before .*. token
        arch/unicore32/mm/mm.h:20: error: expected .=., .,., .;., .sm. or ._attribute__. before .*. token
        arch/unicore32/mm/mm.h:25: error: expected .=., .,., .;., .sm. or ._attribute__. before .*. token
        make[1]: *** [arch/unicore32/mm/alignment.o] Error 1
        make: *** [arch/unicore32/mm] Error 2
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      1ff38c56
    • Chen Gang's avatar
      arch/unicore32/kernel/clock.c: add readl() and writel() for 'PM_' macros · db7ef289
      Chen Gang authored
      Add readl() and writel() for 'PM_' macros, just like another areas have
      done within unicored32, or will cause compiling issue.
      
      The related error (allmodconfig for unicored32):
      
          CC      arch/unicore32/kernel/clock.o
        arch/unicore32/kernel/clock.c: In function 'clk_set_rate':
        arch/unicore32/kernel/clock.c:182: warning: initialization makes integer from pointer without a cast
        arch/unicore32/kernel/clock.c:204: error: lvalue required as left operand of assignment
        arch/unicore32/kernel/clock.c:206: error: lvalue required as left operand of assignment
        arch/unicore32/kernel/clock.c:207: error: invalid operands to binary & (have 'void *' and 'long unsigned int')
        make[1]: *** [arch/unicore32/kernel/clock.o] Error 1
        make: *** [arch/unicore32/kernel] Error 2
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      db7ef289
    • Chen Gang's avatar
      arch/unicore32/kernel/module.c: use __vmalloc_node_range() instead of __vmalloc_area() · df8e4c7d
      Chen Gang authored
      __vmalloc_area() has already been removed from upstream kernel, need
      use __vmalloc_node_range() instead of.
      
      The related commit: "d0a21265 mm: unify module_alloc code for vmalloc".
      
      The related error (allmodconfig for unicore32):
      
          CC      arch/unicore32/kernel/module.o
        arch/unicore32/kernel/module.c: In function 'module_alloc' :
        arch/unicore32/kernel/module.c:34: error: implicit declaration of function '__vmalloc_area'
        arch/unicore32/kernel/module.c:34: warning: return makes pointer from integer without a cast
        make[1]: *** [arch/unicore32/kernel/module.o] Error 1
        make: *** [arch/unicore32/kernel] Error 2
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      df8e4c7d
    • Chen Gang's avatar
      arch/unicore32/kernel/ksyms.c: remove several undefined exported symbols · 4877b60c
      Chen Gang authored
      For 'csum_partial_copy_nocheck()', it has default definition in
      'asm-generic'.
      
      For '__raw_reads?()' and '__raw_writes?()' are used by the drivers
      which no relationship with allmodconfig for unicode32, the related
      modules are:
      
        drivers/mmc/host/omap.c
        drivers/mtd/nand/atmel_nand.c
        drivers/mtd/nand/pxa3xx_nand.c
        drivers/usb/gadget/at91_udc.c
      
      Others are only within some architectures (not kernel wide).
      
      The related error with allmodconfig for unicode32:
      
          CC      arch/unicore32/kernel/ksyms.o
        arch/unicore32/kernel/ksyms.c:29: error: ._backtrace. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:29: error: type defaults to .nt. in declaration of ._backtrace.
        arch/unicore32/kernel/ksyms.c:38: error: .sum_partial_copy_nocheck. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:38: error: type defaults to .nt. in declaration of .sum_partial_copy_nocheck.
        arch/unicore32/kernel/ksyms.c:39: error: ._csum_ipv6_magic. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:39: error: type defaults to .nt. in declaration of ._csum_ipv6_magic.
        arch/unicore32/kernel/ksyms.c:43: error: ._raw_readsb. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:43: error: type defaults to .nt. in declaration of ._raw_readsb.
        arch/unicore32/kernel/ksyms.c:46: error: ._raw_readsw. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:46: error: type defaults to .nt. in declaration of ._raw_readsw.
        arch/unicore32/kernel/ksyms.c:49: error: ._raw_readsl. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:49: error: type defaults to .nt. in declaration of ._raw_readsl.
        arch/unicore32/kernel/ksyms.c:52: error: ._raw_writesb. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:52: error: type defaults to .nt. in declaration of ._raw_writesb.
        arch/unicore32/kernel/ksyms.c:55: error: ._raw_writesw. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:55: error: type defaults to .nt. in declaration of ._raw_writesw.
        arch/unicore32/kernel/ksyms.c:58: error: ._raw_writesl. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:58: error: type defaults to .nt. in declaration of ._raw_writesl.
        arch/unicore32/kernel/ksyms.c:79: error: ._get_user_1. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:79: error: type defaults to .nt. in declaration of ._get_user_1.
        arch/unicore32/kernel/ksyms.c:80: error: ._get_user_2. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:80: error: type defaults to .nt. in declaration of ._get_user_2.
        arch/unicore32/kernel/ksyms.c:81: error: ._get_user_4. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:81: error: type defaults to .nt. in declaration of ._get_user_4.
        arch/unicore32/kernel/ksyms.c:83: error: ._put_user_1. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:83: error: type defaults to .nt. in declaration of ._put_user_1.
        arch/unicore32/kernel/ksyms.c:84: error: ._put_user_2. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:84: error: type defaults to .nt. in declaration of ._put_user_2.
        arch/unicore32/kernel/ksyms.c:85: error: ._put_user_4. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:85: error: type defaults to .nt. in declaration of ._put_user_4.
        arch/unicore32/kernel/ksyms.c:86: error: ._put_user_8. undeclared here (not in a function)
        arch/unicore32/kernel/ksyms.c:86: error: type defaults to .nt. in declaration of ._put_user_8.
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: default avatarXuetao Guan <gxt@mprc.pku.edu.cn>
      4877b60c
  2. 19 Jun, 2014 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 894e552c
      Linus Torvalds authored
      Pull security maintainership update from James Morris:
       "Add Serge Hallyn as security subsystem co-maintainer"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        security: add Serge Hallyn as a maintainer
      894e552c
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 3d09c623
      Linus Torvalds authored
      Pull Xen fixes from David Vrabel:
       "Xen regression and PVH fixes for 3.16-rc1
      
         - fix dom0 PVH memory setup on latest unstable Xen releases
         - fix 64-bit x86 PV guest boot failure on Xen 3.1 and earlier
         - fix resume regression on non-PV (auto-translated physmap) guests"
      
      * tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/grant-table: fix suspend for non-PV guests
        x86/xen: no need to explicitly register an NMI callback
        Revert "xen/pvh: Update E820 to work with PVH (v2)"
        x86/xen: fix memory setup for PVH dom0
      3d09c623
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 92b94417
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "These are primarily bug fixes with a performance improvement patch for
        the GHASH crypto algorithm (which went in during this merging window)
        and dts/defconfig/Kconfig updates.
      
         - ftrace_return_addr() macro fix for arm (introduced earlier via the
           arm64 tree)
         - stack alignment exception entry code fix
         - GHASH crypto algorithm fix and performance improvement
         - CMA buffer limited to 32-bit (until a better way to describe the
           system topology in DT)
         - UAPI sigcontext.h build fix
         - __kernel_old_{gid,uid}_t definitions fix (affecting 32-bit LTP)
         - ptrace fixes (kernel fault and 32-bit arm core dump)
         - pte_mknotpresent() fix
         - dts updates (APM SoC)
         - defconfig and Kconfig update"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: mm: remove broken &= operator from pmd_mknotpresent
        arm64: fix build error in sigcontext.h
        arm64: dts: Add more serial port nodes in APM X-Gene device tree
        arm64/dma: Removing ARCH_HAS_DMA_GET_REQUIRED_MASK macro
        arm64: ptrace: fix empty registers set in prstatus of aarch32 process core
        arm64: uid16: fix __kernel_old_{gid,uid}_t definitions
        arm64: ptrace: change fs when passing kernel pointer to regset code
        arm64: Limit the CMA buffer to 32-bit if ZONE_DMA
        arm/ftrace: fix ftrace_return_addr() to ftrace_return_address()
        arm64/crypto: improve performance of GHASH algorithm
        arm64/crypto: fix data corruption bug in GHASH algorithm
        arm64: defconfig update for LTP
        arm64: ftrace: Fix comment typo 'CONFIG_FUNCTION_GRAPH_FP_TEST'
        arm64: add ARCH_HAS_OPP to allow enabling OPP library
        arm64: restore alphabetic order in Kconfig
        arm64: Bug fix in stack alignment exception
      92b94417
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · c4222e46
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Sparc sparse fixes from Sam Ravnborg"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (67 commits)
        sparc64: fix sparse warnings in int_64.c
        sparc64: fix sparse warning in ftrace.c
        sparc64: fix sparse warning in kprobes.c
        sparc64: fix sparse warning in kgdb_64.c
        sparc64: fix sparse warnings in compat_audit.c
        sparc64: fix sparse warnings in init_64.c
        sparc64: fix sparse warnings in aes_glue.c
        sparc: fix sparse warnings in smp_32.c + smp_64.c
        sparc64: fix sparse warnings in perf_event.c
        sparc64: fix sparse warnings in kprobes.c
        sparc64: fix sparse warning in tsb.c
        sparc64: clean up compat_sigset_t.seta handling
        sparc64: fix sparse "Should it be static?" warnings in signal32.c
        sparc64: fix sparse warnings in sys_sparc32.c
        sparc64: fix sparse warning in pci.c
        sparc64: fix sparse warnings in smp_64.c
        sparc64: fix sparse warning in prom_64.c
        sparc64: fix sparse warning in btext.c
        sparc64: fix sparse warnings in sys_sparc_64.c + unaligned_64.c
        sparc64: fix sparse warning in process_64.c
        ...
      
      Conflicts:
      	arch/sparc/include/asm/pgtable_64.h
      c4222e46
  3. 18 Jun, 2014 18 commits