summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/capability.h5
-rw-r--r--include/linux/init_task.h3
-rw-r--r--include/linux/sched.h5
-rw-r--r--include/linux/skip_lists.h12
4 files changed, 16 insertions, 9 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 00690ff92..5f3c63dde 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -206,6 +206,7 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
struct user_namespace *ns, int cap);
extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
+extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);
#else
static inline bool has_capability(struct task_struct *t, int cap)
{
@@ -233,6 +234,10 @@ static inline bool ns_capable(struct user_namespace *ns, int cap)
{
return true;
}
+static inline bool ns_capable_noaudit(struct user_namespace *ns, int cap)
+{
+ return true;
+}
#endif /* CONFIG_MULTIUSER */
extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index abf31358f..86078ff4e 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -204,8 +204,7 @@ extern struct task_group root_task_group;
.restart_block = { \
.fn = do_no_restart_syscall, \
}, \
- .node = NULL, \
- .time_slice = HZ, \
+ .time_slice = HZ, \
.tasks = LIST_HEAD_INIT(tsk.tasks), \
INIT_PUSHABLE_TASKS(tsk) \
.ptraced = LIST_HEAD_INIT(tsk.ptraced), \
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 77cd44e0f..0c40d315f 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1478,15 +1478,12 @@ struct task_struct {
#ifdef CONFIG_SCHED_BFS
int time_slice;
u64 deadline;
- skiplist_node *node; /* Skip list node id */
+ skiplist_node node; /* Skip list node */
u64 last_ran;
u64 sched_time; /* sched_clock time spent running */
#ifdef CONFIG_SMT_NICE
int smt_bias; /* Policy/nice level bias across smt siblings */
#endif
-#ifdef CONFIG_SMP
- bool sticky; /* Soft affined flag */
-#endif
#ifdef CONFIG_HOTPLUG_CPU
bool zerobound; /* Bound to CPU0 for hotplug */
#endif
diff --git a/include/linux/skip_lists.h b/include/linux/skip_lists.h
index c19a6ea62..84c550655 100644
--- a/include/linux/skip_lists.h
+++ b/include/linux/skip_lists.h
@@ -20,8 +20,14 @@ typedef struct listStructure {
skiplist_node *header; /* pointer to header */
} skiplist;
-skiplist_node *skiplist_init(void);
+void skiplist_init(skiplist_node *slnode);
skiplist *new_skiplist(skiplist_node *slnode);
-skiplist_node *skiplist_insert(skiplist_node *slnode, skiplist *l, keyType key, valueType value, unsigned int randseed);
-void skiplist_delnode(skiplist_node *slnode, skiplist *l, skiplist_node *node);
+void free_skiplist(skiplist *l);
+void skiplist_node_init(skiplist_node *node);
+void skiplist_insert(skiplist *l, skiplist_node *node, keyType key, valueType value, unsigned int randseed);
+void skiplist_delete(skiplist *l, skiplist_node *node);
+
+static inline bool skiplist_node_empty(skiplist_node *node) {
+ return (!node->next[0]);
+}
#endif /* _LINUX_SKIP_LISTS_H */