diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2014-06-04 19:06:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:53:58 -0400 |
commit | ae3a8c1c235345dfeb9b4b8c9e118802e3e84533 (patch) | |
tree | 3a5a1962d420db8b457dea0fc2de9081dce972e2 /mm/huge_memory.c | |
parent | ff9e43eb4f2eb78067d7b783cc893773b3e129b1 (diff) |
mm/huge_memory.c: complete conversion to pr_foo()
It was using a mix of pr_foo() and printk(KERN_ERR ...).
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r-- | mm/huge_memory.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 2434d9059e5c..e60837dc785c 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
@@ -5,6 +5,8 @@ | |||
5 | * the COPYING file in the top-level directory. | 5 | * the COPYING file in the top-level directory. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
9 | |||
8 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
9 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
10 | #include <linux/highmem.h> | 12 | #include <linux/highmem.h> |
@@ -151,8 +153,7 @@ static int start_khugepaged(void) | |||
151 | khugepaged_thread = kthread_run(khugepaged, NULL, | 153 | khugepaged_thread = kthread_run(khugepaged, NULL, |
152 | "khugepaged"); | 154 | "khugepaged"); |
153 | if (unlikely(IS_ERR(khugepaged_thread))) { | 155 | if (unlikely(IS_ERR(khugepaged_thread))) { |
154 | printk(KERN_ERR | 156 | pr_err("khugepaged: kthread_run(khugepaged) failed\n"); |
155 | "khugepaged: kthread_run(khugepaged) failed\n"); | ||
156 | err = PTR_ERR(khugepaged_thread); | 157 | err = PTR_ERR(khugepaged_thread); |
157 | khugepaged_thread = NULL; | 158 | khugepaged_thread = NULL; |
158 | } | 159 | } |
@@ -584,19 +585,19 @@ static int __init hugepage_init_sysfs(struct kobject **hugepage_kobj) | |||
584 | 585 | ||
585 | *hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj); | 586 | *hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj); |
586 | if (unlikely(!*hugepage_kobj)) { | 587 | if (unlikely(!*hugepage_kobj)) { |
587 | printk(KERN_ERR "hugepage: failed to create transparent hugepage kobject\n"); | 588 | pr_err("failed to create transparent hugepage kobject\n"); |
588 | return -ENOMEM; | 589 | return -ENOMEM; |
589 | } | 590 | } |
590 | 591 | ||
591 | err = sysfs_create_group(*hugepage_kobj, &hugepage_attr_group); | 592 | err = sysfs_create_group(*hugepage_kobj, &hugepage_attr_group); |
592 | if (err) { | 593 | if (err) { |
593 | printk(KERN_ERR "hugepage: failed to register transparent hugepage group\n"); | 594 | pr_err("failed to register transparent hugepage group\n"); |
594 | goto delete_obj; | 595 | goto delete_obj; |
595 | } | 596 | } |
596 | 597 | ||
597 | err = sysfs_create_group(*hugepage_kobj, &khugepaged_attr_group); | 598 | err = sysfs_create_group(*hugepage_kobj, &khugepaged_attr_group); |
598 | if (err) { | 599 | if (err) { |
599 | printk(KERN_ERR "hugepage: failed to register transparent hugepage group\n"); | 600 | pr_err("failed to register transparent hugepage group\n"); |
600 | goto remove_hp_group; | 601 | goto remove_hp_group; |
601 | } | 602 | } |
602 | 603 | ||
@@ -689,8 +690,7 @@ static int __init setup_transparent_hugepage(char *str) | |||
689 | } | 690 | } |
690 | out: | 691 | out: |
691 | if (!ret) | 692 | if (!ret) |
692 | printk(KERN_WARNING | 693 | pr_warn("transparent_hugepage= cannot parse, ignored\n"); |
693 | "transparent_hugepage= cannot parse, ignored\n"); | ||
694 | return ret; | 694 | return ret; |
695 | } | 695 | } |
696 | __setup("transparent_hugepage=", setup_transparent_hugepage); | 696 | __setup("transparent_hugepage=", setup_transparent_hugepage); |
@@ -1831,8 +1831,8 @@ static void __split_huge_page(struct page *page, | |||
1831 | * walk, to be able to set it as pmd_trans_splitting too. | 1831 | * walk, to be able to set it as pmd_trans_splitting too. |
1832 | */ | 1832 | */ |
1833 | if (mapcount != page_mapcount(page)) { | 1833 | if (mapcount != page_mapcount(page)) { |
1834 | printk(KERN_ERR "mapcount %d page_mapcount %d\n", | 1834 | pr_err("mapcount %d page_mapcount %d\n", |
1835 | mapcount, page_mapcount(page)); | 1835 | mapcount, page_mapcount(page)); |
1836 | BUG(); | 1836 | BUG(); |
1837 | } | 1837 | } |
1838 | 1838 | ||
@@ -1846,8 +1846,8 @@ static void __split_huge_page(struct page *page, | |||
1846 | mapcount2 += __split_huge_page_map(page, vma, addr); | 1846 | mapcount2 += __split_huge_page_map(page, vma, addr); |
1847 | } | 1847 | } |
1848 | if (mapcount != mapcount2) { | 1848 | if (mapcount != mapcount2) { |
1849 | printk(KERN_ERR "mapcount %d mapcount2 %d page_mapcount %d\n", | 1849 | pr_err("mapcount %d mapcount2 %d page_mapcount %d\n", |
1850 | mapcount, mapcount2, page_mapcount(page)); | 1850 | mapcount, mapcount2, page_mapcount(page)); |
1851 | BUG(); | 1851 | BUG(); |
1852 | } | 1852 | } |
1853 | } | 1853 | } |