diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2009-06-14 23:21:54 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 23:21:54 +0900 |
| commit | f8f06bc74b5afbb434b8f3982db19acdbf48dee9 (patch) | |
| tree | 69599c78e1394f2a4f1ec6990b4f8515a88fe254 /arch/sh/include | |
| parent | sh: Convert ipc/shm bits to their asm-generic versions. (diff) | |
| download | linux-dev-f8f06bc74b5afbb434b8f3982db19acdbf48dee9.tar.xz linux-dev-f8f06bc74b5afbb434b8f3982db19acdbf48dee9.zip | |
sh: Tidy up duplication in irq/swab/timex.h.
The asm-generic versions have some helper definitions that we can use
instead, drop our definitions and use those instead.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/irq.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/swab.h | 3 | ||||
| -rw-r--r-- | arch/sh/include/asm/timex.h | 7 |
3 files changed, 3 insertions, 9 deletions
diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h index a2b8c99cc06f..df8e1500527c 100644 --- a/arch/sh/include/asm/irq.h +++ b/arch/sh/include/asm/irq.h @@ -39,7 +39,6 @@ static inline int generic_irq_demux(int irq) return irq; } -#define irq_canonicalize(irq) (irq) #define irq_demux(irq) sh_mv.mv_irq_demux(irq) void init_IRQ(void); @@ -54,6 +53,7 @@ extern void irq_ctx_exit(int cpu); # define irq_ctx_exit(cpu) do { } while (0) #endif +#include <asm-generic/irq.h> #ifdef CONFIG_CPU_SH5 #include <cpu/irq.h> #endif diff --git a/arch/sh/include/asm/swab.h b/arch/sh/include/asm/swab.h index 0e08fe54ad71..1cd09767a7a3 100644 --- a/arch/sh/include/asm/swab.h +++ b/arch/sh/include/asm/swab.h @@ -7,8 +7,7 @@ */ #include <linux/compiler.h> #include <linux/types.h> - -#define __SWAB_64_THRU_32__ +#include <asm-generic/swab.h> static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { diff --git a/arch/sh/include/asm/timex.h b/arch/sh/include/asm/timex.h index a873e24113cf..b556d49e5f2b 100644 --- a/arch/sh/include/asm/timex.h +++ b/arch/sh/include/asm/timex.h @@ -8,11 +8,6 @@ #define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */ -typedef unsigned long long cycles_t; - -static __inline__ cycles_t get_cycles (void) -{ - return 0; -} +#include <asm-generic/timex.h> #endif /* __ASM_SH_TIMEX_H */ |