hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/ia64/include/asm/uaccess.h
....@@ -35,10 +35,9 @@
3535
3636 #include <linux/compiler.h>
3737 #include <linux/page-flags.h>
38
-#include <linux/mm.h>
3938
4039 #include <asm/intrinsics.h>
41
-#include <asm/pgtable.h>
40
+#include <linux/pgtable.h>
4241 #include <asm/io.h>
4342 #include <asm/extable.h>
4443
....@@ -48,11 +47,10 @@
4847 #define KERNEL_DS ((mm_segment_t) { ~0UL }) /* cf. access_ok() */
4948 #define USER_DS ((mm_segment_t) { TASK_SIZE-1 }) /* cf. access_ok() */
5049
51
-#define get_ds() (KERNEL_DS)
5250 #define get_fs() (current_thread_info()->addr_limit)
5351 #define set_fs(x) (current_thread_info()->addr_limit = (x))
5452
55
-#define segment_eq(a, b) ((a).seg == (b).seg)
53
+#define uaccess_kernel() (get_fs().seg == KERNEL_DS.seg)
5654
5755 /*
5856 * When accessing user memory, we need to make sure the entire area really is in
....@@ -67,7 +65,7 @@
6765 return likely(addr <= seg) &&
6866 (seg == KERNEL_DS.seg || likely(REGION_OFFSET(addr) < RGN_MAP_LIMIT));
6967 }
70
-#define access_ok(type, addr, size) __access_ok((addr), (size))
68
+#define access_ok(addr, size) __access_ok((addr), (size))
7169
7270 /*
7371 * These are the main single-value transfer routines. They automatically