redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

riscv: turn mm_segment_t into a struct 

This matches what other heavily used architectures do, and will allow us
to easily use <asm-generic/uaccess.h> for the nommu case.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
hifive-unleashed-5.2
Christoph Hellwig 2019-04-15 11:14:33 +02:00 committed by Palmer Dabbelt
parent df720961c1
commit 5cfade5fdc
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/riscv/include/asm/thread_info.h
View File

@ -28,7 +28,9 @@
#include <asm/processor.h>
#include <asm/csr.h>
typedef unsigned long mm_segment_t;
typedef struct {
unsigned long seg;
} mm_segment_t;
/*
* low level task data that entry.S needs immediate access to

12
arch/riscv/include/asm/uaccess.h
View File

@ -39,8 +39,10 @@
* For historical reasons, these macros are grossly misnamed.
*/
#define KERNEL_DS (~0UL)
#define USER_DS (TASK_SIZE)
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
#define KERNEL_DS MAKE_MM_SEG(~0UL)
#define USER_DS MAKE_MM_SEG(TASK_SIZE)
#define get_fs() (current_thread_info()->addr_limit)
@ -49,9 +51,9 @@ static inline void set_fs(mm_segment_t fs)
current_thread_info()->addr_limit = fs;
}
#define segment_eq(a, b) ((a) == (b))
#define segment_eq(a, b) ((a).seg == (b).seg)
#define user_addr_max() (get_fs())
#define user_addr_max() (get_fs().seg)
/**
@ -83,7 +85,7 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
{
const mm_segment_t fs = get_fs();
return (size <= fs) && (addr <= (fs - size));
return size <= fs.seg && addr <= fs.seg - size;
}
/*