From 8c62f813dfbd2f7648471999e08993c20448b61b Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Sun, 1 Feb 2009 01:13:05 -0800
Subject: [PATCH] --- yaml --- r: 133951 b: refs/heads/master c:
 e82181de5ef4648074765912d2d82d6bd60115eb h: refs/heads/master i:   133949:
 6ee9c227f257897e6c479198a887634770e7cadb   133947:
 7c5eb8004d82b645c87e2f35b4738a52e8f5e164   133943:
 d48b267834e44a7ff84d375051c8d55400e1dc71   133935:
 5d7c50768532e81c70b75dce33e19cbbb88ca1ce   133919:
 861298cb0ac7a9cf16c3ce54deffc8ce3d783f52   133887:
 9eaaad531f0aea2cc4e964e514de9a20bdab1d52 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_htb.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60b7090c8515..586050394531 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b00355db3f88d96810a60011a30cfb2c3469409d
+refs/heads/master: e82181de5ef4648074765912d2d82d6bd60115eb
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 77ff510ef8ac..826f92145261 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -153,6 +153,9 @@ struct htb_sched {
 	int direct_qlen;	/* max qlen of above */
 
 	long direct_pkts;
+
+#define HTB_WARN_TOOMANYEVENTS	0x1
+	unsigned int warned;	/* only one warning */
 };
 
 /* find class in global hash table using given handle */
@@ -685,6 +688,10 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level,
 			htb_add_to_wait_tree(q, cl, diff);
 	}
 	/* too much load - let's continue on next jiffie (including above) */
+	if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) {
+		printk(KERN_WARNING "htb: too many events!\n");
+		q->warned |= HTB_WARN_TOOMANYEVENTS;
+	}
 	return q->now + 2 * PSCHED_TICKS_PER_SEC / HZ;
 }