diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /include/asm-x86_64/proto.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-x86_64/proto.h')
| -rw-r--r-- | include/asm-x86_64/proto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index c28fc2db217..c181fef786e 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -66,7 +66,7 @@ extern void free_bootmem_generic(unsigned long phys, unsigned len); extern void load_gs_index(unsigned gs); extern void stop_timer_interrupt(void); -extern void main_timer_handler(struct pt_regs *regs); +extern void main_timer_handler(void); extern unsigned long end_pfn_map; @@ -124,7 +124,7 @@ extern int notsc_setup(char *); extern int gsi_irq_sharing(int gsi); -extern void smp_local_timer_interrupt(struct pt_regs * regs); +extern void smp_local_timer_interrupt(void); long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); |