1. 30 Jul, 2012 1 commit
  2. 20 Jul, 2012 1 commit
  3. 16 Jul, 2012 7 commits
  4. 15 Jul, 2012 13 commits
  5. 12 Jul, 2012 2 commits
  6. 24 Jun, 2012 1 commit
    • Greg Ungerer's avatar
      m68knommu: define a local devm_clk_get() function · 19a1d332
      Greg Ungerer authored
      Commit f4d40de3 ("net fec: do not depend
      on grouped clocks") breaks compilation of the FEC driver for non iMX
      platforms in linux-3.5-rc1. For example when compiling for ColdFire I get:
      
            LD      vmlinux
          drivers/built-in.o: In function `fec_probe':
          fec.c:(.devinit.text+0x1e0): undefined reference to `devm_clk_get'
      
      Define a simple devm_clk_get() function for the m68knommu architecture.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      19a1d332
  7. 11 Jun, 2012 5 commits
    • Greg Ungerer's avatar
      m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types · 70c778f7
      Greg Ungerer authored
      The assembler entry code calls directly to the syscall_trace_enter() and
      syscall_trace_leave() functions. But currently they are conditionaly
      compiled out for the non-MMU classic m68k CPU types (so 68328 for example),
      resulting in a link error:
      
            LD      vmlinux
          arch/m68k/platform/68328/built-in.o: In function `do_trace':
          (.text+0x1c): undefined reference to `syscall_trace_enter'
          arch/m68k/platform/68328/built-in.o: In function `do_trace':
          (.text+0x4c): undefined reference to `syscall_trace_leave'
      
      Change the conditional check that includes these functions to be true for
      the !defined(CONFIG_MMU) case as well.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      70c778f7
    • Greg Ungerer's avatar
      m68knommu: fix 68360 local setting of timer interrupt handler · 1b461d76
      Greg Ungerer authored
      Compiling for 68360 based targets fails with:
      
          arch/m68k/platform/68360/config.c: In function ‘hw_tick’:
          arch/m68k/platform/68360/config.c:55:2: error: implicit declaration of function ‘arch_timer_interrupt’
          arch/m68k/platform/68360/config.c: At top level:
          arch/m68k/platform/68360/config.c:64:6: error: conflicting types for ‘hw_timer_init’
          arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here
      
      Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
      So process and call the "handler" arg that is now passed into that
      hw_timer_init() function.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      1b461d76
    • Greg Ungerer's avatar
      m68knommu: fix 68328 local setting of timer interrupt handler · dc5588ae
      Greg Ungerer authored
      Compiling for 68328 based targets fails with:
      
          arch/m68k/platform/68328/timers.c: In function ‘hw_tick’:
          arch/m68k/platform/68328/timers.c:65:2: error: implicit declaration of function ‘arch_timer_interrupt’
          arch/m68k/platform/68328/timers.c: At top level:
          arch/m68k/platform/68328/timers.c:102:6: error: conflicting types for ‘hw_timer_init’
          arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here
      
      Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
      So process and call the "handler" arg that is now passed into that
      hw_timer_init() function.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      dc5588ae
    • Greg Ungerer's avatar
      m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types · b13b3f51
      Greg Ungerer authored
      When building for non-MMU based classic 68k CPU types (like the 68328 for
      example) you get a compilation error:
      
        CC      arch/m68k/kernel/time.o
      arch/m68k/kernel/time.c:91:5: error: redefinition of ‘arch_gettimeoffset’
      include/linux/time.h:145:19: note: previous definition of ‘arch_gettimeoffset’ was here
      
      The arch_gettimeoffset() code is included when building for these CPU types,
      but it shouldn't be. Those machine types do not have
      CONFIG_ARCH_USES_GETTIMEOFFSET set.
      
      The fix is simply to conditionally include the arch_gettimeoffset() code on
      that same config setting that specifies its use or not.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      b13b3f51
    • Steven King's avatar
      m68knommu: m528x qspi definition fix · f75b0d07
      Steven King authored
      The consolidation of the qspi code missed a definition for 528x.
      Signed-off-by: default avatarSteven King <sfking@fdwdc.com>
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      f75b0d07
  8. 06 Jun, 2012 1 commit
  9. 01 Jun, 2012 5 commits
  10. 30 May, 2012 1 commit
  11. 23 May, 2012 1 commit
  12. 21 May, 2012 2 commits
    • Al Viro's avatar
      m68k: add TIF_NOTIFY_RESUME and handle it. · a54f1655
      Al Viro authored
      TIF_NOTIFY_RESUME added (as bit 5).  That way nommu glue needs no changes at
      all; mmu one needs just to replace jmi do_signal_return to jne do_signal_return
      There we have flags shifted up, until bit 6 (SIGPENDING) is in MSBit; instead
      of checking that MSBit is set (jmi) we check that MSBit or something below it
      is set (jne); bits 0..4 are never set, so that's precisely "bit 6 or bit 5 is
      set".
      
      Usual handling of NOTIFY_RESUME/SIGPENDING is done in do_notify_resume(); glue
      calls it instead of do_signal().
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      a54f1655
    • Matt Fleming's avatar
      m68k: use set_current_blocked() and block_sigmask() · 43a35995
      Matt Fleming authored
      As described in e6fa16ab ("signal: sigprocmask() should do
      retarget_shared_pending()") the modification of current->blocked is
      incorrect as we need to check whether the signal we're about to block is
      pending in the shared queue.
      
      Also, use the new helper function introduced in commit 5e6292c0
      ("signal: add block_sigmask() for adding sigmask to current->blocked")
      which centralises the code for updating current->blocked after
      successfully delivering a signal and reduces the amount of duplicate code
      across architectures.  In the past some architectures got this code wrong,
      so using this helper function should stop that from happening again.
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      43a35995