diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 05:37:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 05:37:24 -0400 |
| commit | 8a9e838f59115e55ca206fb5f0b567d7b3540517 (patch) | |
| tree | 4182bc74544fbc21b49c0b5cbcbe21686e8da1af /arch | |
| parent | f8e4fae2e79d2d293fc490ede87be44c9b215d9e (diff) | |
| parent | 1742b630e43a6ccca67cf634704e8b76d128947f (diff) | |
| download | linux-8a9e838f59115e55ca206fb5f0b567d7b3540517.tar.bz2 | |
Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off
Pull S+core updates from Lennox Wu:
"Three of the patches are for building allmodconfig, and the others are
for removing useless flags"
* tag 'for-linus-20141006' of git://github.com/sctscore/linux-off:
score: Remove GENERIC_HAS_IOMAP
arch/score/include/asm/Kbuild: Add generic "serial.h"
score: remove deprecated IRQF_DISABLED
arch/score/mm/cache.c: Export 'flush_icache_range'
arch: score: Export necessary symbols in related files
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/score/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/score/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/score/lib/checksum_copy.c | 1 | ||||
| -rw-r--r-- | arch/score/mm/cache.c | 2 |
4 files changed, 5 insertions, 1 deletions
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 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", }; 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..b4bcfd3e8393 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, @@ -277,3 +278,4 @@ void flush_icache_range(unsigned long start, unsigned long end) start += L1_CACHE_BYTES; } } +EXPORT_SYMBOL(flush_icache_range); |