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

Commit 21f9debf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sparc updates from David Miller:
 "Some 32-bit kgdb cleanups from Sam Ravnborg, and a hugepage TLB flush
  overhead fix on 64-bit from Nitin Gupta"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Reduce TLB flushes during hugepte changes
  aeroflex/greth: fix warning about unused variable
  openprom: fix warning
  sparc32: drop superfluous cast in calls to __nocache_pa()
  sparc32: fix build with STRICT_MM_TYPECHECKS
  sparc32: use proper prototype for trapbase
  sparc32: drop local prototype in kgdb_32
  sparc32: drop hardcoding trap_level in kgdb_trap
parents bd28b145 24e49ee3

arch/sparc/include/asm/head_32.h

+4 −4
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 


#ifdef CONFIG_KGDB

#define KGDB_TRAP(num)                  \

	mov num, %l7;                   \

	b kgdb_trap_low;                \

	rd %psr,%l0;                    \

	nop; \

	nop;

#else

#define KGDB_TRAP(num) \

arch/sparc/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ enum regnames { 
#define NUMREGBYTES		((GDB_CSR + 1) * 4)

#else

#define NUMREGBYTES		((GDB_Y + 1) * 8)

#endif



struct pt_regs;

asmlinkage void kgdb_trap(unsigned long trap_level, struct pt_regs *regs);

#endif



void arch_kgdb_breakpoint(void);

arch/sparc/include/asm/page_32.h

+0 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ typedef struct { unsigned long iopgprot; } iopgprot_t; 


#define __pte(x)	((pte_t) { (x) } )

#define __iopte(x)	((iopte_t) { (x) } )

/* #define __pmd(x)        ((pmd_t) { (x) } ) */ /* XXX procedure with loop */

#define __pgd(x)	((pgd_t) { (x) } )

#define __ctxd(x)	((ctxd_t) { (x) } )

#define __pgprot(x)	((pgprot_t) { (x) } )
@@ -97,7 +96,6 @@ typedef unsigned long iopgprot_t; 


#define __pte(x)	(x)

#define __iopte(x)	(x)

/* #define __pmd(x)        (x) */ /* XXX later */

#define __pgd(x)	(x)

#define __ctxd(x)	(x)

#define __pgprot(x)	(x)

arch/sparc/include/asm/pgalloc_32.h

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ static inline void free_pgd_fast(pgd_t *pgd) 


static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)

{

	unsigned long pa = __nocache_pa((unsigned long)pmdp);

	unsigned long pa = __nocache_pa(pmdp);



	set_pte((pte_t *)pgdp, (SRMMU_ET_PTD | (pa >> 4)));

	set_pte((pte_t *)pgdp, __pte((SRMMU_ET_PTD | (pa >> 4))));

}



#define pgd_populate(MM, PGD, PMD)      pgd_set(PGD, PMD)

arch/sparc/include/asm/pgtable_32.h

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static inline pte_t mk_pte_io(unsigned long page, pgprot_t pgprot, int space) 
#define pgprot_noncached pgprot_noncached

static inline pgprot_t pgprot_noncached(pgprot_t prot)

{

	prot &= ~__pgprot(SRMMU_CACHE);

	pgprot_val(prot) &= ~pgprot_val(__pgprot(SRMMU_CACHE));

	return prot;

}