1. 16 6月, 2013 20 次提交
    • J
      h8300: add missing definition for read_barries_depends() · c805a5b7
      Jiang Liu 提交于
      Add missing definition for read_barries_depends() for h8300 to fix error:
      kernel/task_work.c: In function 'task_work_cancel':
      kernel/task_work.c:38:3: error: implicit declaration of function 'read_barrier_depends' [-Werror=implicit-function-declaration]
      cc1: some warnings being treated as errors
      make[1]: *** [kernel/task_work.o] Error 1
      make: *** [kernel] Error 2
      
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Cc: David Howells <dhowells@redhat.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: NJiang Liu <jiang.liu@huawei.com>
      c805a5b7
    • G
      frv: head.S - Remove commented-out initialization code · c0b81e00
      Geert Uytterhoeven 提交于
      The commented-out calls to processor_init() and unit_init() seem to have
      been copied from mn10300, when starting the frv port. Remove them.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      c0b81e00
    • G
      cris: Wire up asm-generic/vga.h · e3ccbc34
      Geert Uytterhoeven 提交于
      When compiling several DRM related files:
      
      include/video/vga.h:22:21: fatal error: asm/vga.h: No such file or directory
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      e3ccbc34
    • G
    • G
      35356292
    • G
      cris: Switch cris to drivers/Kconfig · acf83630
      Geert Uytterhoeven 提交于
      allmodconfig:
      
      drivers/video/console/fonts.c:71:2: error: #error No fonts configured.
      
      This is caused by cris not using the generic drivers/Kconfig, and thus not
      traversing drivers/video/console/Kconfig.
      As the build system does traverse drivers/video/console/Makefile, fonts.c
      was compiled with an inconsistent configuration.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      acf83630
    • G
      cris: Wire up asm-generic/xor.h · cd07f4f3
      Geert Uytterhoeven 提交于
      crypto/xor.c:25:21: fatal error: asm/xor.h: No such file or directory
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NJesper Nilsson <jesper.nilsson@axis.com>
      cd07f4f3
    • G
    • G
      cris: Provide inb_p() and outb_p() · 0dad16fd
      Geert Uytterhoeven 提交于
      drivers/block/hd.c: In function 'check_status':
      drivers/block/hd.c:256:2: error: implicit declaration of function 'inb_p' [-Werror=implicit-function-declaration]
      drivers/block/hd.c: In function 'controller_ready':
      drivers/block/hd.c:297:3: error: implicit declaration of function 'outb_p' [-Werror=implicit-function-declaration]
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      0dad16fd
    • G
      cris: Provide <asm/kvm_para.h> · 95f40de9
      Geert Uytterhoeven 提交于
      In file included from include/linux/kvm_para.h:4:0,
                       from kernel/watchdog.c:28:
      include/uapi/linux/kvm_para.h:26:26: fatal error: asm/kvm_para.h: No such file or directory
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      95f40de9
    • G
      cris/kgdb: Remove sections protected by #ifdef PROCESS_SUPPORT · 6a89a9db
      Geert Uytterhoeven 提交于
      When enabled, it doesn't build anyway:
      
      arch/cris/arch-v10/kernel/kgdb.c: In function 'copy_registers_from_stack':
      arch/cris/arch-v10/kernel/kgdb.c:631:2: error: unknown type name 'stack_registers'
      arch/cris/arch-v10/kernel/kgdb.c:631:24: error: 'stack_registers' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c:631:24: note: each undeclared identifier is reported only once for each function it appears in
      arch/cris/arch-v10/kernel/kgdb.c:631:41: error: expected expression before ')' token
      arch/cris/arch-v10/kernel/kgdb.c:635:11: error: request for member 'r' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:636:29: error: 'stack_list' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c:637:16: error: request for member 'pc' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:638:18: error: request for member 'dccr' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:639:17: error: request for member 'srp' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c: In function 'copy_registers_to_stack':
      arch/cris/arch-v10/kernel/kgdb.c:648:2: error: unknown type name 'stack_registers'
      arch/cris/arch-v10/kernel/kgdb.c:648:24: error: 'stack_registers' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c:648:41: error: expected expression before ')' token
      arch/cris/arch-v10/kernel/kgdb.c:652:4: error: request for member 'r' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:654:3: error: request for member 'pc' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:655:3: error: request for member 'dccr' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:656:3: error: request for member 'srp' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c: In function 'write_stack_register':
      arch/cris/arch-v10/kernel/kgdb.c:702:2: error: unknown type name 'stack_registers'
      arch/cris/arch-v10/kernel/kgdb.c:702:24: error: 'stack_registers' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c:702:41: error: expected expression before ')' token
      arch/cris/arch-v10/kernel/kgdb.c:707:4: error: request for member 'r' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:710:3: error: 'stack_list' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c:713:4: error: request for member 'pc' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:716:4: error: request for member 'srp' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c:719:4: error: request for member 'dccr' in something not a structure or union
      arch/cris/arch-v10/kernel/kgdb.c: In function 'stub_is_stopped':
      arch/cris/arch-v10/kernel/kgdb.c:827:36: error: 'pos' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c: In function 'handle_exception':
      arch/cris/arch-v10/kernel/kgdb.c:1064:40: error: 'number_of_tasks' undeclared (first use in this function)
      arch/cris/arch-v10/kernel/kgdb.c:1125:8: error: implicit declaration of function 'os_is_started' [-Werror=implicit-function-declaration]
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      6a89a9db
    • G
      cris/kgdb: Fix buffer overflow in getpacket() · de666cf0
      Geert Uytterhoeven 提交于
      arch/cris/arch-v10/kernel/kgdb.c: In function 'handle_exception':
      arch/cris/arch-v10/kernel/kgdb.c:534:17: warning: array subscript is above array bounds [-Warray-bounds]
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      de666cf0
    • G
      cris/kgdb: Remove obsolete USED*() macros · e42e3980
      Geert Uytterhoeven 提交于
      handle_exception and internal_stack are now global
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      e42e3980
    • G
      cris/kgdb: Make symbols used from asm global · 6408ac49
      Geert Uytterhoeven 提交于
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_breakpoint':
      (.text+0x2c3e): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_breakpoint':
      (.text+0x2c48): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_breakpoint':
      (.text+0x2c50): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_breakpoint':
      (.text+0x2c58): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_breakpoint':
      (.text+0x2c60): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o:(.text+0x2c68): more undefined references to `reg' follow
      arch/cris/arch-v10/kernel/built-in.o: In function `is_static':
      kgdb.c:(.text+0x2d46): undefined reference to `internal_stack'
      kgdb.c:(.text+0x2d4e): undefined reference to `handle_exception'
      kgdb.c:(.text+0x2d54): undefined reference to `reg'
      kgdb.c:(.text+0x2d5c): undefined reference to `reg'
      kgdb.c:(.text+0x2d64): undefined reference to `reg'
      kgdb.c:(.text+0x2d6c): undefined reference to `reg'
      kgdb.c:(.text+0x2d74): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o:kgdb.c:(.text+0x2d7c): more undefined references to `reg' follow
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_serial':
      (.text+0x2ef6): undefined reference to `internal_stack'
      arch/cris/arch-v10/kernel/built-in.o: In function `kgdb_handle_serial':
      (.text+0x2efe): undefined reference to `handle_exception'
      arch/cris/arch-v10/kernel/built-in.o: In function `goback':
      kgdb.c:(.text+0x2f04): undefined reference to `reg'
      kgdb.c:(.text+0x2f0c): undefined reference to `reg'
      kgdb.c:(.text+0x2f14): undefined reference to `reg'
      kgdb.c:(.text+0x2f1c): undefined reference to `reg'
      kgdb.c:(.text+0x2f24): undefined reference to `reg'
      arch/cris/arch-v10/kernel/built-in.o:kgdb.c:(.text+0x2f2c): more undefined references to `reg' follow
      
      Make reg, internal_stack, and handle_exception global to fix this.
      Rename reg to cris_reg as it's a too generic name for a global symbol.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      6408ac49
    • G
      cris/kgdb: Use #ifdef PROCESS_SUPPORT where needed · d6c97e1c
      Geert Uytterhoeven 提交于
      arch/cris/arch-v10/kernel/kgdb.c:354:12: warning: 'current_thread_c' defined but not used [-Wunused-variable]
      arch/cris/arch-v10/kernel/kgdb.c:355:12: warning: 'current_thread_g' defined but not used [-Wunused-variable]
      arch/cris/arch-v10/kernel/kgdb.c:359:18: warning: 'reg_g' defined but not used [-Wunused-variable]
      arch/cris/arch-v10/kernel/kgdb.c:622:1: warning: 'copy_registers' defined but not used [-Wunused-function]
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      d6c97e1c
    • G
      cris/kgdb: Kill forward declarations for static functions · 4bf01dda
      Geert Uytterhoeven 提交于
      Move some functions around and kill forward declarations for static
      functions. This fixes:
      
      arch/cris/arch-v10/kernel/kgdb.c:255:13: warning: 'copy_registers_from_stack' declared 'static' but never defined [-Wunused-function]
      arch/cris/arch-v10/kernel/kgdb.c:259:13: warning: 'copy_registers_to_stack' declared 'static' but never defined [-Wunused-function]
      arch/cris/arch-v10/kernel/kgdb.c:267:12: warning: 'write_stack_register' declared 'static' but never defined [-Wunused-function]
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      4bf01dda
    • G
      4bb77a9d
    • G
      cris/kgdb: Properly split long lines in asm · 7fc6a8ba
      Geert Uytterhoeven 提交于
      arch/cris/arch-v10/kernel/kgdb.c:1273:6: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1359:1: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1370:6: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1457:1: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1273:6: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1273:1: error: missing terminating " character
      arch/cris/arch-v10/kernel/kgdb.c:1274:3: error: expected string literal before '.' token
      arch/cris/arch-v10/kernel/kgdb.c:1359:1: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1359:1: error: missing terminating " character
      arch/cris/arch-v10/kernel/kgdb.c:1370:6: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1370:1: error: missing terminating " character
      arch/cris/arch-v10/kernel/kgdb.c:1457:1: warning: missing terminating " character [enabled by default]
      arch/cris/arch-v10/kernel/kgdb.c:1457:1: error: missing terminating " character
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      7fc6a8ba
    • G
      7e973d79
    • G
      avr32: atmel_default_console_device depends on CONFIG_SERIAL_ATMEL · b5cc4891
      Geert Uytterhoeven 提交于
      allnoconfig:
      
      arch/avr32/mach-at32ap/built-in.o: In function `at32_select_gpio':
      (.init.text+0x548): undefined reference to `atmel_default_console_device'
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NHans-Christian Egtvedt <egtvedt@samfundet.no>
      b5cc4891
  2. 09 6月, 2013 13 次提交
  3. 08 6月, 2013 7 次提交
    • 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
    • R
      Revert "ACPI / scan: do not match drivers against objects having scan handlers" · ea7f6656
      Rafael J. Wysocki 提交于
      Commit 9f29ab11 ("ACPI / scan: do not match drivers against objects
      having scan handlers") introduced a boot regression on Tony's ia64 HP
      rx2600.  Tony says:
      
        "It panics with the message:
      
         Kernel panic - not syncing: Unable to find SBA IOMMU: Try a generic or DIG kernel
      
         [...] my problem comes from arch/ia64/hp/common/sba_iommu.c
         where the code in sba_init() says:
      
              acpi_bus_register_driver(&acpi_sba_ioc_driver);
              if (!ioc_list) {
      
         but because of this change we never managed to call ioc_init()
         so ioc_list doesn't get set up, and we die."
      
      Revert it to avoid this breakage and we'll fix the problem it attempted
      to address later.
      Reported-by: NTony Luck <tony.luck@gmail.com>
      Cc: 3.9+ <stable@vger.kernel.org>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ea7f6656
    • O
      Merge tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 090878aa
      Olof Johansson 提交于
      From Shawn Guo, mxs fixes for 3.10:
      
      - Since the time we move to MULTI_IRQ_HANDLER, the 0x7f polling for no
        interrupt in icoll_handle_irq() becomes insane, because 0x7f is an
        valid interrupt number, the irq of gpio bank 0.  That unnecessary
        polling results in the driver not detecting when irq 0x7f is active
        which makes the machine effectively dead lock.  The fix removes the
        interrupt poll loop and allows usage of gpio0 interrupt without an
        infinite loop.
      
      * tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: mxs: icoll: Fix interrupts gpio bank 0
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      090878aa
    • O
      Merge tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 3d0d8b91
      Olof Johansson 提交于
      From Shawn Guo, imx fixes for 3.10, take 2:
      
      - One device tree fix for all spi node to have per clock added.
        The clock is needed by spi driver to calculate bit rate divisor.
        The spi node in the current device trees either does not have the
        clock or is defined as dummy clock, in which case the driver probe
        will fail or spi will run at a wrong bit rate.
      
      - Two imx6q clock fixes, which correct axi_sels and ldb_di_sels.
      
      * tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: imx: clk-imx6q: AXI clock select index is incorrect
        ARM: dts: imx: fix clocks for cspi
        ARM i.MX6q: fix for ldb_di_sels
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      3d0d8b91
    • D
      ARM: exynos: add debug_ll_io_init() call in exynos_init_io() · 9c1fcdcc
      Doug Anderson 提交于
      If the early MMU mapping of the UART happens to get booted out of the
      TLB between the start of paging_init() and when we finally re-add the
      UART at the very end of s3c_init_cpu(), we'll get a hang at bootup if
      we've got early_printk enabled.  Avoid this hang by calling
      debug_ll_io_init() early.
      
      Without this patch, you can reliably reproduce a hang when early
      printk is enabled by adding flush_tlb_all() at the start of
      exynos_init_io().  After this patch the hang goes away.
      Signed-off-by: NDoug Anderson <dianders@chromium.org>
      Acked-by: NKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      9c1fcdcc
    • O
      Merge tag 'renesas-fixes-for-v3.10' of... · fb565ff7
      Olof Johansson 提交于
      Merge tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      From Simon Horman, Renesas ARM based SoC fixes for v3.10:
      - Correction to USB OVC and PENC pin groupings on r8a7779 SoC.
        This avoids conflicts when the USB_OVCn pins are used by another function.
        This has been observed to be a problem in v3.10-rc1.
      - Update CMT clock rating for sh73a0 SoC to resolve boot failure
        on kzm9g-reference. This resolves a regression between v3.9 and v3.10-rc1.
      
      * tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: sh73a0: Update CMT clockevent rating to 80
        sh-pfc: r8a7779: Don't group USB OVC and PENC pins
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      fb565ff7
    • T
      ARM: EXYNOS: uncompress - print debug messages if DEBUG_LL is defined · 437d8ac5
      Tushar Behera 提交于
      Printing low-level debug messages make an assumption that the specified
      UART port has been preconfigured by the bootloader. Incorrectly
      specified UART port results in system getting stalled while printing the
      message "Uncompressing Linux... done, booting the kernel"
      This UART port number is specified through S3C_LOWLEVEL_UART_PORT. Since
      the UART port might different for different board, it is not possible to
      specify it correctly for every board that use a common defconfig file.
      
      Calling this print subroutine only when DEBUG_LL fixes the problem. By
      disabling DEBUG_LL in default config file, we would be able to boot
      multiple boards with different default UART ports.
      
      With this current approach, we miss the print "Uncompressing Linux...
      done, booting the kernel." when DEBUG_LL is not defined.
      Signed-off-by: NTushar Behera <tushar.behera@linaro.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      437d8ac5