PULL Request issued on 2014/10/6

Signed by Lennox Wu.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJUMtdrAAoJEN984+whgMZcMsUP/1KoGpykx4eYXp8jH/J33pMY
 WiHs+sYtrHli/utsNQK7hExanAKSbM0p3P7KLeWe5DKY1Q5IALYQ1Avasb4l4S+R
 QuMLXk0NMAPu2xVaZQRQ2PWrzkwm505RTwDsvigakYZoQubmupkSV5LwrPHaVyZb
 EzxaAsBs+jwtXN0n32ispGkEBvrqDcEqHmvOFmIyk4Ld7DsLrZSQ+Lavuqf40UTF
 5kC7x3YxHropsR8PIfgQP2qIj5dXbQHkD8elQLzosov5qFsnUM7ZjkVvFUTR0jxC
 XM9NYZGsz9SjRPYx/qfcdTHCIOnWXS/wRi+JMWTvK4ocxdjU60bTiAGo14zsk/Q6
 MKKE58hPMrw5uQ8DL51pMft/GB1CPco756hNhaYwJw8KFbs18ul3+7wn1Hz0fCsg
 owF2kzkBkfKRqMGRYcTt97Kim1lyGy4RuJCZ6bzQnYfSCNHzEReXQ/cp5edZ49Sa
 mxZY32CPc14pxwDVr+je3nGubTSHthiap1Tx1zvK7nkAc1Uw+T50rf5WfNHxVCbx
 dy46EMhNu4L62Ow2IaP6VrNHDPviA/HlqaKUicrDIV6xyfvAHHvi79Fj3yug7OoL
 X5g3xKyeaIM+crJUMicf4SpYMmnargYVEcZBArTN6g+qKvKgf+CxAGN8ngt5hM/m
 7JJ6sE2mbR4rlxHAc/yv
 =wx2u
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-10-08 05:37:24 -04:00
commit 8a9e838f59
4 changed files with 5 additions and 1 deletions

View file

@ -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

View file

@ -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",
};

View file

@ -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);

View file

@ -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);