On Friday 09 October 2009, Joe Perches wrote: > On Tue, 2009-10-06 at 00:37 +0200, Rafael J. Wysocki wrote: > > On Monday 05 October 2009, Joe Perches wrote: > > > On Mon, 2009-10-05 at 21:43 +0200, Rafael J. Wysocki wrote: > > > > On Monday 05 October 2009, Joe Perches wrote: > > > > > Added #define pr_fmt(fmt) "PM: " fmt > > > > > Converted printk(KERN_<level> to pr_<level>( > > > > > Removed "PM: " prefix > > > > > Added pr_fmt() to __initdata strings > > > > > > > > Well, can you please tell me what actually is wrong with the current code? > > > > > > Not much. There were a couple of trivial corrections, > > > but perhaps the changes add a bit more flexibility and > > > regularity. > > > > > > Effective trivial changes: > > > > > > o Added KERN_CONT (pr_cont) to a couple of messages > > > o Added "PM: " (pr_info) to an #ifdef'd message > > > o Added "PM: " (pr_info) to a printk "Syncing filesystems ..." > > > in power/user.c > > > > The patch as is conflicts with the changes I have queued up for 2.6.33 > > (they'll appear in linux-next after I've fixed all build issues, hopefully > > tomorrow). For one example, we're dropping swsusp.c altogether. > > Hi Rafael. Hi, > Here's the same patch redone against -next. > > Added #define pr_fmt(fmt) "PM: " fmt > Converted printk(KERN_<level> to pr_<level>( > Converted printks without KERN_ to pr_info or pr_cont > Removed hard coded "PM: " prefix from message strings > Added pr_fmt() to __initdata strings > Integrated multiple line strings > All logging messages are now output prefixed with "PM: " Does this patch depend on any other patch that haven't been merged yet? I still don't like pr_info(), pr_error() and pr_crit(). Rafael > Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> > > kernel/power/hibernate.c | 54 ++++++++++++++++++++--------------------- > kernel/power/hibernate_nvs.c | 6 +++- > kernel/power/process.c | 28 +++++++++++----------- > kernel/power/snapshot.c | 33 +++++++++++++------------ > kernel/power/suspend.c | 18 +++++++------ > kernel/power/suspend_test.c | 17 +++++++------ > kernel/power/swap.c | 44 ++++++++++++++++------------------ > kernel/power/user.c | 8 ++++-- > 8 files changed, 106 insertions(+), 102 deletions(-) > _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm
