projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: remove write-only ide_pio_data_t.blacklisted
[powerpc.git]
/
net
/
sched
/
sch_hfsc.c
diff --git
a/net/sched/sch_hfsc.c
b/net/sched/sch_hfsc.c
index
135087d
..
396deb7
100644
(file)
--- a/
net/sched/sch_hfsc.c
+++ b/
net/sched/sch_hfsc.c
@@
-71,8
+71,6
@@
#include <asm/system.h>
#include <asm/div64.h>
#include <asm/system.h>
#include <asm/div64.h>
-#define HFSC_DEBUG 1
-
/*
* kernel internal service curve representation:
* coordinates are given by 64 bit unsigned integers.
/*
* kernel internal service curve representation:
* coordinates are given by 64 bit unsigned integers.
@@
-211,17
+209,6
@@
do { \
} while (0)
#endif
} while (0)
#endif
-#if HFSC_DEBUG
-#define ASSERT(cond) \
-do { \
- if (unlikely(!(cond))) \
- printk("assertion %s failed at %s:%i (%s)\n", \
- #cond, __FILE__, __LINE__, __FUNCTION__); \
-} while (0)
-#else
-#define ASSERT(cond)
-#endif /* HFSC_DEBUG */
-
#define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */
#define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */
@@
-1492,7
+1479,7
@@
hfsc_schedule_watchdog(struct Qdisc *sch, u64 cur_time)
if (next_time == 0 || next_time > q->root.cl_cfmin)
next_time = q->root.cl_cfmin;
}
if (next_time == 0 || next_time > q->root.cl_cfmin)
next_time = q->root.cl_cfmin;
}
-
ASSERT(next_time !
= 0);
+
WARN_ON(next_time =
= 0);
delay = next_time - cur_time;
delay = PSCHED_US2JIFFIE(delay);
delay = next_time - cur_time;
delay = PSCHED_US2JIFFIE(delay);