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

Commit 325c1170 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c 



Move the static inline function setup_jiffies_interrupt() from
<asm/timex.h> to arch/mn10300/kernel/cevt-mn10300.c, which is its only
callsite.

This allows to remove the inclusion of <asm/hardirq.h> and <linux/irq.h>
from <asm/timex.h> and <unit/timex.h>, fixing include hell like:

  include/linux/jiffies.h:260:31: warning: "CLOCK_TICK_RATE" is not defined [-Wundef]
  include/linux/jiffies.h:260:31: warning: "CLOCK_TICK_RATE" is not defined [-Wundef]
  include/linux/jiffies.h:46:42: error: division by zero in #if
  ...
  make[4]: *** [arch/mn10300/kernel/asm-offsets.s] Error 1

and (after a quick hack for the above by defining CLOCK_TICK_RATE in
<linux/jiffies.h>):

  In file included from include/linux/notifier.h:15:0,
                 from include/linux/memory_hotplug.h:6,
                 from include/linux/mmzone.h:718,
                 from include/linux/gfp.h:4,
                 from include/linux/irq.h:20,
                 from arch/mn10300/unit-asb2303/include/unit/timex.h:15,
                 from arch/mn10300/include/asm/timex.h:15,
                 from include/linux/timex.h:174,
                 from include/linux/jiffies.h:8,
                 from include/linux/ktime.h:25,
                 from include/linux/timer.h:5,
                 from include/linux/workqueue.h:8,
  include/linux/srcu.h:55:22: error: field 'work' has incomplete type

As a consequence, we do need a few more inclusions of <asm/irq.h>, namely
in arch/mn10300/unit-asb2303/smc91111.c and
arch/mn10300/unit-asb2305/unit-init.c.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a643893

arch/mn10300/include/asm/timex.h

+0 −11
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#ifndef _ASM_TIMEX_H

#define _ASM_TIMEX_H



#include <asm/hardirq.h>

#include <unit/timex.h>



#define TICK_SIZE (tick_nsec / 1000)
@@ -30,16 +29,6 @@ static inline cycles_t get_cycles(void) 
extern int init_clockevents(void);

extern int init_clocksource(void);



static inline void setup_jiffies_interrupt(int irq,

					   struct irqaction *action)

{

	u16 tmp;

	setup_irq(irq, action);

	set_intr_level(irq, NUM2GxICR_LEVEL(CONFIG_TIMER_IRQ_LEVEL));

	GxICR(irq) |= GxICR_ENABLE | GxICR_DETECT | GxICR_REQUEST;

	tmp = GxICR(irq);

}



#endif /* __KERNEL__ */



#endif /* _ASM_TIMEX_H */

arch/mn10300/kernel/cevt-mn10300.c

+10 −0
Original line number Diff line number Diff line
@@ -70,6 +70,16 @@ static void event_handler(struct clock_event_device *dev) 
{

}



static inline void setup_jiffies_interrupt(int irq,

					   struct irqaction *action)

{

	u16 tmp;

	setup_irq(irq, action);

	set_intr_level(irq, NUM2GxICR_LEVEL(CONFIG_TIMER_IRQ_LEVEL));

	GxICR(irq) |= GxICR_ENABLE | GxICR_DETECT | GxICR_REQUEST;

	tmp = GxICR(irq);

}



int __init init_clockevents(void)

{

	struct clock_event_device *cd;

arch/mn10300/unit-asb2303/include/unit/timex.h

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
#ifndef _ASM_UNIT_TIMEX_H

#define _ASM_UNIT_TIMEX_H



#ifndef __ASSEMBLY__

#include <linux/irq.h>

#endif /* __ASSEMBLY__ */



#include <asm/timer-regs.h>

#include <unit/clock.h>

#include <asm/param.h>

arch/mn10300/unit-asb2303/smc91111.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/platform_device.h>



#include <asm/io.h>

#include <asm/irq.h>

#include <asm/timex.h>

#include <asm/processor.h>

#include <asm/intctl-regs.h>

arch/mn10300/unit-asb2305/include/unit/timex.h

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
#ifndef _ASM_UNIT_TIMEX_H

#define _ASM_UNIT_TIMEX_H



#ifndef __ASSEMBLY__

#include <linux/irq.h>

#endif /* __ASSEMBLY__ */



#include <asm/timer-regs.h>

#include <unit/clock.h>

#include <asm/param.h>