projects
/
kernel-bfs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes to sequential BFS patches in line with prereqs
[kernel-bfs]
/
kernel-bfs-2.6.28
/
debian
/
patches
/
bfs
/
bfs-318-to-330.patch
diff --git
a/kernel-bfs-2.6.28/debian/patches/bfs/bfs-318-to-330.patch
b/kernel-bfs-2.6.28/debian/patches/bfs/bfs-318-to-330.patch
index
7c9a557
..
b42ee67
100644
(file)
--- a/
kernel-bfs-2.6.28/debian/patches/bfs/bfs-318-to-330.patch
+++ b/
kernel-bfs-2.6.28/debian/patches/bfs/bfs-318-to-330.patch
@@
-101,12
+101,12
@@
Index: kernel-2.6.28/kernel/sched_bfs.c
+
+static inline int deadline_before(u64 deadline, u64 time)
+{
+
+static inline int deadline_before(u64 deadline, u64 time)
+{
-+ return (deadline < time);
++ return (s64)(time - deadline) > 0;
+}
+
+static inline int deadline_after(u64 deadline, u64 time)
+{
+}
+
+static inline int deadline_after(u64 deadline, u64 time)
+{
-+ return (deadline > time);
++ return (s64)(deadline - time) > 0;
+}
+
+/*
+}
+
+/*
@@
-376,15
+376,6
@@
Index: kernel-2.6.28/kernel/sched_bfs.c
}
if (likely(queued_notrunning())) {
}
if (likely(queued_notrunning())) {
-@@ -2461,7 +2530,7 @@ need_resched_nonpreemptible:
- goto need_resched_nonpreemptible;
- preempt_enable_no_resched();
- if (unlikely(test_thread_flag(TIF_NEED_RESCHED)))
-- goto need_resched;
-+ goto need_resched;
- }
- EXPORT_SYMBOL(schedule);
-
@@ -2829,7 +2898,7 @@ void rt_mutex_setprio(struct task_struct
BUG_ON(prio < 0 || prio > MAX_PRIO);
@@ -2829,7 +2898,7 @@ void rt_mutex_setprio(struct task_struct
BUG_ON(prio < 0 || prio > MAX_PRIO);
@@
-405,8
+396,8
@@
Index: kernel-2.6.28/kernel/sched_bfs.c
prio += delta;
if (idleprio_task(p))
@@ -3126,7 +3196,7 @@ recheck:
prio += delta;
if (idleprio_task(p))
@@ -3126,7 +3196,7 @@ recheck:
- if (policy == SCHED_NORMAL)
- break;
+ if (policy == SCHED_BATCH)
+ goto out;
if (policy != SCHED_IDLEPRIO)
- return -EPERM;
+ return -EPERM;
if (policy != SCHED_IDLEPRIO)
- return -EPERM;
+ return -EPERM;