Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'csky-for-linus-6.6' of https://github.com/c-sky/csky-linux
Pull arch/csky updates from Guo Ren:
- Fixup compile warnings
- Fixup update_mmu_cache
* tag 'csky-for-linus-6.6' of https://github.com/c-sky/csky-linux:
csky: Fixup -Wmissing-prototypes warning
csky: Make pfn accessors static inlines
csky: Cast argument to virt_to_pfn() to (void *)
csky: pgtable: Invalidate stale I-cache lines in update_mmu_cache
csky: fix old style declaration in module.c
+43
-8
+1
-1
arch/arc/include/asm/page.h
+1
-1
arch/arc/include/asm/page.h
+1
-3
arch/csky/abiv2/cacheflush.c
+1
-3
arch/csky/abiv2/cacheflush.c
+10
-3
arch/csky/include/asm/page.h
+10
-3
arch/csky/include/asm/page.h
···
34
34
35
35
#include <linux/pfn.h>
36
36
37
-
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
38
-
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
39
-
40
37
#define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && \
41
38
(void *)(kaddr) < high_memory)
42
39
···
76
79
#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - va_pa_offset))
77
80
78
81
#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))
82
+
83
+
static inline unsigned long virt_to_pfn(const void *kaddr)
84
+
{
85
+
return __pa(kaddr) >> PAGE_SHIFT;
86
+
}
87
+
88
+
static inline void * pfn_to_virt(unsigned long pfn)
89
+
{
90
+
return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT);
91
+
}
79
92
80
93
#define MAP_NR(x) PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \
81
94
PHYS_OFFSET_OFFSET)
+2
arch/csky/include/asm/ptrace.h
+2
arch/csky/include/asm/ptrace.h
+2
arch/csky/include/asm/sections.h
+2
arch/csky/include/asm/sections.h
+15
arch/csky/include/asm/traps.h
+15
arch/csky/include/asm/traps.h
···
40
40
41
41
void csky_alignment(struct pt_regs *regs);
42
42
43
+
asmlinkage void do_trap_unknown(struct pt_regs *regs);
44
+
asmlinkage void do_trap_zdiv(struct pt_regs *regs);
45
+
asmlinkage void do_trap_buserr(struct pt_regs *regs);
46
+
asmlinkage void do_trap_misaligned(struct pt_regs *regs);
47
+
asmlinkage void do_trap_bkpt(struct pt_regs *regs);
48
+
asmlinkage void do_trap_illinsn(struct pt_regs *regs);
49
+
asmlinkage void do_trap_fpe(struct pt_regs *regs);
50
+
asmlinkage void do_trap_priv(struct pt_regs *regs);
51
+
asmlinkage void trap_c(struct pt_regs *regs);
52
+
53
+
asmlinkage void do_notify_resume(struct pt_regs *regs,
54
+
unsigned long thread_info_flags);
55
+
56
+
void trap_init(void);
57
+
43
58
#endif /* __ASM_CSKY_TRAPS_H */
+1
-1
arch/csky/kernel/module.c
+1
-1
arch/csky/kernel/module.c
+11
arch/csky/kernel/vdso/vgettimeofday.c
+11
arch/csky/kernel/vdso/vgettimeofday.c
···
3
3
#include <linux/time.h>
4
4
#include <linux/types.h>
5
5
6
+
extern
7
+
int __vdso_clock_gettime(clockid_t clock,
8
+
struct old_timespec32 *ts);
6
9
int __vdso_clock_gettime(clockid_t clock,
7
10
struct old_timespec32 *ts)
8
11
{
···
13
10
}
14
11
15
12
int __vdso_clock_gettime64(clockid_t clock,
13
+
struct __kernel_timespec *ts);
14
+
int __vdso_clock_gettime64(clockid_t clock,
16
15
struct __kernel_timespec *ts)
17
16
{
18
17
return __cvdso_clock_gettime(clock, ts);
19
18
}
20
19
20
+
extern
21
+
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
22
+
struct timezone *tz);
21
23
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
22
24
struct timezone *tz)
23
25
{
24
26
return __cvdso_gettimeofday(tv, tz);
25
27
}
26
28
29
+
extern
30
+
int __vdso_clock_getres(clockid_t clock_id,
31
+
struct old_timespec32 *res);
27
32
int __vdso_clock_getres(clockid_t clock_id,
28
33
struct old_timespec32 *res)
29
34
{