Merge branch 'master' into upstream

1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/unwind.c b/kernel/unwind.c
index 3430475fcd88..2e2368607aab 100644
--- a/kernel/unwind.c
+++ b/kernel/unwind.c
@@ -102,7 +102,7 @@ static struct unwind_table {
         unsigned long size;
         struct unwind_table *link;
         const char *name;
-} root_table, *last_table;
+} root_table;
 
 struct unwind_item {
         enum item_location {
@@ -174,6 +174,8 @@ void __init unwind_init(void)
 
 #ifdef CONFIG_MODULES
 
+static struct unwind_table *last_table;
+
 /* Must be called with module_mutex held. */
 void *unwind_add_table(struct module *module,
                        const void *table_start,