Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

Lennox Wu 5fbbf8a1 22356f44

+9 -6
+4
arch/score/Kconfig
··· 2 2 3 3 config SCORE 4 4 def_bool y 5 + select HAVE_GENERIC_HARDIRQS 5 6 select GENERIC_IRQ_SHOW 6 7 select GENERIC_IOMAP 7 8 select GENERIC_ATOMIC64 ··· 111 110 source "crypto/Kconfig" 112 111 113 112 source "lib/Kconfig" 113 + 114 + config NO_IOMEM 115 + def_bool y
-1
arch/score/include/asm/io.h
··· 5 5 6 6 #define virt_to_bus virt_to_phys 7 7 #define bus_to_virt phys_to_virt 8 - 9 8 #endif /* _ASM_SCORE_IO_H */
+1 -1
arch/score/include/asm/pgalloc.h
··· 2 2 #define _ASM_SCORE_PGALLOC_H 3 3 4 4 #include <linux/mm.h> 5 - 5 + #include <linux/highmem.h> 6 6 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, 7 7 pte_t *pte) 8 8 {
+2 -2
arch/score/kernel/entry.S
··· 264 264 disable_irq 265 265 lw r8, [r28, TI_PRE_COUNT] 266 266 cmpz.c r8 267 - bne r8, restore_all 267 + bne restore_all 268 268 need_resched: 269 269 lw r8, [r28, TI_FLAGS] 270 270 andri.c r9, r8, _TIF_NEED_RESCHED ··· 415 415 sw r9, [r0, PT_EPC] 416 416 417 417 cmpi.c r27, __NR_syscalls # check syscall number 418 - bgeu illegal_syscall 418 + bcs illegal_syscall 419 419 420 420 slli r8, r27, 2 # get syscall routine 421 421 la r11, sys_call_table
+2 -2
arch/score/kernel/process.c
··· 78 78 p->thread.reg0 = (unsigned long) childregs; 79 79 if (unlikely(p->flags & PF_KTHREAD)) { 80 80 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; 83 83 p->thread.reg3 = (unsigned long) ret_from_kernel_thread; 84 84 } else { 85 85 *childregs = *current_pt_regs();