diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 10:35:46 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 09:35:45 +0200 |
commit | 428cf9025b15573e16e658032f2b963283e34ae0 (patch) | |
tree | fc4620e8b7965bb191b0cebd879eaa53ede5bdda /arch/x86/include | |
parent | 66bcaf0bde100a4b54b82fc6fea6ceee2212ffb4 (diff) | |
download | kernel_samsung_smdk4412-428cf9025b15573e16e658032f2b963283e34ae0.zip kernel_samsung_smdk4412-428cf9025b15573e16e658032f2b963283e34ae0.tar.gz kernel_samsung_smdk4412-428cf9025b15573e16e658032f2b963283e34ae0.tar.bz2 |
x86: Move traps_init to x86_init_ops
Replace the quirks by a simple x86_init_ops function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/setup.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 404086f..7751d1f 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -16,11 +16,8 @@ struct x86_quirks { int (*arch_pre_time_init)(void); int (*arch_time_init)(void); - int (*arch_trap_init)(void); }; -extern void x86_quirk_trap_init(void); - extern void x86_quirk_pre_time_init(void); extern void x86_quirk_time_init(void); diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 8d7be65..07c37bd 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -48,10 +48,12 @@ struct x86_init_resources { * @pre_vector_init: init code to run before interrupt vectors * are set up. * @intr_init: interrupt init code + * @trap_init: platform specific trap setup */ struct x86_init_irqs { void (*pre_vector_init)(void); void (*intr_init)(void); + void (*trap_init)(void); }; /** |