[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1323838793-28304-1-git-send-email-sboyd@codeaurora.org>
Date: Tue, 13 Dec 2011 20:59:53 -0800
From: Stephen Boyd <sboyd@...eaurora.org>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: john.stultz@...aro.org, Ingo Molnar <mingo@...e.hu>,
"H . Peter Anvin" <hpa@...or.com>, linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
cschan@...eaurora.org, Peter Zijlstra <peterz@...radead.org>
Subject: [PATCH] debugobjects: Fix selftest for static warnings
debugobjects is now printing a warning when a fixup for a
NOTAVAILABLE object is run. This causes the selftest to fail
like:
[ 0.000000] ODEBUG: selftest warnings failed 4 != 5
We could just increase the number of warnings that the selftest
is expecting to see because that is actually what has changed.
But, it turns out that fixup_activate() was written with inverted
logic and thus a fixup for a static object returned 1 indicating
the object had been fixed, and 0 otherwise. Fix the logic to be
correct and update the counts to reflect that nothing needed
fixing for a static object.
Signed-off-by: Stephen Boyd <sboyd@...eaurora.org>
Reported-By: Thomas Gleixner <tglx@...utronix.de>
---
lib/debugobjects.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 77cb245..0ab9ae8 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -818,17 +818,9 @@ static int __init fixup_activate(void *addr, enum debug_obj_state state)
if (obj->static_init == 1) {
debug_object_init(obj, &descr_type_test);
debug_object_activate(obj, &descr_type_test);
- /*
- * Real code should return 0 here ! This is
- * not a fixup of some bad behaviour. We
- * merily call the debug_init function to keep
- * track of the object.
- */
- return 1;
- } else {
- /* Real code needs to emit a warning here */
+ return 0;
}
- return 0;
+ return 1;
case ODEBUG_STATE_ACTIVE:
debug_object_deactivate(obj, &descr_type_test);
@@ -967,7 +959,7 @@ static void __init debug_objects_selftest(void)
obj.static_init = 1;
debug_object_activate(&obj, &descr_type_test);
- if (check_results(&obj, ODEBUG_STATE_ACTIVE, ++fixups, warnings))
+ if (check_results(&obj, ODEBUG_STATE_ACTIVE, fixups, warnings))
goto out;
debug_object_init(&obj, &descr_type_test);
if (check_results(&obj, ODEBUG_STATE_INIT, ++fixups, ++warnings))
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists