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

Commit 02f7e627 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Consolidate segment modifiers across mmu/nommu systems. 



This moves get_fs/set_fs() and friends in to asm/segment.h. The
mm_segment_t definition is likewise consolidated from the _32/_64 split.

This is prepatory groundwork for using the generic address space limit
and verification routines across mmu/nommu configs.

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

include/asm-sh/processor.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ASM_SH_PROCESSOR_H

#define __ASM_SH_PROCESSOR_H





#include <asm/cpu-features.h>

#include <asm/cpu-features.h>

#include <asm/segment.h>





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

/*

/*

include/asm-sh/processor_32.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -113,10 +113,6 @@ struct thread_struct { 
	union sh_fpu_union fpu;

	union sh_fpu_union fpu;

};

};





typedef struct {

	unsigned long seg;

} mm_segment_t;



/* Count of active tasks with UBC settings */

/* Count of active tasks with UBC settings */

extern int ubc_usercnt;

extern int ubc_usercnt;

include/asm-sh/processor_64.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -166,10 +166,6 @@ struct thread_struct { 
	union sh_fpu_union fpu;

	union sh_fpu_union fpu;

};

};





typedef struct {

	unsigned long seg;

} mm_segment_t;



#define INIT_MMAP \

#define INIT_MMAP \

{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }

{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }

include/asm-sh/segment.h

+29 −1
Original line number Original line Diff line number Diff line 
#ifndef __ASM_SH_SEGMENT_H

#ifndef __ASM_SH_SEGMENT_H

#define __ASM_SH_SEGMENT_H

#define __ASM_SH_SEGMENT_H





/* Only here because we have some old header files that expect it.. */

#ifndef __ASSEMBLY__





typedef struct {

	unsigned long seg;

} mm_segment_t;



#define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })



/*

 * The fs value determines whether argument validity checking should be

 * performed or not.  If get_fs() == USER_DS, checking is performed, with

 * get_fs() == KERNEL_DS, checking is bypassed.

 *

 * For historical reasons, these macros are grossly misnamed.

 */

#define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFFUL)

#ifdef CONFIG_MMU

#define USER_DS		MAKE_MM_SEG(PAGE_OFFSET)

#else

#define USER_DS		KERNEL_DS

#endif



#define segment_eq(a,b)	((a).seg == (b).seg)



#define get_ds()	(KERNEL_DS)



#define get_fs()	(current_thread_info()->addr_limit)

#define set_fs(x)	(current_thread_info()->addr_limit = (x))



#endif /* __ASSEMBLY__ */

#endif /* __ASM_SH_SEGMENT_H */
 
#endif /* __ASM_SH_SEGMENT_H */

include/asm-sh/uaccess_32.h

+3 −30
Original line number Original line Diff line number Diff line 
/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $

/*

 *

 * User space memory access functions

 * User space memory access functions

 *

 *

 * Copyright (C) 1999, 2002  Niibe Yutaka

 * Copyright (C) 1999, 2002  Niibe Yutaka

 * Copyright (C) 2003  Paul Mundt

 * Copyright (C) 2003 - 2008  Paul Mundt

 *

 *

 *  Based on:

 *  Based on:

 *     MIPS implementation version 1.15 by

 *     MIPS implementation version 1.15 by
@@ -15,40 +14,16 @@ 




#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <asm/segment.h>





#define VERIFY_READ    0

#define VERIFY_READ    0

#define VERIFY_WRITE   1

#define VERIFY_WRITE   1





/*

 * The fs value determines whether argument validity checking should be

 * performed or not.  If get_fs() == USER_DS, checking is performed, with

 * get_fs() == KERNEL_DS, checking is bypassed.

 *

 * For historical reasons (Data Segment Register?), these macros are misnamed.

 */



#define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })



#define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFFUL)

#define USER_DS		MAKE_MM_SEG(PAGE_OFFSET)



#define segment_eq(a,b)	((a).seg == (b).seg)



#define get_ds()	(KERNEL_DS)





#if !defined(CONFIG_MMU)

#if !defined(CONFIG_MMU)

/* NOMMU is always true */

/* NOMMU is always true */

#define __addr_ok(addr) (1)

#define __addr_ok(addr) (1)





static inline mm_segment_t get_fs(void)

{

	return USER_DS;

}



static inline void set_fs(mm_segment_t s)

{

}



/*

/*

 * __access_ok: Check if address with size is OK or not.

 * __access_ok: Check if address with size is OK or not.

 *

 *
@@ -64,8 +39,6 @@ static inline int __access_ok(unsigned long addr, unsigned long size) 
#define __addr_ok(addr) \

#define __addr_ok(addr) \

	((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))

	((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))





#define get_fs()	(current_thread_info()->addr_limit)

#define set_fs(x)	(current_thread_info()->addr_limit = (x))





/*

/*

 * __access_ok: Check if address with size is OK or not.

 * __access_ok: Check if address with size is OK or not.