linux-stable.git/arch/m68k/kernel/time.c, branch linux-3.7.y

m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR

2012-08-18T13:16:00+00:00

The semantic patch that makes this change is available
in scripts/coccinelle/api/ptr_ret.cocci.

More information about semantic patching is available at
http://coccinelle.lip6.fr/

Signed-off-by: Thomas Meyer 
Signed-off-by: Geert Uytterhoeven

m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types

2012-06-12T01:58:26+00:00

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: Greg Ungerer 
Acked-by: Geert Uytterhoeven

m68k: remove dead timer code

2012-03-04T23:43:04+00:00

The set_rtc_mmss() function is defined "static inline" but is never used
in this file. Remove it.

Signed-off-by: Greg Ungerer 
Acked-by: Geert Uytterhoeven

m68k: merge mmu and non-mmu versions of time.c

2012-03-04T23:43:04+00:00

There is only trivial differences between the mmu time_mm.c and non-mmu
time_no.c files. Merge them back into a single time.c.

Signed-off-by: Greg Ungerer 
Acked-by: Geert Uytterhoeven

m68k: ColdFire with MMU enabled uses same clocking code as non-MMU

2011-12-30T00:20:43+00:00

We want to use the same timer support code for ColdFire CPU's when
running with MMU enabled or not. So use the same time_no.c code even
when the MMU is enabled for ColdFire. This also means we do not want
CONFIG_ARCH_USES_GETTIMEOFFSET set, since that code is only in time_mm.c.

Signed-off-by: Greg Ungerer 
Acked-by: Matt Waddel 
Acked-by: Kurt Mahan 
Acked-by: Geert Uytterhoeven

m68k: merge m68k and m68knommu arch directories

2011-03-25T04:05:13+00:00

There is a lot of common code that could be shared between the m68k
and m68knommu arch branches. It makes sense to merge the two branches
into a single directory structure so that we can more easily share
that common code.

This is a brute force merge, based on a script from Stephen King
, which was originally written by Arnd Bergmann
.

> The script was inspired by the script Sam Ravnborg used to merge the
> includes from m68knommu. For those files common to both arches but
> differing in content, the m68k version of the file is renamed to
> _mm. and the m68knommu version of the file is moved into the
> corresponding m68k directory and renamed _no. and a small
> wrapper file . is used to select between the two version. Files
> that are common to both but don't differ are removed from the m68knommu
> tree and files and directories that are unique to the m68knommu tree are
> moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
>
> To select between the the versions of the files, the wrapper uses
>
> #ifdef CONFIG_MMU
> #include _mm.
> #else
> #include _no.
> #endif

On top of this file merge I have done a simplistic merge of m68k and
m68knommu Kconfig, which primarily attempts to keep existing options and
menus in place. Other than a handful of options being moved it produces
identical .config outputs on m68k and m68knommu targets I tested it on.

With this in place there is now quite a bit of scope for merge cleanups
in future patches.

Signed-off-by: Greg Ungerer

m68k: Switch do_timer() to xtime_update()

2011-01-31T13:55:46+00:00

xtime_update() properly takes the xtime_lock

Signed-off-by: Torben Hohn 
Cc: Sam Creasey 
Cc: Peter Zijlstra 
Cc: johnstul@us.ibm.com
Cc: Roman Zippel 
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
Cc: Geert Uytterhoeven 
Cc: Greg Ungerer 
LKML-Reference: <20110127150006.23248.71790.stgit@localhost>
Signed-off-by: Thomas Gleixner

m68k/m68knommu: Remove dead SMP config option

2010-10-22T07:43:23+00:00

CONFIG_SMP doesn't exist in Kconfig (for this architecure), therefore
remove all references to it from the source.

Signed-off-by: Christian Dietrich 
Signed-off-by: Geert Uytterhoeven

m68k: Convert m68k to use read/update_persistent_clock

2010-03-13T00:14:13+00:00

This patch converts the m68k architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.

I have not built or tested this patch, so help from arch maintainers
would be appreciated.

Signed-off-by: John Stultz 
Cc: Geert Uytterhoeven 
Cc: Andrew Morton 
LKML-Reference: <1267675049-12337-12-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner

m68k: convert to use arch_gettimeoffset()

2009-09-22T14:17:43+00:00

Convert m68k to use GENERIC_TIME via the arch_getoffset() infrastructure,
reducing the amount of arch specific code we need to maintain.

I've taken my best swing at converting this, but I'm not 100% confident
I got it right. My cross-compiler is now out of date (gcc4.2) so I
wasn't able to  check if it compiled. Any assistance from arch
maintainers or testers to get this merged would be great.

Signed-off-by: John Stultz 
Cc: Geert Uytterhoeven 
Cc: Roman Zippel 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds