dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Andi Kleen 2012-10-04 17:11:32 -07:00 committed by Linus Torvalds
parent 3f3247d019
commit 1058ce2084
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/h8300/kernel/sys_h8300.c
View File

@ -51,6 +51,7 @@ asmlinkage void syscall_print(void *dummy,...)
* Do a system call from kernel instead of calling sys_execve so we * Do a system call from kernel instead of calling sys_execve so we
* end up with proper pt_regs. * end up with proper pt_regs.
*/ */
asmlinkage
int kernel_execve(const char *filename, int kernel_execve(const char *filename,
const char *const argv[], const char *const argv[],
const char *const envp[]) const char *const envp[])

2
arch/h8300/kernel/timer/itu.c
View File

@ -62,7 +62,7 @@ static struct irqaction itu_irq = {
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_DISABLED | IRQF_TIMER,
}; };
static const int __initdata divide_rate[] = {1, 2, 4, 8}; static const int __initconst divide_rate[] = {1, 2, 4, 8};
void __init h8300_timer_setup(void) void __init h8300_timer_setup(void)
{ {

2
arch/h8300/kernel/timer/timer16.c
View File

@ -57,7 +57,7 @@ static struct irqaction timer16_irq = {
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_DISABLED | IRQF_TIMER,
}; };
static const int __initdata divide_rate[] = {1, 2, 4, 8}; static const int __initconst divide_rate[] = {1, 2, 4, 8};
void __init h8300_timer_setup(void) void __init h8300_timer_setup(void)
{ {

2
arch/h8300/kernel/timer/timer8.c
View File

@ -77,7 +77,7 @@ static struct irqaction timer8_irq = {
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_DISABLED | IRQF_TIMER,
}; };
static const int __initdata divide_rate[] = {8, 64, 8192}; static const int __initconst divide_rate[] = {8, 64, 8192};
void __init h8300_timer_setup(void) void __init h8300_timer_setup(void)
{ {

2
arch/h8300/kernel/timer/tpu.c
View File

@ -66,7 +66,7 @@ static struct irqaction tpu_irq = {
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_DISABLED | IRQF_TIMER,
}; };
static const int __initdata divide_rate[] = { static const int __initconst divide_rate[] = {
#if CONFIG_H8300_TPU_CH == 0 #if CONFIG_H8300_TPU_CH == 0
1,4,16,64,0,0,0,0, 1,4,16,64,0,0,0,0,
#elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5) #elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)

4
arch/h8300/platform/h8300h/irq.c
View File

@ -14,14 +14,14 @@
#include <asm/gpio-internal.h> #include <asm/gpio-internal.h>
#include <asm/regs306x.h> #include <asm/regs306x.h>
const int __initdata h8300_saved_vectors[] = { const int __initconst h8300_saved_vectors[] = {
#if defined(CONFIG_GDB_DEBUG) #if defined(CONFIG_GDB_DEBUG)
TRAP3_VEC, /* TRAPA #3 is GDB breakpoint */ TRAP3_VEC, /* TRAPA #3 is GDB breakpoint */
#endif #endif
-1, -1,
}; };
const h8300_vector __initdata h8300_trap_table[] = { const h8300_vector __initconst h8300_trap_table[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
system_call, system_call,
0, 0,

4
arch/h8300/platform/h8s/irq.c
View File

@ -18,7 +18,7 @@
#include <asm/regs267x.h> #include <asm/regs267x.h>
/* saved vector list */ /* saved vector list */
const int __initdata h8300_saved_vectors[]={ const int __initconst h8300_saved_vectors[] = {
#if defined(CONFIG_GDB_DEBUG) #if defined(CONFIG_GDB_DEBUG)
TRACE_VEC, TRACE_VEC,
TRAP3_VEC, TRAP3_VEC,
@ -27,7 +27,7 @@ const int __initdata h8300_saved_vectors[]={
}; };
/* trap entry table */ /* trap entry table */
const H8300_VECTOR __initdata h8300_trap_table[] = { const H8300_VECTOR __initconst h8300_trap_table[] = {
0,0,0,0,0, 0,0,0,0,0,
trace_break, /* TRACE */ trace_break, /* TRACE */
0,0, 0,0,