Commit 8a9e838f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f8e4fae2 1742b630

arch/score/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/score/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

};

arch/score/lib/checksum_copy.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/score/mm/cache.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE