Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sections: fix section conflicts in arch/h8300

[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Andi Kleen and committed by
Linus Torvalds
1058ce20 3f3247d0

+9 -8
+1
arch/h8300/kernel/sys_h8300.c
··· 51 51 * Do a system call from kernel instead of calling sys_execve so we 52 52 * end up with proper pt_regs. 53 53 */ 54 + asmlinkage 54 55 int kernel_execve(const char *filename, 55 56 const char *const argv[], 56 57 const char *const envp[])
+1 -1
arch/h8300/kernel/timer/itu.c
··· 62 62 .flags = IRQF_DISABLED | IRQF_TIMER, 63 63 }; 64 64 65 - static const int __initdata divide_rate[] = {1, 2, 4, 8}; 65 + static const int __initconst divide_rate[] = {1, 2, 4, 8}; 66 66 67 67 void __init h8300_timer_setup(void) 68 68 {
+1 -1
arch/h8300/kernel/timer/timer16.c
··· 57 57 .flags = IRQF_DISABLED | IRQF_TIMER, 58 58 }; 59 59 60 - static const int __initdata divide_rate[] = {1, 2, 4, 8}; 60 + static const int __initconst divide_rate[] = {1, 2, 4, 8}; 61 61 62 62 void __init h8300_timer_setup(void) 63 63 {
+1 -1
arch/h8300/kernel/timer/timer8.c
··· 77 77 .flags = IRQF_DISABLED | IRQF_TIMER, 78 78 }; 79 79 80 - static const int __initdata divide_rate[] = {8, 64, 8192}; 80 + static const int __initconst divide_rate[] = {8, 64, 8192}; 81 81 82 82 void __init h8300_timer_setup(void) 83 83 {
+1 -1
arch/h8300/kernel/timer/tpu.c
··· 66 66 .flags = IRQF_DISABLED | IRQF_TIMER, 67 67 }; 68 68 69 - static const int __initdata divide_rate[] = { 69 + static const int __initconst divide_rate[] = { 70 70 #if CONFIG_H8300_TPU_CH == 0 71 71 1,4,16,64,0,0,0,0, 72 72 #elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)
+2 -2
arch/h8300/platform/h8300h/irq.c
··· 14 14 #include <asm/gpio-internal.h> 15 15 #include <asm/regs306x.h> 16 16 17 - const int __initdata h8300_saved_vectors[] = { 17 + const int __initconst h8300_saved_vectors[] = { 18 18 #if defined(CONFIG_GDB_DEBUG) 19 19 TRAP3_VEC, /* TRAPA #3 is GDB breakpoint */ 20 20 #endif 21 21 -1, 22 22 }; 23 23 24 - const h8300_vector __initdata h8300_trap_table[] = { 24 + const h8300_vector __initconst h8300_trap_table[] = { 25 25 0, 0, 0, 0, 0, 0, 0, 0, 26 26 system_call, 27 27 0,
+2 -2
arch/h8300/platform/h8s/irq.c
··· 18 18 #include <asm/regs267x.h> 19 19 20 20 /* saved vector list */ 21 - const int __initdata h8300_saved_vectors[]={ 21 + const int __initconst h8300_saved_vectors[] = { 22 22 #if defined(CONFIG_GDB_DEBUG) 23 23 TRACE_VEC, 24 24 TRAP3_VEC, ··· 27 27 }; 28 28 29 29 /* trap entry table */ 30 - const H8300_VECTOR __initdata h8300_trap_table[] = { 30 + const H8300_VECTOR __initconst h8300_trap_table[] = { 31 31 0,0,0,0,0, 32 32 trace_break, /* TRACE */ 33 33 0,0,