Skip to content

Commit eaf9f46

Browse files
torvaldstorvalds
committed
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
2 parents 48d25d3 + c8171a8 commit eaf9f46

8 files changed

Lines changed: 43 additions & 8 deletions

File tree

‎arch/arc/include/asm/page.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ extern int pfn_valid(unsigned long pfn);
108108

109109
#else /* CONFIG_HIGHMEM */
110110

111-
#define ARCH_PFN_OFFSET virt_to_pfn(CONFIG_LINUX_RAM_BASE)
111+
#define ARCH_PFN_OFFSET virt_to_pfn((void *)CONFIG_LINUX_RAM_BASE)
112112

113113
#endif /* CONFIG_HIGHMEM */
114114

‎arch/csky/abiv2/cacheflush.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
2727

2828
addr = (unsigned long) kmap_atomic(page);
2929

30+
icache_inv_range(address, address + PAGE_SIZE);
3031
dcache_wb_range(addr, addr + PAGE_SIZE);
3132

32-
if (vma->vm_flags & VM_EXEC)
33-
icache_inv_range(addr, addr + PAGE_SIZE);
34-
3533
kunmap_atomic((void *) addr);
3634
}
3735

‎arch/csky/include/asm/page.h‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434

3535
#include <linux/pfn.h>
3636

37-
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
38-
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
39-
4037
#define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && \
4138
(void *)(kaddr) < high_memory)
4239

@@ -80,6 +77,16 @@ extern unsigned long va_pa_offset;
8077

8178
#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))
8279

80+
static inline unsigned long virt_to_pfn(const void *kaddr)
81+
{
82+
return __pa(kaddr) >> PAGE_SHIFT;
83+
}
84+
85+
static inline void * pfn_to_virt(unsigned long pfn)
86+
{
87+
return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT);
88+
}
89+
8390
#define MAP_NR(x) PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \
8491
PHYS_OFFSET_OFFSET)
8592
#define virt_to_page(x) (mem_map + MAP_NR(x))

‎arch/csky/include/asm/ptrace.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,7 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
9696
return *(unsigned long *)((unsigned long)regs + offset);
9797
}
9898

99+
asmlinkage int syscall_trace_enter(struct pt_regs *regs);
100+
asmlinkage void syscall_trace_exit(struct pt_regs *regs);
99101
#endif /* __ASSEMBLY__ */
100102
#endif /* __ASM_CSKY_PTRACE_H */

‎arch/csky/include/asm/sections.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77

88
extern char _start[];
99

10+
asmlinkage void csky_start(unsigned int unused, void *dtb_start);
11+
1012
#endif /* __ASM_SECTIONS_H */

‎arch/csky/include/asm/traps.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,19 @@ do { \
4040

4141
void csky_alignment(struct pt_regs *regs);
4242

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+
4358
#endif /* __ASM_CSKY_TRAPS_H */

‎arch/csky/kernel/module.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void jsri_2_lrw_jsr(uint32_t *location)
4040
}
4141
}
4242
#else
43-
static void inline jsri_2_lrw_jsr(uint32_t *location)
43+
static inline void jsri_2_lrw_jsr(uint32_t *location)
4444
{
4545
return;
4646
}

‎arch/csky/kernel/vdso/vgettimeofday.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,35 @@
33
#include <linux/time.h>
44
#include <linux/types.h>
55

6+
extern
7+
int __vdso_clock_gettime(clockid_t clock,
8+
struct old_timespec32 *ts);
69
int __vdso_clock_gettime(clockid_t clock,
710
struct old_timespec32 *ts)
811
{
912
return __cvdso_clock_gettime32(clock, ts);
1013
}
1114

15+
int __vdso_clock_gettime64(clockid_t clock,
16+
struct __kernel_timespec *ts);
1217
int __vdso_clock_gettime64(clockid_t clock,
1318
struct __kernel_timespec *ts)
1419
{
1520
return __cvdso_clock_gettime(clock, ts);
1621
}
1722

23+
extern
24+
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
25+
struct timezone *tz);
1826
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
1927
struct timezone *tz)
2028
{
2129
return __cvdso_gettimeofday(tv, tz);
2230
}
2331

32+
extern
33+
int __vdso_clock_getres(clockid_t clock_id,
34+
struct old_timespec32 *res);
2435
int __vdso_clock_getres(clockid_t clock_id,
2536
struct old_timespec32 *res)
2637
{

0 commit comments

Comments
 (0)