Skip to content

Commit

Permalink
frv: fix kernel/user segment handling in NOMMU mode
Browse files Browse the repository at this point in the history
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: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
dhowells authored and torvalds committed Apr 7, 2010
1 parent ea56f41 commit 08dc179
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions arch/frv/include/asm/segment.h
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions arch/frv/include/asm/uaccess.h
Expand Up @@ -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
*/
Expand Down

0 comments on commit 08dc179

Please sign in to comment.