1. 20 6月, 2014 7 次提交
    • C
      arch/unicore32/kernel/clock.c: add readl() and writel() for 'PM_' macros · db7ef289
      Chen Gang 提交于
      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: NChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: NXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: NXuetao Guan <gxt@mprc.pku.edu.cn>
      db7ef289
    • C
      arch/unicore32/kernel/module.c: use __vmalloc_node_range() instead of __vmalloc_area() · df8e4c7d
      Chen Gang 提交于
      __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: NChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: NXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: NXuetao Guan <gxt@mprc.pku.edu.cn>
      df8e4c7d
    • C
      arch/unicore32/kernel/ksyms.c: remove several undefined exported symbols · 4877b60c
      Chen Gang 提交于
      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: NChen Gang <gang.chen.5i5j@gmail.com>
      Acked-by: NXuetao Guan <gxt@mprc.pku.edu.cn>
      Signed-off-by: NXuetao Guan <gxt@mprc.pku.edu.cn>
      4877b60c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 894e552c
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 3d09c623
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 92b94417
      Linus Torvalds 提交于
      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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · c4222e46
      Linus Torvalds 提交于
      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
  2. 18 6月, 2014 23 次提交
  3. 17 6月, 2014 4 次提交
  4. 16 6月, 2014 6 次提交