Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffa818b4 authored by Chen Liqin's avatar Chen Liqin
Browse files

score: update inconsistent declare after .c was changed

parent d8aa899b

arch/score/include/asm/irq.h

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


#define IRQ_TIMER (7)		/* Timer IRQ number of SPCT6600 */



extern void interrupt_exception_vector(void);



#endif /* _ASM_SCORE_IRQ_H */

arch/score/include/asm/irq_regs.h

+6 −1
Original line number Diff line number Diff line 
#ifndef _ASM_SCORE_IRQ_REGS_H

#define _ASM_SCORE_IRQ_REGS_H



#include <asm-generic/irq_regs.h>

#include <linux/thread_info.h>



static inline struct pt_regs *get_irq_regs(void)

{

	return current_thread_info()->regs;

}



#endif /* _ASM_SCORE_IRQ_REGS_H */

arch/score/include/asm/linkage.h

+3 −0
Original line number Diff line number Diff line 
#ifndef _ASM_SCORE_LINKAGE_H

#define _ASM_SCORE_LINKAGE_H



#define __ALIGN .align 2

#define __ALIGN_STR ".align 2"



#endif /* _ASM_SCORE_LINKAGE_H */

arch/score/include/asm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ extern unsigned long max_low_pfn; 
extern unsigned long min_low_pfn;

extern unsigned long max_pfn;



#define __pa(vaddr)		((unsigned long) (vaddr))

#define __va(paddr)		((void *) (paddr))

#define __pa(x)		((unsigned long)(x) - PAGE_OFFSET)

#define __va(x)		((void *)((unsigned long) (x) + PAGE_OFFSET))



#define phys_to_pfn(phys)	(PFN_DOWN(phys))

#define pfn_to_phys(pfn)	(PFN_PHYS(pfn))

arch/score/include/asm/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 
	__free_pages(pte, PTE_ORDER);

}



#define __pte_free_tlb(tlb, pte)			\

#define __pte_free_tlb(tlb, pte, buf)			\

do {							\

	pgtable_page_dtor(pte);				\

	tlb_remove_page((tlb), pte);			\