diff options
Diffstat (limited to 'lib/bug.c')
-rw-r--r-- | lib/bug.c | 26 |
1 files changed, 2 insertions, 24 deletions
@@ -167,30 +167,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) | |||
167 | 167 | ||
168 | if (warning) { | 168 | if (warning) { |
169 | /* this is a WARN_ON rather than BUG/BUG_ON */ | 169 | /* this is a WARN_ON rather than BUG/BUG_ON */ |
170 | pr_warn("------------[ cut here ]------------\n"); | 170 | __warn(file, line, (void *)bugaddr, BUG_GET_TAINT(bug), regs, |
171 | 171 | NULL); | |
172 | if (file) | ||
173 | pr_warn("WARNING: at %s:%u\n", file, line); | ||
174 | else | ||
175 | pr_warn("WARNING: at %p [verbose debug info unavailable]\n", | ||
176 | (void *)bugaddr); | ||
177 | |||
178 | if (panic_on_warn) { | ||
179 | /* | ||
180 | * This thread may hit another WARN() in the panic path. | ||
181 | * Resetting this prevents additional WARN() from | ||
182 | * panicking the system on this thread. Other threads | ||
183 | * are blocked by the panic_mutex in panic(). | ||
184 | */ | ||
185 | panic_on_warn = 0; | ||
186 | panic("panic_on_warn set ...\n"); | ||
187 | } | ||
188 | |||
189 | print_modules(); | ||
190 | show_regs(regs); | ||
191 | print_oops_end_marker(); | ||
192 | /* Just a warning, don't kill lockdep. */ | ||
193 | add_taint(BUG_GET_TAINT(bug), LOCKDEP_STILL_OK); | ||
194 | return BUG_TRAP_TYPE_WARN; | 172 | return BUG_TRAP_TYPE_WARN; |
195 | } | 173 | } |
196 | 174 | ||