Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851b3f32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:

 1) Fix race in sparc64 TLB shootdowns, we have to synchronize with the
    sibling cpus completing if we are passing them a reference via
    pointer to a data structure.

 2) Fix cleaning of bitmaps in sparc32, from Akinobu Mita.

 3) Fix various sparc header mistakes, some of which resulted in
    userland build breakage.  From Sam Ravnborg.

 4) Kill ghost declarations and defines missed when several bits of code
    got deleted recently.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix race in TLB batch processing.
  sparc: use asm-generic version of types.h
  bbc_i2c: fix section mismatch warning
  sparc: use generic headers
  sparc:cleanup unused code in smp_32.h
  sparc/iommu: fix typo s/265KB/256KB/
  sparc/srmmu: clear trailing edge of bitmap properly
  sparc:remove unused declaration smp_boot_cpus()
parents c437d888 f36391d2

arch/sparc/include/asm/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -2,11 +2,16 @@ 




generic-y += clkdev.h

generic-y += cputime.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += local64.h

generic-y += mutex.h

generic-y += irq_regs.h

generic-y += local.h

generic-y += module.h

generic-y += serial.h

generic-y += trace_clock.h

generic-y += types.h

generic-y += word-at-a-time.h

arch/sparc/include/asm/cputime.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __SPARC_CPUTIME_H

#define __SPARC_CPUTIME_H



#include <asm-generic/cputime.h>



#endif /* __SPARC_CPUTIME_H */

arch/sparc/include/asm/emergency-restart.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _ASM_EMERGENCY_RESTART_H

#define _ASM_EMERGENCY_RESTART_H



#include <asm-generic/emergency-restart.h>



#endif /* _ASM_EMERGENCY_RESTART_H */

arch/sparc/include/asm/mutex.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/*

 * Pull in the generic implementation for the mutex fastpath.

 *

 * TODO: implement optimized primitives instead, or leave the generic

 * implementation in place, or pick the atomic_xchg() based generic

 * implementation. (see asm-generic/mutex-xchg.h for details)

 */



#include <asm-generic/mutex-dec.h>

arch/sparc/include/asm/pgtable_64.h

+1 −0
Original line number Diff line number Diff line
@@ -915,6 +915,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, 
	return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);

}



#include <asm/tlbflush.h>

#include <asm-generic/pgtable.h>



/* We provide our own get_unmapped_area to cope with VA holes and