-#define nx_task_nid(t) ((t)->nid)
-
-#define nx_current_nid() nx_task_nid(current)
-
-#define current_nx_info() (current->nx_info)
-
-#define nx_check(c,m) __nx_check(nx_current_nid(),c,m)
-
-#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1)
-
-
-#define __nx_state(v) ((v) ? ((v)->nx_state) : 0)
-
-#define nx_info_state(v,m) (__nx_state(v) & (m))
-
-
-#define __nx_flags(v) ((v) ? (v)->nx_flags : 0)
-
-#define nx_current_flags() __nx_flags(current->nx_info)
-
-#define nx_info_flags(v,m,f) \
- vx_check_flags(__nx_flags(v),(m),(f))
-
-#define task_nx_flags(t,m,f) \
- ((t) && nx_info_flags((t)->nx_info, (m), (f)))
-
-#define nx_flags(m,f) nx_info_flags(current->nx_info,(m),(f))
-
-
-/* context caps */
-
-#define __nx_ncaps(v) ((v) ? (v)->nx_ncaps : 0)
-
-#define nx_current_ncaps() __nx_ncaps(current->nx_info)
-
-#define nx_info_ncaps(v,c) (__nx_ncaps(v) & (c))
-
-#define nx_ncaps(c) nx_info_ncaps(current->nx_info,(c))