Messages in this thread Patch in this message | | | Date | Thu, 11 Dec 2008 13:45:23 +0100 | From | Markus Metzger <> | Subject | [patch 1/3] x86, bts: turn BUG_ON into WARN_ON_ONCE |
| |
Turn BUG_ON's into WARN_ON_ONCE.
Signed-off-by: Markus Metzger <markus.t.metzger@intel.com> ---
Index: ftrace/arch/x86/kernel/ds.c =================================================================== --- ftrace.orig/arch/x86/kernel/ds.c 2008-12-08 09:42:53.000000000 +0100 +++ ftrace/arch/x86/kernel/ds.c 2008-12-08 13:29:03.000000000 +0100 @@ -452,7 +452,7 @@ static void ds_release(struct ds_tracer *tracer, enum ds_qualifier qual) { - BUG_ON(tracer->context->owner[qual] != tracer); + WARN_ON_ONCE(tracer->context->owner[qual] != tracer); tracer->context->owner[qual] = NULL; put_tracer(tracer->context->task); @@ -774,7 +774,7 @@ printk(KERN_INFO "DS available\n"); - BUG_ON(MAX_SIZEOF_DS < ds_cfg.sizeof_ds); + WARN_ON_ONCE(MAX_SIZEOF_DS < ds_cfg.sizeof_ds); } void __cpuinit ds_init_intel(struct cpuinfo_x86 *c) Index: ftrace/arch/x86/kernel/ptrace.c =================================================================== --- ftrace.orig/arch/x86/kernel/ptrace.c 2008-12-08 09:42:53.000000000 +0100 +++ ftrace/arch/x86/kernel/ptrace.c 2008-12-08 13:29:03.000000000 +0100 @@ -878,7 +878,8 @@ { unsigned char bts_record[BTS_MAX_RECORD_SIZE]; - BUG_ON(BTS_MAX_RECORD_SIZE < bts_cfg.sizeof_bts); + if (BTS_MAX_RECORD_SIZE < bts_cfg.sizeof_bts) + return -EOVERFLOW; memset(bts_record, 0, bts_cfg.sizeof_bts); switch (in->qualifier) { @@ -1133,7 +1134,7 @@ ret = ds_get_bts_index(child->bts, &size); if (ret == 0) { - BUG_ON(size != (int) size); + WARN_ON_ONCE(size != (int) size); ret = (int) size; } break; --------------------------------------------------------------------- Intel GmbH Dornacher Strasse 1 85622 Feldkirchen/Muenchen Germany Sitz der Gesellschaft: Feldkirchen bei Muenchen Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer Registergericht: Muenchen HRB 47456 Ust.-IdNr. VAT Registration No.: DE129385895 Citibank Frankfurt (BLZ 502 109 00) 600119052 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
| |