OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
[tomoyo/tomoyo-test1.git]
/
mm
/
page_alloc.c
diff --git
a/mm/page_alloc.c
b/mm/page_alloc.c
index
6991cce
..
ff5484f
100644
(file)
--- a/
mm/page_alloc.c
+++ b/
mm/page_alloc.c
@@
-5971,7
+5971,7
@@
void __ref memmap_init_zone_device(struct zone *zone,
}
}
- pr_info("%s initialised
, %lu pages in %ums\n", dev_name(pgmap->dev)
,
+ pr_info("%s initialised
%lu pages in %ums\n", __func__
,
size, jiffies_to_msecs(jiffies - start));
}