1fdb24e969
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
57 lines
1 KiB
C
57 lines
1 KiB
C
/*
|
|
* arch/arm/include/asm/localtimer.h
|
|
*
|
|
* Copyright (C) 2004-2005 ARM Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef __ASM_ARM_LOCALTIMER_H
|
|
#define __ASM_ARM_LOCALTIMER_H
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/interrupt.h>
|
|
|
|
struct clock_event_device;
|
|
|
|
/*
|
|
* Setup a per-cpu timer, whether it be a local timer or dummy broadcast
|
|
*/
|
|
void percpu_timer_setup(void);
|
|
|
|
#ifdef CONFIG_LOCAL_TIMERS
|
|
|
|
#ifdef CONFIG_HAVE_ARM_TWD
|
|
|
|
#include "smp_twd.h"
|
|
|
|
#define local_timer_stop(c) twd_timer_stop((c))
|
|
|
|
#else
|
|
|
|
/*
|
|
* Stop the local timer
|
|
*/
|
|
void local_timer_stop(struct clock_event_device *);
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Setup a local timer interrupt for a CPU.
|
|
*/
|
|
int local_timer_setup(struct clock_event_device *);
|
|
|
|
#else
|
|
|
|
static inline int local_timer_setup(struct clock_event_device *evt)
|
|
{
|
|
return -ENXIO;
|
|
}
|
|
|
|
static inline void local_timer_stop(struct clock_event_device *evt)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif
|