Commit eaf9f464 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 48d25d38 c8171a86

arch/arc/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ extern int pfn_valid(unsigned long pfn); 


#else /* CONFIG_HIGHMEM */



#define ARCH_PFN_OFFSET		virt_to_pfn(CONFIG_LINUX_RAM_BASE)

#define ARCH_PFN_OFFSET		virt_to_pfn((void *)CONFIG_LINUX_RAM_BASE)



#endif /* CONFIG_HIGHMEM */

arch/csky/abiv2/cacheflush.c

+1 −3
Original line number Diff line number Diff line
@@ -27,11 +27,9 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 


	addr = (unsigned long) kmap_atomic(page);



	icache_inv_range(address, address + PAGE_SIZE);

	dcache_wb_range(addr, addr + PAGE_SIZE);



	if (vma->vm_flags & VM_EXEC)

		icache_inv_range(addr, addr + PAGE_SIZE);



	kunmap_atomic((void *) addr);

}

arch/csky/include/asm/page.h

+10 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ 


#include <linux/pfn.h>



#define virt_to_pfn(kaddr)      (__pa(kaddr) >> PAGE_SHIFT)

#define pfn_to_virt(pfn)        __va((pfn) << PAGE_SHIFT)



#define virt_addr_valid(kaddr)  ((void *)(kaddr) >= (void *)PAGE_OFFSET && \

			(void *)(kaddr) < high_memory)
@@ -80,6 +77,16 @@ extern unsigned long va_pa_offset; 


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



static inline unsigned long virt_to_pfn(const void *kaddr)

{

	return __pa(kaddr) >> PAGE_SHIFT;

}



static inline void * pfn_to_virt(unsigned long pfn)

{

	return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT);

}



#define MAP_NR(x)	PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \

				 PHYS_OFFSET_OFFSET)

#define virt_to_page(x)	(mem_map + MAP_NR(x))

arch/csky/include/asm/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -96,5 +96,7 @@ static inline unsigned long regs_get_register(struct pt_regs *regs, 
	return *(unsigned long *)((unsigned long)regs + offset);

}



asmlinkage int syscall_trace_enter(struct pt_regs *regs);

asmlinkage void syscall_trace_exit(struct pt_regs *regs);

#endif /* __ASSEMBLY__ */

#endif /* __ASM_CSKY_PTRACE_H */

arch/csky/include/asm/sections.h

+2 −0
Original line number Diff line number Diff line
@@ -7,4 +7,6 @@ 


extern char _start[];



asmlinkage void csky_start(unsigned int unused, void *dtb_start);



#endif /* __ASM_SECTIONS_H */