aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 11:32:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 11:32:16 -0400
commite486b4c4ba601410772136ba0f8337bf545dccad (patch)
tree56db95a38cba74071bd0080e83dbbbe9f788498e /kernel
parentab86e974f04b1cd827a9c7c35273834ebcd9ab38 (diff)
parentbec1b9e76353ecf05fac6a87f8e4102dfb618cd2 (diff)
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull extable dmesg fixlet from Ingo Molnar: "Small tweak to reduce kmsg boot time spam" * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: extable: Flip the sorting message
Diffstat (limited to 'kernel')
-rw-r--r--kernel/extable.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/extable.c b/kernel/extable.c
index fe35a634bf76..67460b93b1a1 100644
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -41,10 +41,10 @@ u32 __initdata main_extable_sort_needed = 1;
41/* Sort the kernel's built-in exception table */ 41/* Sort the kernel's built-in exception table */
42void __init sort_main_extable(void) 42void __init sort_main_extable(void)
43{ 43{
44 if (main_extable_sort_needed) 44 if (main_extable_sort_needed) {
45 pr_notice("Sorting __ex_table...\n");
45 sort_extable(__start___ex_table, __stop___ex_table); 46 sort_extable(__start___ex_table, __stop___ex_table);
46 else 47 }
47 pr_notice("__ex_table already sorted, skipping sort\n");
48} 48}
49 49
50/* Given an address, look for it in the exception tables. */ 50/* Given an address, look for it in the exception tables. */