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

Commit 40db0834 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Remove segment.h 



I would like to use asm-generic uaccess.h where are segment
macros defined. This is just first step.

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 4009819c

arch/microblaze/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <asm/ptrace.h>

#include <asm/setup.h>

#include <asm/registers.h>

#include <asm/segment.h>

#include <asm/entry.h>

#include <asm/current.h>

arch/microblaze/include/asm/segment.h

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

 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2008-2009 PetaLogix

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_SEGMENT_H

#define _ASM_MICROBLAZE_SEGMENT_H



# ifndef __ASSEMBLY__



typedef struct {

	unsigned long seg;

} mm_segment_t;



/*

 * On Microblaze the fs value is actually the top of the corresponding

 * address space.

 *

 * 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.

 *

 * For non-MMU arch like Microblaze, KERNEL_DS and USER_DS is equal.

 */

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



#  ifndef CONFIG_MMU

#  define KERNEL_DS	MAKE_MM_SEG(0)

#  define USER_DS	KERNEL_DS

#  else

#  define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)

#  define USER_DS	MAKE_MM_SEG(TASK_SIZE - 1)

#  endif



# define get_ds()	(KERNEL_DS)

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

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



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



# endif /* __ASSEMBLY__ */

#endif /* _ASM_MICROBLAZE_SEGMENT_H */

arch/microblaze/include/asm/thread_info.h

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#ifndef __ASSEMBLY__

# include <linux/types.h>

# include <asm/processor.h>

# include <asm/segment.h>



/*

 * low level task data that entry.S needs immediate access to
@@ -60,6 +59,10 @@ struct cpu_context { 
	__u32	fsr;

};



typedef struct {

	unsigned long seg;

} mm_segment_t;



struct thread_info {

	struct task_struct	*task; /* main task structure */

	struct exec_domain	*exec_domain; /* execution domain */

arch/microblaze/include/asm/uaccess.h

+29 −1
Original line number Diff line number Diff line
@@ -22,12 +22,40 @@ 
#include <asm/mmu.h>

#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/segment.h>

#include <linux/string.h>



#define VERIFY_READ	0

#define VERIFY_WRITE	1



/*

 * On Microblaze the fs value is actually the top of the corresponding

 * address space.

 *

 * 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.

 *

 * For non-MMU arch like Microblaze, KERNEL_DS and USER_DS is equal.

 */

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



#  ifndef CONFIG_MMU

#  define KERNEL_DS	MAKE_MM_SEG(0)

#  define USER_DS	KERNEL_DS

#  else

#  define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)

#  define USER_DS	MAKE_MM_SEG(TASK_SIZE - 1)

#  endif



# define get_ds()	(KERNEL_DS)

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

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



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





#define __clear_user(addr, n)	(memset((void *)(addr), 0, (n)), 0)



#ifndef CONFIG_MMU

arch/microblaze/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/bitops.h>

#include <asm/system.h>

#include <asm/pgalloc.h>

#include <asm/uaccess.h> /* for USER_DS macros */

#include <asm/cacheflush.h>



void show_regs(struct pt_regs *regs)