提交 8a9e838f 编写于 作者: L Linus Torvalds

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
...@@ -11,3 +11,4 @@ generic-y += preempt.h ...@@ -11,3 +11,4 @@ generic-y += preempt.h
generic-y += scatterlist.h generic-y += scatterlist.h
generic-y += trace_clock.h generic-y += trace_clock.h
generic-y += xor.h generic-y += xor.h
generic-y += serial.h
...@@ -41,7 +41,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) ...@@ -41,7 +41,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
static struct irqaction timer_irq = { static struct irqaction timer_irq = {
.handler = timer_interrupt, .handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.name = "timer", .name = "timer",
}; };
......
...@@ -50,3 +50,4 @@ unsigned int csum_partial_copy_from_user(const char *src, char *dst, ...@@ -50,3 +50,4 @@ unsigned int csum_partial_copy_from_user(const char *src, char *dst,
return csum_partial(dst, len, sum); return csum_partial(dst, len, sum);
} }
EXPORT_SYMBOL(csum_partial_copy_from_user);
...@@ -72,6 +72,7 @@ void flush_dcache_page(struct page *page) ...@@ -72,6 +72,7 @@ void flush_dcache_page(struct page *page)
addr = (unsigned long) page_address(page); addr = (unsigned long) page_address(page);
flush_data_cache_page(addr); flush_data_cache_page(addr);
} }
EXPORT_SYMBOL(flush_dcache_page);
/* called by update_mmu_cache. */ /* called by update_mmu_cache. */
void __update_cache(struct vm_area_struct *vma, unsigned long address, 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) ...@@ -277,3 +278,4 @@ void flush_icache_range(unsigned long start, unsigned long end)
start += L1_CACHE_BYTES; start += L1_CACHE_BYTES;
} }
} }
EXPORT_SYMBOL(flush_icache_range);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册