From 51de2f11f5d4d51ad3a77ea3ef67e7b66f6709f5 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Wed, 9 Jul 2014 16:48:45 +0800 Subject: arch: score: Export necessary symbols in related files 'csum_partial_copy_from_user' and 'flush_dcache_page' are also needed by outside modules, so need export them in the related files. The related error (with allmodconfig under score): MODPOST 1365 modules ERROR: "csum_partial_copy_from_user" [net/rxrpc/af-rxrpc.ko] undefined! ERROR: "flush_dcache_page" [net/sunrpc/sunrpc.ko] undefined! Acked-by: Lennox Wu Signed-off-by: Chen Gang --- arch/score/lib/checksum_copy.c | 1 + arch/score/mm/cache.c | 1 + 2 files changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/score/lib/checksum_copy.c b/arch/score/lib/checksum_copy.c index 04565dd3ded8..9b770b30e8a5 100644 --- a/arch/score/lib/checksum_copy.c +++ b/arch/score/lib/checksum_copy.c @@ -50,3 +50,4 @@ unsigned int csum_partial_copy_from_user(const char *src, char *dst, return csum_partial(dst, len, sum); } +EXPORT_SYMBOL(csum_partial_copy_from_user); diff --git a/arch/score/mm/cache.c b/arch/score/mm/cache.c index f85ec1a7c88e..be9104159c41 100644 --- a/arch/score/mm/cache.c +++ b/arch/score/mm/cache.c @@ -72,6 +72,7 @@ void flush_dcache_page(struct page *page) addr = (unsigned long) page_address(page); flush_data_cache_page(addr); } +EXPORT_SYMBOL(flush_dcache_page); /* called by update_mmu_cache. */ void __update_cache(struct vm_area_struct *vma, unsigned long address, -- cgit v1.2.3 From 000ab4b0a7afaa3799ffd8cc41a4328ee999990b Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Wed, 9 Jul 2014 16:56:36 +0800 Subject: arch/score/mm/cache.c: Export 'flush_icache_range' The related error (with allmodconfig under score): MODPOST 1365 modules ERROR: "flush_icache_range" [drivers/misc/lkdtm.ko] undefined! Acked-by: Lennox Wu Signed-off-by: Chen Gang --- arch/score/mm/cache.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/score/mm/cache.c b/arch/score/mm/cache.c index be9104159c41..b4bcfd3e8393 100644 --- a/arch/score/mm/cache.c +++ b/arch/score/mm/cache.c @@ -278,3 +278,4 @@ void flush_icache_range(unsigned long start, unsigned long end) start += L1_CACHE_BYTES; } } +EXPORT_SYMBOL(flush_icache_range); -- cgit v1.2.3 From 203d2fbbec279e86f59e10662800ebbb0b5ce740 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Wed, 1 Oct 2014 12:04:58 +0200 Subject: score: remove deprecated IRQF_DISABLED This patch removes the use of the IRQF_DISABLED flag from arch/score/kernel/time.c It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker Acked-by: Lennox Wu --- arch/score/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/score/kernel/time.c b/arch/score/kernel/time.c index f0a43affb201..24770cd9b473 100644 --- a/arch/score/kernel/time.c +++ b/arch/score/kernel/time.c @@ -41,7 +41,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) static struct irqaction timer_irq = { .handler = timer_interrupt, - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .name = "timer", }; -- cgit v1.2.3 From d32c98e9855c719620fc418ff540acc6d5880bd8 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Tue, 8 Jul 2014 14:00:43 +0800 Subject: arch/score/include/asm/Kbuild: Add generic "serial.h" The related error (with allmodconfig under score): CC [M] drivers/staging/speakup/speakup_acntpc.o In file included from drivers/staging/speakup/speakup_acntpc.c:33:0: drivers/staging/speakup/serialio.h:7:24: fatal error: asm/serial.h: No such file or directory #include ^ compilation terminated. make[3]: *** [drivers/staging/speakup/speakup_acntpc.o] Error 1 make[2]: *** [drivers/staging/speakup] Error 2 make[1]: *** [drivers/staging] Error 2 make: *** [drivers] Error 2 Acked-by: Lennox Wu Signed-off-by: Chen Gang --- arch/score/include/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index aad209199f7e..d26c48fc93c9 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -11,3 +11,4 @@ generic-y += preempt.h generic-y += scatterlist.h generic-y += trace_clock.h generic-y += xor.h +generic-y += serial.h -- cgit v1.2.3 From 1742b630e43a6ccca67cf634704e8b76d128947f Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Fri, 5 Sep 2014 06:56:18 -0700 Subject: score: Remove GENERIC_HAS_IOMAP The symbol is an orphan, get rid of it. Signed-off-by: Richard Weinberger Acked-by: Lennox Wu Cc: Paul Bolle [Guenter Roeck: Merge with 3.17-rc3; update headline] Signed-off-by: Guenter Roeck --- arch/score/Kconfig | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch') diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 4ac8cae5727c..366e1b599a7b 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -22,17 +22,14 @@ choice config ARCH_SCORE7 bool "SCORE7 processor" select SYS_SUPPORTS_32BIT_KERNEL - select GENERIC_HAS_IOMAP config MACH_SPCT6600 bool "SPCT6600 series based machines" select SYS_SUPPORTS_32BIT_KERNEL - select GENERIC_HAS_IOMAP config SCORE_SIM bool "Score simulator" select SYS_SUPPORTS_32BIT_KERNEL - select GENERIC_HAS_IOMAP endchoice endmenu -- cgit v1.2.3