From 424d9079819544402118a3169e3160f296401d9a Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 19 Apr 2012 14:59:56 -0700 Subject: [PATCH] --- yaml --- r: 305428 b: refs/heads/master c: d219e2e86a407035303b987e4184ca0b1de53257 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/extable.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23e3e1f457da..8d24d7baf324 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a79f248b9b309ebb5f34ca6a8fd1eb9e18db5720 +refs/heads/master: d219e2e86a407035303b987e4184ca0b1de53257 diff --git a/trunk/kernel/extable.c b/trunk/kernel/extable.c index 5339705b8241..fe35a634bf76 100644 --- a/trunk/kernel/extable.c +++ b/trunk/kernel/extable.c @@ -35,10 +35,16 @@ DEFINE_MUTEX(text_mutex); extern struct exception_table_entry __start___ex_table[]; extern struct exception_table_entry __stop___ex_table[]; +/* Cleared by build time tools if the table is already sorted. */ +u32 __initdata main_extable_sort_needed = 1; + /* Sort the kernel's built-in exception table */ void __init sort_main_extable(void) { - sort_extable(__start___ex_table, __stop___ex_table); + if (main_extable_sort_needed) + sort_extable(__start___ex_table, __stop___ex_table); + else + pr_notice("__ex_table already sorted, skipping sort\n"); } /* Given an address, look for it in the exception tables. */