瀏覽代碼

[XTENSA] fix wrong usage of __init and __initdata in traps.c

A variable was defined with __init instead of __initdata and
the function accessing that variable wasn't initialized with
__init.

Signed-off-by: Chris Zankel <chris@zankel.net>
Chris Zankel 18 年之前
父節點
當前提交
b91dc336cc
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/xtensa/kernel/traps.c

+ 2 - 2
arch/xtensa/kernel/traps.c

@@ -83,7 +83,7 @@ typedef struct {
 	void* handler;
 	void* handler;
 } dispatch_init_table_t;
 } dispatch_init_table_t;
 
 
-dispatch_init_table_t __init dispatch_init_table[] = {
+static dispatch_init_table_t __initdata dispatch_init_table[] = {
 
 
 { EXCCAUSE_ILLEGAL_INSTRUCTION,	0,	   do_illegal_instruction},
 { EXCCAUSE_ILLEGAL_INSTRUCTION,	0,	   do_illegal_instruction},
 { EXCCAUSE_SYSTEM_CALL,		KRNL,	   fast_syscall_kernel },
 { EXCCAUSE_SYSTEM_CALL,		KRNL,	   fast_syscall_kernel },
@@ -305,7 +305,7 @@ do_debug(struct pt_regs *regs)
 
 
 #define set_handler(idx,handler) (exc_table[idx] = (unsigned long) (handler))
 #define set_handler(idx,handler) (exc_table[idx] = (unsigned long) (handler))
 
 
-void trap_init(void)
+void __init trap_init(void)
 {
 {
 	int i;
 	int i;