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

Commit 5fbbf8a1 authored by Lennox Wu's avatar Lennox Wu
Browse files

Score: The commit is for compiling successfully. 


	The modifications include:
	1. Kconfig of Score: we don't support ioremap
	2. Missed headfile including
	3. There are some errors in other people's commit not checked by us, we fix it now
	3.1 arch/score/kernel/entry.S: wrong instructions
	3.2 arch/score/kernel/process.c : just some typos

	Signed-off-by: default avatarLennox Wu <lennox.wu@gmail.com>
parent 22356f44

arch/score/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ menu "Machine selection" 


config SCORE

       def_bool y

       select HAVE_GENERIC_HARDIRQS

       select GENERIC_IRQ_SHOW

       select GENERIC_IOMAP

       select GENERIC_ATOMIC64
@@ -110,3 +111,6 @@ source "security/Kconfig" 
source "crypto/Kconfig"



source "lib/Kconfig"



config NO_IOMEM

       def_bool y

arch/score/include/asm/io.h

+0 −1
Original line number Diff line number Diff line
@@ -5,5 +5,4 @@ 


#define virt_to_bus	virt_to_phys

#define bus_to_virt	phys_to_virt



#endif /* _ASM_SCORE_IO_H */

arch/score/include/asm/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define _ASM_SCORE_PGALLOC_H



#include <linux/mm.h>



#include <linux/highmem.h>

static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,

	pte_t *pte)

{

arch/score/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ resume_kernel: 
	disable_irq

	lw	r8, [r28, TI_PRE_COUNT]

	cmpz.c	r8

	bne	r8, restore_all

	bne	restore_all

need_resched:

	lw	r8, [r28, TI_FLAGS]

	andri.c	r9, r8, _TIF_NEED_RESCHED
@@ -415,7 +415,7 @@ ENTRY(handle_sys) 
	sw	r9, [r0, PT_EPC]



	cmpi.c	r27, __NR_syscalls 	# check syscall number

	bgeu	illegal_syscall

	bcs	illegal_syscall



	slli	r8, r27, 2		# get syscall routine

	la	r11, sys_call_table

arch/score/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
	p->thread.reg0 = (unsigned long) childregs;

	if (unlikely(p->flags & PF_KTHREAD)) {

		memset(childregs, 0, sizeof(struct pt_regs));

		p->thread->reg12 = usp;

		p->thread->reg13 = arg;

		p->thread.reg12 = usp;

		p->thread.reg13 = arg;

		p->thread.reg3 = (unsigned long) ret_from_kernel_thread;

	} else {

		*childregs = *current_pt_regs();