diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /include/asm-x86_64/proto.h | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
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 c28fc2db2171..c181fef786e4 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); | |||
| 66 | extern void load_gs_index(unsigned gs); | 66 | extern void load_gs_index(unsigned gs); |
| 67 | 67 | ||
| 68 | extern void stop_timer_interrupt(void); | 68 | extern void stop_timer_interrupt(void); |
| 69 | extern void main_timer_handler(struct pt_regs *regs); | 69 | extern void main_timer_handler(void); |
| 70 | 70 | ||
| 71 | extern unsigned long end_pfn_map; | 71 | extern unsigned long end_pfn_map; |
| 72 | 72 | ||
| @@ -124,7 +124,7 @@ extern int notsc_setup(char *); | |||
| 124 | 124 | ||
| 125 | extern int gsi_irq_sharing(int gsi); | 125 | extern int gsi_irq_sharing(int gsi); |
| 126 | 126 | ||
| 127 | extern void smp_local_timer_interrupt(struct pt_regs * regs); | 127 | extern void smp_local_timer_interrupt(void); |
| 128 | 128 | ||
| 129 | long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); | 129 | long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); |
| 130 | 130 | ||