summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/proto.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-21 00:03:45 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-21 00:03:45 +0100
commitd5bdaf4f68f0590fc481bca54bcaffeb27b75fca (patch)
treea3c02e146c8c3b33e77e212f15d4851b6febd26b /arch/alpha/kernel/proto.h
parentMerge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/d... (diff)
parentalpha: Prevent a NULL ptr dereference in csum_partial_copy. (diff)
downloadlinux-d5bdaf4f68f0590fc481bca54bcaffeb27b75fca.tar.xz
linux-d5bdaf4f68f0590fc481bca54bcaffeb27b75fca.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha updates from Matt Turner: "It contains a few fixes and some work from Richard to make alpha emulation under QEMU much more usable" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha: alpha: Prevent a NULL ptr dereference in csum_partial_copy. alpha: perf: fix out-of-bounds array access triggered from raw event alpha: Use qemu+cserve provided high-res clock and alarm. alpha: Switch to GENERIC_CLOCKEVENTS alpha: Enable the rpcc clocksource for single processor alpha: Reorganize rtc handling alpha: Primitive support for CPU power down. alpha: Allow HZ to be configured alpha: Notice if we're being run under QEMU alpha: Eliminate compiler warning from memset macro
Diffstat (limited to 'arch/alpha/kernel/proto.h')
-rw-r--r--arch/alpha/kernel/proto.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h
index d3e52d3fd592..da2d6ec9c370 100644
--- a/arch/alpha/kernel/proto.h
+++ b/arch/alpha/kernel/proto.h
@@ -135,17 +135,15 @@ extern void unregister_srm_console(void);
/* smp.c */
extern void setup_smp(void);
extern void handle_ipi(struct pt_regs *);
-extern void smp_percpu_timer_interrupt(struct pt_regs *);
/* bios32.c */
/* extern void reset_for_srm(void); */
/* time.c */
-extern irqreturn_t timer_interrupt(int irq, void *dev);
+extern irqreturn_t rtc_timer_interrupt(int irq, void *dev);
+extern void init_clockevent(void);
extern void common_init_rtc(void);
extern unsigned long est_cycle_freq;
-extern unsigned int common_get_rtc_time(struct rtc_time *time);
-extern int common_set_rtc_time(struct rtc_time *time);
/* smc37c93x.c */
extern void SMC93x_Init(void);