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

Commit 08dc179b authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

frv: fix kernel/user segment handling in NOMMU mode 



In NOMMU mode, the FRV segment handling is broken because KERNEL_DS ==
USER_DS.  This causes tests of the following sort:

	/* don't pin down non-user-based iovecs */
	if (segment_eq(get_fs(), KERNEL_DS))
		return NULL;

to malfunction.

To fix this, make USER_DS the top of RAM instead of the top of the non-IO
address space, and make KERNEL_DS one more than the top of the non-IO
address space.

Also get rid of FRV's __addr_ok() as nothing uses it.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea56f411

arch/frv/include/asm/segment.h

+3 −3
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ typedef struct { 


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



#define KERNEL_DS		MAKE_MM_SEG(0xdfffffffUL)



#ifdef CONFIG_MMU

#define USER_DS			MAKE_MM_SEG(TASK_SIZE - 1)

#define KERNEL_DS		MAKE_MM_SEG(0xdfffffffUL)

#else

#define USER_DS			KERNEL_DS

#define USER_DS			MAKE_MM_SEG(memory_end)

#define KERNEL_DS		MAKE_MM_SEG(0xe0000000UL)

#endif



#define get_ds()		(KERNEL_DS)

arch/frv/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#define VERIFY_READ	0

#define VERIFY_WRITE	1



#define __addr_ok(addr) ((unsigned long)(addr) < get_addr_limit())



/*

 * check that a range of addresses falls within the current address limit

 */