tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
m68k: use mmu timex.h for non-mmu setups as well
The non-mmu timex.h can be cleaned up and ends up being identical
to the mmu timex.h, just just use that.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+17
-45
+17
-4
arch/m68k/include/asm/timex.h
+17
-4
arch/m68k/include/asm/timex.h
···
1
-
#ifdef __uClinux__
2
-
#include "timex_no.h"
3
-
#else
4
-
#include "timex_mm.h"
1
+
/*
2
+
* linux/include/asm-m68k/timex.h
3
+
*
4
+
* m68k architecture timex specifications
5
+
*/
6
+
#ifndef _ASMm68k_TIMEX_H
7
+
#define _ASMm68k_TIMEX_H
8
+
9
+
#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
10
+
11
+
typedef unsigned long cycles_t;
12
+
13
+
static inline cycles_t get_cycles(void)
14
+
{
15
+
return 0;
16
+
}
17
+
5
18
#endif
-18
arch/m68k/include/asm/timex_mm.h
-18
arch/m68k/include/asm/timex_mm.h
···
1
-
/*
2
-
* linux/include/asm-m68k/timex.h
3
-
*
4
-
* m68k architecture timex specifications
5
-
*/
6
-
#ifndef _ASMm68k_TIMEX_H
7
-
#define _ASMm68k_TIMEX_H
8
-
9
-
#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
10
-
11
-
typedef unsigned long cycles_t;
12
-
13
-
static inline cycles_t get_cycles(void)
14
-
{
15
-
return 0;
16
-
}
17
-
18
-
#endif
-23
arch/m68k/include/asm/timex_no.h
-23
arch/m68k/include/asm/timex_no.h
···
1
-
/*
2
-
* linux/include/asm-m68knommu/timex.h
3
-
*
4
-
* m68knommu architecture timex specifications
5
-
*/
6
-
#ifndef _ASM_M68KNOMMU_TIMEX_H
7
-
#define _ASM_M68KNOMMU_TIMEX_H
8
-
9
-
#ifdef CONFIG_COLDFIRE
10
-
#include <asm/coldfire.h>
11
-
#define CLOCK_TICK_RATE MCF_CLK
12
-
#else
13
-
#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
14
-
#endif
15
-
16
-
typedef unsigned long cycles_t;
17
-
18
-
static inline cycles_t get_cycles(void)
19
-
{
20
-
return 0;
21
-
}
22
-
23
-
#endif