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

Commit 20c698d7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sparc32-cosmetic-changes' 



Sam Ravnborg says:

====================
sparc32: kgdb_32 and STRICT_MM_TYPECHECKS updates

A few cosmetic pathes for sparc32 follows.
I noticed some inconsistency in kgdb_32 that triggered a few patches.
The inconsistency in kgdb_32 turned out to have no functional impact.
But I anyway fixed it so kgdb_32 and kgdb_64 became just a tiny
bit more alike.

The STRICT_MM_TYPECHECKS patch was triggered by a
discussion on linux-arch where Arnd considered removing
this cruft.
The resulting benary of srmmu.c (I checked an assembler file)
was _smaller_ when I defined STRICT_MM_TYPECHECKS.
But due to lack of testing I left it undefined.
With the build errors fixed it should be trivial to
try out if defining STRICT_MM_TYPECHECKS breaks anything.

Any takers?

As I miss any working sparc32 gear for the moment this
has only been build tested - so please consider if it
is worth taking the risk to apply the patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 33656a1f 6b1cabe8

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;

}