leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Score: The commit is for compiling successfully.

Browse Source 
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>
This commit is contained in:
Lennox Wu 2013-09-14 13:48:37 +08:00
parent 22356f447c
commit 5fbbf8a1a9
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/score/Kconfig
View File

@ -2,6 +2,7 @@ menu "Machine selection"
config SCORE config SCORE
def_bool y def_bool y
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
@ -110,3 +111,6 @@ source "security/Kconfig"
source "crypto/Kconfig" source "crypto/Kconfig"
source "lib/Kconfig" source "lib/Kconfig"
config NO_IOMEM
def_bool y

1
arch/score/include/asm/io.h
View File

@ -5,5 +5,4 @@
#define virt_to_bus virt_to_phys #define virt_to_bus virt_to_phys
#define bus_to_virt phys_to_virt #define bus_to_virt phys_to_virt
#endif /* _ASM_SCORE_IO_H */ #endif /* _ASM_SCORE_IO_H */

2
arch/score/include/asm/pgalloc.h
View File

@ -2,7 +2,7 @@
#define _ASM_SCORE_PGALLOC_H #define _ASM_SCORE_PGALLOC_H
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/highmem.h>
static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
pte_t *pte) pte_t *pte)
{ {

4
arch/score/kernel/entry.S
View File

@ -264,7 +264,7 @@ resume_kernel:
disable_irq disable_irq
lw r8, [r28, TI_PRE_COUNT] lw r8, [r28, TI_PRE_COUNT]
cmpz.c r8 cmpz.c r8
bne r8, restore_all bne restore_all
need_resched: need_resched:
lw r8, [r28, TI_FLAGS] lw r8, [r28, TI_FLAGS]
andri.c r9, r8, _TIF_NEED_RESCHED andri.c r9, r8, _TIF_NEED_RESCHED
@ -415,7 +415,7 @@ ENTRY(handle_sys)
sw r9, [r0, PT_EPC] sw r9, [r0, PT_EPC]
cmpi.c r27, __NR_syscalls # check syscall number cmpi.c r27, __NR_syscalls # check syscall number
bgeu illegal_syscall bcs illegal_syscall
slli r8, r27, 2 # get syscall routine slli r8, r27, 2 # get syscall routine
la r11, sys_call_table la r11, sys_call_table

4
arch/score/kernel/process.c
View File

@ -78,8 +78,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
p->thread.reg0 = (unsigned long) childregs; p->thread.reg0 = (unsigned long) childregs;
if (unlikely(p->flags & PF_KTHREAD)) { if (unlikely(p->flags & PF_KTHREAD)) {
memset(childregs, 0, sizeof(struct pt_regs)); memset(childregs, 0, sizeof(struct pt_regs));
p->thread->reg12 = usp; p->thread.reg12 = usp;
p->thread->reg13 = arg; p->thread.reg13 = arg;
p->thread.reg3 = (unsigned long) ret_from_kernel_thread; p->thread.reg3 = (unsigned long) ret_from_kernel_thread;
} else { } else {
*childregs = *current_pt_regs(); *childregs = *current_pt_regs();