]> err.no Git - linux-2.6/commit
powerpc: Merge time.c and asm/time.h.
authorPaul Mackerras <paulus@samba.org>
Wed, 19 Oct 2005 23:23:26 +0000 (09:23 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 19 Oct 2005 23:23:26 +0000 (09:23 +1000)
commitf2783c15007468c14972e2617db51e9affc7fad9
tree6c8f57ee8e5cdaeb810a3ccf7f697576a7df7615
parent03f88e9f7145b03fd0d855918d54a3bf5342ac5e
powerpc: Merge time.c and asm/time.h.

We now use the merged time.c for both 32-bit and 64-bit compilation
with ARCH=powerpc, and for ARCH=ppc64, but not for ARCH=ppc32.
This removes setup_default_decr (folds its function into time_init)
and moves wakeup_decrementer into time.c.  This also makes an
asm-powerpc/rtc.h.

Signed-off-by: Paul Mackerras <paulus@samba.org>
17 files changed:
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/misc_32.S
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/time.c [moved from arch/ppc64/kernel/time.c with 72% similarity]
arch/powerpc/platforms/powermac/cpufreq.c
arch/powerpc/platforms/powermac/time.c
arch/ppc/kernel/Makefile
arch/ppc/kernel/time.c
arch/ppc64/kernel/Makefile
arch/ppc64/kernel/pmac_time.c
arch/ppc64/kernel/setup.c
drivers/macintosh/via-pmu.c
include/asm-powerpc/irq.h
include/asm-powerpc/rtc.h [new file with mode: 0644]
include/asm-powerpc/time.h [new file with mode: 0644]
include/asm-ppc64/time.h [deleted file]