Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix build.
[MIPS] Fix use of smp_processor_id() in preemptible code.
+8
-4
+5
-1
arch/mips/kernel/csrc-r4k.c
+5
-1
arch/mips/kernel/csrc-r4k.c
···
5
5
*
6
6
* Copyright (C) 2007 by Ralf Baechle
7
7
*/
8
+
#include <linux/clocksource.h>
9
+
#include <linux/init.h>
10
+
11
+
#include <asm/time.h>
8
12
9
13
static cycle_t c0_hpt_read(void)
10
14
{
···
22
18
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
23
19
};
24
20
25
-
static void __init init_mips_clocksource(void)
21
+
void __init init_mips_clocksource(void)
26
22
{
27
23
/* Calclate a somewhat reasonable rating value */
28
24
clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000;
+3
-3
include/asm-mips/cpu-features.h
+3
-3
include/asm-mips/cpu-features.h
···
207
207
#endif
208
208
209
209
#ifndef cpu_dcache_line_size
210
-
#define cpu_dcache_line_size() current_cpu_data.dcache.linesz
210
+
#define cpu_dcache_line_size() cpu_data[0].dcache.linesz
211
211
#endif
212
212
#ifndef cpu_icache_line_size
213
-
#define cpu_icache_line_size() current_cpu_data.icache.linesz
213
+
#define cpu_icache_line_size() cpu_data[0].icache.linesz
214
214
#endif
215
215
#ifndef cpu_scache_line_size
216
-
#define cpu_scache_line_size() current_cpu_data.scache.linesz
216
+
#define cpu_scache_line_size() cpu_data[0].scache.linesz
217
217
#endif
218
218
219
219
#endif /* __ASM_CPU_FEATURES_H */