diff options
| author | Lennox Wu <lennox.wu@gmail.com> | 2013-09-14 01:48:37 -0400 |
|---|---|---|
| committer | Lennox Wu <lennox.wu@gmail.com> | 2013-09-25 15:46:03 -0400 |
| commit | 5fbbf8a1a93452b26e7791cf32cefce62b0a480b (patch) | |
| tree | 8dcd207baf7ffa21811b32ff1798cbd62cb1b097 /arch/score/include | |
| parent | 22356f447ceb8d97a4885792e7d9e4607f712e1b (diff) | |
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>
Diffstat (limited to 'arch/score/include')
| -rw-r--r-- | arch/score/include/asm/io.h | 1 | ||||
| -rw-r--r-- | arch/score/include/asm/pgalloc.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/score/include/asm/io.h b/arch/score/include/asm/io.h index fbbfd7132e3b..574c8827abe2 100644 --- a/arch/score/include/asm/io.h +++ b/arch/score/include/asm/io.h | |||
| @@ -5,5 +5,4 @@ | |||
| 5 | 5 | ||
| 6 | #define virt_to_bus virt_to_phys | 6 | #define virt_to_bus virt_to_phys |
| 7 | #define bus_to_virt phys_to_virt | 7 | #define bus_to_virt phys_to_virt |
| 8 | |||
| 9 | #endif /* _ASM_SCORE_IO_H */ | 8 | #endif /* _ASM_SCORE_IO_H */ |
diff --git a/arch/score/include/asm/pgalloc.h b/arch/score/include/asm/pgalloc.h index 059a61b7071b..716b3fd1d863 100644 --- a/arch/score/include/asm/pgalloc.h +++ b/arch/score/include/asm/pgalloc.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define _ASM_SCORE_PGALLOC_H | 2 | #define _ASM_SCORE_PGALLOC_H |
| 3 | 3 | ||
| 4 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 5 | 5 | #include <linux/highmem.h> | |
| 6 | static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, | 6 | static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, |
| 7 | pte_t *pte) | 7 | pte_t *pte) |
| 8 | { | 8 | { |
