Commit 2efa53b2 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Make 29/32-bit mode check helper generally available. 



Presently __in_29bit_mode() is only defined for the PMB case, but
it's also easily derived from the CONFIG_29BIT and CONFIG_32BIT &&
CONFIG_PMB=n cases.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 5f240718

arch/sh/include/asm/addrspace.h

+0 −6
Original line number Diff line number Diff line
@@ -65,11 +65,5 @@ 
#define P3_ADDR_MAX		P4SEG

#endif



#ifndef __ASSEMBLY__

#ifdef CONFIG_PMB

extern int __in_29bit_mode(void);

#endif /* CONFIG_PMB */

#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */

#endif /* __ASM_SH_ADDRSPACE_H */

arch/sh/include/asm/mmu.h

+9 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#ifndef __ASSEMBLY__

#include <linux/errno.h>

#include <linux/threads.h>



/* Default "unsigned long" context */

typedef unsigned long mm_context_id_t[NR_CPUS];
@@ -72,6 +73,7 @@ long pmb_remap(unsigned long virt, unsigned long phys, 
	       unsigned long size, unsigned long flags);

void pmb_unmap(unsigned long addr);

int pmb_init(void);

bool __in_29bit_mode(void);

#else

static inline long pmb_remap(unsigned long virt, unsigned long phys,

			     unsigned long size, unsigned long flags)
@@ -87,8 +89,14 @@ static inline int pmb_init(void) 
{

	return -ENODEV;

}

#endif /* CONFIG_PMB */



#ifdef CONFIG_29BIT

#define __in_29bit_mode()	(1)

#else

#define __in_29bit_mode()	(0)

#endif



#endif /* CONFIG_PMB */

#endif /* __ASSEMBLY__ */



#endif /* __MMU_H */

arch/sh/mm/init.c

+0 −7
Original line number Diff line number Diff line
@@ -338,10 +338,3 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); 
#endif



#endif /* CONFIG_MEMORY_HOTPLUG */
 


#ifdef CONFIG_PMB

int __in_29bit_mode(void)

{

	return !(ctrl_inl(PMB_PASCR) & PASCR_SE);

}

#endif /* CONFIG_PMB */

arch/sh/mm/pmb.c

+5 −0
Original line number Diff line number Diff line
@@ -436,6 +436,11 @@ int __uses_jump_to_uncached pmb_init(void) 
	return 0;

}



bool __in_29bit_mode(void)

{

        return (__raw_readl(PMB_PASCR) & PASCR_SE) == 0;

}



static int pmb_seq_show(struct seq_file *file, void *iter)

{

	int i;