Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1058ce20 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in arch/h8300 



[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f3247d0

arch/h8300/kernel/sys_h8300.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ asmlinkage void syscall_print(void *dummy,...) 
 * Do a system call from kernel instead of calling sys_execve so we

 * end up with proper pt_regs.

 */

asmlinkage

int kernel_execve(const char *filename,

		  const char *const argv[],

		  const char *const envp[])

arch/h8300/kernel/timer/itu.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct irqaction itu_irq = { 
	.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)

{

arch/h8300/kernel/timer/timer16.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static struct irqaction timer16_irq = { 
	.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)

{

arch/h8300/kernel/timer/timer8.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct irqaction timer8_irq = { 
	.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)

{

arch/h8300/kernel/timer/tpu.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static struct irqaction tpu_irq = { 
	.flags		= IRQF_DISABLED | IRQF_TIMER,

};



static const int __initdata divide_rate[] = {

static const int __initconst divide_rate[] = {

#if CONFIG_H8300_TPU_CH == 0

	1,4,16,64,0,0,0,0,

#elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)