Skip to content

Commit

Permalink
Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Oct 8, 2014
2 parents f8e4fae + 1742b63 commit 8a9e838
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/score/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/score/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
};

Expand Down
1 change: 1 addition & 0 deletions arch/score/lib/checksum_copy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 2 additions & 0 deletions arch/score/mm/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -277,3 +278,4 @@ void flush_icache_range(unsigned long start, unsigned long end)
start += L1_CACHE_BYTES;
}
}
EXPORT_SYMBOL(flush_icache_range);

0 comments on commit 8a9e838

Please sign in to comment.