1. 22 6月, 2013 13 次提交
    • M
      MIPS: ath79: Fix argument for the ap136_pc_init function · 970cb7b9
      Markos Chandras 提交于
      ap136_pci_init expects a u8 pointer as an argument.
      
      Fixes the following build problem on a randconfig:
      arch/mips/ath79/mach-ap136.c:151:2: error:
      too many arguments to function 'ap136_pci_init'
      Signed-off-by: NMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5476/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      970cb7b9
    • D
      MIPS/OCTEON: Override default address space layout. · 9b1f812a
      David Daney 提交于
      OCTEON II cannot execute code in the default CAC_BASE space, so we
      supply a value (0x8000000000000000) that does work.
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5457/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      9b1f812a
    • S
      MIPS: malta: Remove software reset defines from generic header. · b72d9a4e
      Steven J. Hill 提交于
      Remove the software reset register and reset value definitions
      from the 'include/asm/mips-boards/generic.h' header file. Also
      clean up header and whitespace in platform file.
      Signed-off-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5456/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      b72d9a4e
    • S
      MIPS: malta: Move defines of reset registers and values. · 36a29af4
      Steven J. Hill 提交于
      Remove usage of 'include/asm/mips-boards/generic.h' header file.
      Instead, move the defines for SOFTRES_REG and GORESET local to
      the platform file.
      Signed-off-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5455/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      36a29af4
    • S
      MIPS: sead3: Fix ability to perform a soft reset. · 2ddbc4e2
      Steven J. Hill 提交于
      The soft reset register address and reset value to be written are
      incorrect for the SEAD-3 platform. This patch fixes them such that
      the SEAD-3 can actually perform a soft reset instead of causing an
      exception. Also remove usage of 'include/asm/mips-boards/generic.h'
      header file.
      Signed-off-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5454/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      2ddbc4e2
    • A
      MIPS: Loongson: Fix random early boot hang · 2f963bfb
      Aaro Koskinen 提交于
      Some Loongson boards (e.g. Lemote FuLoong mini-PC) use ISA/southbridge
      device (CS5536 general purpose timer) for the timer interrupt. It starts
      running early and is already enabled during the PCI configuration,
      during which there is a small window in pci_read_base() when the register
      access is temporarily disabled. If the timer interrupts at this point,
      the system will hang. Fix this by adding a fixup that keeps the register
      access always enabled.
      
      The hang the patch fixes usually looks like this:
      
      [    0.844000] pci 0000:00:0e.0: [1022:2090] type 00 class 0x060100
      [    0.848000] pci 0000:00:0e.0: reg 10: [io  0xb410-0xb417]
      [    0.852000] pci 0000:00:0e.0: reg 14: [io  0xb000-0xb0ff]
      [    0.856000] pci 0000:00:0e.0: reg 18: [io  0xb380-0xb3bf]
      [   28.140000] BUG: soft lockup - CPU#0 stuck for 23s! [swapper:1]
      [   28.140000] Modules linked in:
      [   28.140000] irq event stamp: 37965
      [   28.140000] hardirqs last  enabled at (37964): [<ffffffff80204c0c>] restore_partial+0x6c/0x13c
      [   28.140000] hardirqs last disabled at (37965): [<ffffffff80204f8c>] handle_int+0x144/0x15c
      [   28.140000] softirqs last  enabled at (24316): [<ffffffff802381f4>] __do_softirq+0x1cc/0x258
      [   28.140000] softirqs last disabled at (24327): [<ffffffff80238420>] do_softirq+0xc8/0xd0
      [   28.140000] Cpu 0
      [   28.140000] $ 0   : 0000000000000000 00000000140044e1 980000009f090000 0000000000000001
      [   28.140000] $ 4   : 980000009f090000 0000000000000000 0000000000000100 03b7fff87fbde011
      [   28.140000] $ 8   : ffffffff812b1928 000000000001e000 043ffff87fbde011 fffffff87fbde011
      [   28.140000] $12   : 000000000000000e ffffffff807a0000 0000000000000698 0000000000000000
      [   28.140000] $16   : 0000000000000002 ffffffff81055e20 ffffffff80786810 0000000000000000
      [   28.140000] $20   : 000000000000000a ffffffff807bc244 ffffffff807e6350 ffffffff80770000
      [   28.140000] $24   : 0000000000000d80 00000000fffedbe0
      [   28.140000] $28   : 980000009f07c000 980000009f07fa10 ffffffff81050000 ffffffff802380f8
      [   28.140000] Hi    : 0000000000d0fc00
      [   28.140000] Lo    : 0000000000f82b40
      [   28.140000] epc   : ffffffff8023810c __do_softirq+0xe4/0x258
      [   28.140000]     Not tainted
      [   28.140000] ra    : ffffffff802380f8 __do_softirq+0xd0/0x258
      [   28.140000] Status: 140044e3    KX SX UX KERNEL EXL IE
      [   28.140000] Cause : 10008400
      [   28.140000] PrId  : 00006303 (ICT Loongson-2)
      Signed-off-by: NAaro Koskinen <aaro.koskinen@iki.fi>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/4958/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      2f963bfb
    • M
      lib/Kconfig.debug: Restrict FRAME_POINTER for MIPS · 25c87eae
      Markos Chandras 提交于
      FAULT_INJECTION_STACKTRACE_FILTER selects FRAME_POINTER but
      that symbol is not available for MIPS.
      
      Fixes the following problem on a randconfig:
      warning: (LOCKDEP && FAULT_INJECTION_STACKTRACE_FILTER && LATENCYTOP &&
       KMEMCHECK) selects FRAME_POINTER which has unmet direct dependencies
      (DEBUG_KERNEL && (CRIS || M68K || FRV || UML || AVR32 || SUPERH || BLACKFIN ||
      MN10300 || METAG) || ARCH_WANT_FRAME_POINTERS)
      Signed-off-by: NMarkos Chandras <markos.chandras@imgtec.com>
      Acked-by: NSteven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5441/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      25c87eae
    • D
      MIPS: Octeon: Don't clobber bootloader data structures. · d949b4fe
      David Daney 提交于
      Commit abe77f90 (MIPS: Octeon: Add kexec and kdump support) added a
      bootmem region for the kernel image itself.  The problem is that this
      is rounded up to a 0x100000 boundary, which is memory that may not be
      owned by the kernel.  Depending on the kernel's configuration based
      size, this 'extra' memory may contain data passed from the bootloader
      to the kernel itself, which if clobbered makes the kernel crash in
      various ways.
      
      The fix: Quit rounding the size up, so that we only use memory
      assigned to the kernel.
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Cc: <stable@vger.kernel.org>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5449/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      d949b4fe
    • R
      MIPS: IP27: Fix build error if CONFIG_PCI=y and CONFIG_NUMA disabled. · 4f675e8a
      Ralf Baechle 提交于
      Then <asm-generic/topology.h> will define cpp macro as default definition
      for pcibus_to_node resulting in:
      
        CC      arch/mips/pci/pci-ip27.o
      arch/mips/pci/pci-ip27.c:220:7: error: expected identifier or ‘(’ before ‘void’
      arch/mips/pci/pci-ip27.c:220:12: error: expected ‘)’ before ‘(’ token
      make[1]: *** [arch/mips/pci/pci-ip27.o] Error 1
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      4f675e8a
    • R
      MIPS: IP27: Fix build errors with CONFIG_PCI disabled. · 73ec78b0
      Ralf Baechle 提交于
        LD      init/built-in.o
      arch/mips/built-in.o: In function `xtalk_probe_node':
      (.cpuinit.text+0x67c): undefined reference to `bridge_probe'
      arch/mips/built-in.o: In function `xtalk_probe_node':
      (.cpuinit.text+0x7d8): undefined reference to `bridge_probe'
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      73ec78b0
    • R
      MIPS: IP27: Fix build errors with CONFIG_PCI disabled. · 8ea2b8b6
      Ralf Baechle 提交于
        LD      init/built-in.o
      arch/mips/built-in.o: In function `startup_bridge_irq':
      ip27-irq.c:(.text+0x434): undefined reference to `irq_to_slot'
      ip27-irq.c:(.text+0x43c): undefined reference to `irq_to_slot'
      ip27-irq.c:(.text+0x460): undefined reference to `irq_to_bridge'
      ip27-irq.c:(.text+0x464): undefined reference to `irq_to_bridge'
      arch/mips/built-in.o: In function `shutdown_bridge_irq':
      ip27-irq.c:(.text+0x564): undefined reference to `irq_to_bridge'
      ip27-irq.c:(.text+0x56c): undefined reference to `irq_to_bridge'
      ip27-irq.c:(.text+0x5a0): undefined reference to `irq_to_slot'
      ip27-irq.c:(.text+0x5a4): undefined reference to `irq_to_slot'
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      8ea2b8b6
    • R
      MIPS: IP27: Fix build error with CONFIG_MAPPED_KERNEL · 28963b1e
      Ralf Baechle 提交于
      Some of the TLB bit definitions in <asm/pgtable-bits.h> have become rather
      complex and are no longer usable from assembler resulting in an
      explosion like this:
      
        AS      arch/mips/kernel/head.o
      arch/mips/kernel/head.S: Assembler messages:
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: Illegal operands `li $12,(((1<<((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1))|(1<<(((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1))|(5<<(((((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1)+1)+1)))>>6)'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: missing ')'
      arch/mips/kernel/head.S:147: Error: Illegal operands `li $12,(((1<<((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1))|(1<<(((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1))|(1<<((((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1)+1))|(5<<(((((cpu_has_rixi?(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1))))+1:(cpu_has_rixi?((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))+1:((((((cpu_has_rixi?(0):(0)+1)+1)+1)+1)))))+1)+1)+1)+1)))>>6)'
      make[2]: *** [arch/mips/kernel/head.o] Error 1
      
      Since now MAPPED_KERNEL_SETUP_TLB is in platform-specific code it's safe
      to hardcode the TLB bits there.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      28963b1e
    • R
      MIPS: Move gas macro MAPPED_KERNEL_SETUP_TLB to IP27-specific code. · 23946ef1
      Ralf Baechle 提交于
      It's IP27-specific and can only cause trouble in head.S.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      23946ef1
  2. 20 6月, 2013 2 次提交
  3. 18 6月, 2013 6 次提交
    • D
      MIPS: Octeon: Fix build error if CONFIG_BUG=n · 368b0625
      David Daney 提交于
        CC      init/do_mounts.o
      In file included from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/dma-mapping.h:10:0,
                       from include/linux/dma-mapping.h:76,
                       from include/linux/skbuff.h:33,
                       from include/linux/icmpv6.h:4,
                       from include/linux/ipv6.h:59,
                       from include/net/ipv6.h:16,
                       from include/linux/sunrpc/clnt.h:26,
                       from include/linux/nfs_fs.h:30,
                       from init/do_mounts.c:30:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:24:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem_page’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:30:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_addr_to_phys’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:36:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_supported’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:47:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_mapping_error’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:63:1: warning: no return statement in function returning non-void [-Wreturn-type]
        LD      init/mounts.o
        CC      init/init_task.o
      In file included from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/dma-mapping.h:10:0,
                       from include/linux/dma-mapping.h:76,
                       from include/linux/skbuff.h:33,
                       from include/linux/netfilter.h:5,
                       from include/net/netns/netfilter.h:5,
                       from include/net/net_namespace.h:20,
                       from include/linux/init_task.h:14,
                       from init/init_task.c:1:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:24:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem_page’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:30:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_addr_to_phys’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:36:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_supported’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:47:1: warning: no return statement in function returning non-void [-Wreturn-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_mapping_error’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:63:1: warning: no return statement in function returning non-void [-Wreturn-type]
        LD      init/built-in.o
        CC      arch/mips/cavium-octeon/setup.o
      In file included from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/dma-mapping.h:10:0,
                       from include/linux/dma-mapping.h:76,
                       from include/asm-generic/pci-dma-compat.h:7,
                       from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/pci.h:129,
                       from include/linux/pci.h:1451,
                       from /home/ralf/src/linux/linux-mips/arch/mips/include/asm/octeon/pci-octeon.h:12,
                       from arch/mips/cavium-octeon/setup.c:41:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:24:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_map_dma_mem_page’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:30:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_addr_to_phys’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:36:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_supported’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:47:1: error: no return statement in function returning non-void [-Werror=return-type]
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h: In function ‘plat_dma_mapping_error’:
      /home/ralf/src/linux/linux-mips/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h:63:1: error: no return statement in function returning non-void [-Werror=return-type]
      cc1: all warnings being treated as errors
      make[2]: *** [arch/mips/cavium-octeon/setup.o] Error 1
      make[1]: *** [arch/mips/cavium-octeon] Error 2
      make: *** [arch/mips] Error 2
      
      [ralf@linux-mips.org: while at it, also include <linux/bug.h> directly.]
      Signed-off-by: NDavid Daney <david.daney@cavium.com>
      Patchwork: https://patchwork.linux-mips.org/patch/5519/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      368b0625
    • R
      MIPS: Oceton: Fix build error. · 39205750
      Ralf Baechle 提交于
      If CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB, CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION,
      CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT and
      CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT are all undefined:
      
      arch/mips/cavium-octeon/setup.c: In function ‘prom_init’:
      arch/mips/cavium-octeon/setup.c:715:12: error: unused variable ‘ebase’ [-Werror=unused-variable]
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      39205750
    • R
      c8d5c685
    • R
      cfceb5e2
    • R
      cfb9a4e7
    • R
      f746caa3
  4. 13 6月, 2013 2 次提交
  5. 11 6月, 2013 2 次提交
  6. 10 6月, 2013 1 次提交
  7. 09 6月, 2013 13 次提交
  8. 08 6月, 2013 1 次提交
    • L
      Merge tag 'trace-fixes-v3.10-rc3-v3' of... · 14d0ee05
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v3.10-rc3-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "This contains 4 fixes.
      
        The first two fix the case where full RCU debugging is enabled,
        enabling function tracing causes a live lock of the system.  This is
        due to the added debug checks in rcu_dereference_raw() that is used by
        the function tracer.  These checks are also traced by the function
        tracer as well as cause enough overhead to the function tracer to slow
        down the system enough that the time to finish an interrupt can take
        longer than when the next interrupt is triggered, causing a live lock
        from the timer interrupt.
      
        Talking this over with Paul McKenney, we came up with a fix that adds
        a new rcu_dereference_raw_notrace() that does not perform these added
        checks, and let the function tracer use that.
      
        The third commit fixes a failed compile when branch tracing is
        enabled, due to the conversion of the trace_test_buffer() selftest
        that the branch trace wasn't converted for.
      
        The forth patch fixes a bug caught by the RCU lockdep code where a
        rcu_read_lock() is performed when rcu is disabled (either going to or
        from idle, or user space).  This happened on the irqsoff tracer as it
        calls task_uid().  The fix here was to use current_uid() when possible
        that doesn't use rcu locking.  Which luckily, is always used when
        irqsoff calls this code."
      
      * tag 'trace-fixes-v3.10-rc3-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Use current_uid() for critical time tracing
        tracing: Fix bad parameter passed in branch selftest
        ftrace: Use the rcu _notrace variants for rcu_dereference_raw() and friends
        rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
      14d0ee05