Skip to content

Commit 6050003

Browse files
committed
torture: Keep old-school dmesg format
This commit adds "#define pr_fmt(fmt) fmt" to the torture-test files in order to keep the current dmesg format. Once Joe's commits have hit mainline, these definitions will be changed in order to automatically generate the dmesg line prefix that the scripts expect. This will have the beneficial side-effect of allowing printk() formats to be used more widely and of shortening some pr_*() lines. Signed-off-by: Paul E. McKenney <[email protected]> Cc: Joe Perches <[email protected]>
1 parent 90127d6 commit 6050003

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

kernel/locking/locktorture.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
* Davidlohr Bueso <[email protected]>
2222
* Based on kernel/rcu/torture.c.
2323
*/
24+
25+
#define pr_fmt(fmt) fmt
26+
2427
#include <linux/kernel.h>
2528
#include <linux/module.h>
2629
#include <linux/kthread.h>

kernel/rcu/rcuperf.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
*
2020
* Authors: Paul E. McKenney <[email protected]>
2121
*/
22+
23+
#define pr_fmt(fmt) fmt
24+
2225
#include <linux/types.h>
2326
#include <linux/kernel.h>
2427
#include <linux/init.h>

kernel/rcu/rcutorture.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
*
2323
* See also: Documentation/RCU/torture.txt
2424
*/
25+
26+
#define pr_fmt(fmt) fmt
27+
2528
#include <linux/types.h>
2629
#include <linux/kernel.h>
2730
#include <linux/init.h>

kernel/torture.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
* Author: Paul E. McKenney <[email protected]>
2121
* Based on kernel/rcu/torture.c.
2222
*/
23+
24+
#define pr_fmt(fmt) fmt
25+
2326
#include <linux/types.h>
2427
#include <linux/kernel.h>
2528
#include <linux/init.h>

0 commit comments

Comments
 (0)