Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9143
b: refs/heads/master
c: 31f6d9d
h: refs/heads/master
i:
  9141: 3eed28d
  9139: 42e8df1
  9135: 6635669
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Sep 21, 2005
1 parent b96c002 commit 2161bd1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66dcca062847bcd261ebb3ac96d51101f31a8630
refs/heads/master: 31f6d9d628739c097964b8dbae939ea997da94a3
7 changes: 6 additions & 1 deletion trunk/kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,11 @@ static int __init printk_time_setup(char *str)

__setup("time", printk_time_setup);

__attribute__((weak)) unsigned long long printk_clock(void)
{
return sched_clock();
}

/*
* This is printk. It can be called from any context. We want it to work.
*
Expand Down Expand Up @@ -565,7 +570,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
loglev_char = default_message_loglevel
+ '0';
}
t = sched_clock();
t = printk_clock();
nanosec_rem = do_div(t, 1000000000);
tlen = sprintf(tbuf,
"<%c>[%5lu.%06lu] ",
Expand Down

0 comments on commit 2161bd1

Please sign in to comment.