Skip to content

Commit 5fbbf8a

Browse files
committed
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: Lennox Wu <lennox.wu@gmail.com>
1 parent 22356f4 commit 5fbbf8a

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

arch/score/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ menu "Machine selection"
22

33
config SCORE
44
def_bool y
5+
select HAVE_GENERIC_HARDIRQS
56
select GENERIC_IRQ_SHOW
67
select GENERIC_IOMAP
78
select GENERIC_ATOMIC64
@@ -110,3 +111,6 @@ source "security/Kconfig"
110111
source "crypto/Kconfig"
111112

112113
source "lib/Kconfig"
114+
115+
config NO_IOMEM
116+
def_bool y

arch/score/include/asm/io.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@
55

66
#define virt_to_bus virt_to_phys
77
#define bus_to_virt phys_to_virt
8-
98
#endif /* _ASM_SCORE_IO_H */

arch/score/include/asm/pgalloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _ASM_SCORE_PGALLOC_H
33

44
#include <linux/mm.h>
5-
5+
#include <linux/highmem.h>
66
static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
77
pte_t *pte)
88
{

arch/score/kernel/entry.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ resume_kernel:
264264
disable_irq
265265
lw r8, [r28, TI_PRE_COUNT]
266266
cmpz.c r8
267-
bne r8, restore_all
267+
bne restore_all
268268
need_resched:
269269
lw r8, [r28, TI_FLAGS]
270270
andri.c r9, r8, _TIF_NEED_RESCHED
@@ -415,7 +415,7 @@ ENTRY(handle_sys)
415415
sw r9, [r0, PT_EPC]
416416

417417
cmpi.c r27, __NR_syscalls # check syscall number
418-
bgeu illegal_syscall
418+
bcs illegal_syscall
419419

420420
slli r8, r27, 2 # get syscall routine
421421
la r11, sys_call_table

arch/score/kernel/process.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
7878
p->thread.reg0 = (unsigned long) childregs;
7979
if (unlikely(p->flags & PF_KTHREAD)) {
8080
memset(childregs, 0, sizeof(struct pt_regs));
81-
p->thread->reg12 = usp;
82-
p->thread->reg13 = arg;
81+
p->thread.reg12 = usp;
82+
p->thread.reg13 = arg;
8383
p->thread.reg3 = (unsigned long) ret_from_kernel_thread;
8484
} else {
8585
*childregs = *current_pt_regs();

0 commit comments

Comments
 (0)