diff options
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/i8259.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/ibmebus.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/ipic.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/iseries/hv_lp_event.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/iseries/it_lp_queue.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/machdep.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/mpic.h | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/include/asm-powerpc/i8259.h b/include/asm-powerpc/i8259.h index c80e113052cd..78489fb8d140 100644 --- a/include/asm-powerpc/i8259.h +++ b/include/asm-powerpc/i8259.h | |||
@@ -6,10 +6,10 @@ | |||
6 | 6 | ||
7 | #ifdef CONFIG_PPC_MERGE | 7 | #ifdef CONFIG_PPC_MERGE |
8 | extern void i8259_init(struct device_node *node, unsigned long intack_addr); | 8 | extern void i8259_init(struct device_node *node, unsigned long intack_addr); |
9 | extern unsigned int i8259_irq(struct pt_regs *regs); | 9 | extern unsigned int i8259_irq(void); |
10 | #else | 10 | #else |
11 | extern void i8259_init(unsigned long intack_addr, int offset); | 11 | extern void i8259_init(unsigned long intack_addr, int offset); |
12 | extern int i8259_irq(struct pt_regs *regs); | 12 | extern int i8259_irq(void); |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #endif /* __KERNEL__ */ | 15 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-powerpc/ibmebus.h b/include/asm-powerpc/ibmebus.h index 7ab195a27888..9d25f2063b03 100644 --- a/include/asm-powerpc/ibmebus.h +++ b/include/asm-powerpc/ibmebus.h | |||
@@ -65,7 +65,7 @@ void ibmebus_unregister_driver(struct ibmebus_driver *drv); | |||
65 | 65 | ||
66 | int ibmebus_request_irq(struct ibmebus_dev *dev, | 66 | int ibmebus_request_irq(struct ibmebus_dev *dev, |
67 | u32 ist, | 67 | u32 ist, |
68 | irqreturn_t (*handler)(int, void*, struct pt_regs *), | 68 | irqreturn_t (*handler)(int, void*), |
69 | unsigned long irq_flags, const char * devname, | 69 | unsigned long irq_flags, const char * devname, |
70 | void *dev_id); | 70 | void *dev_id); |
71 | void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id); | 71 | void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id); |
diff --git a/include/asm-powerpc/ipic.h b/include/asm-powerpc/ipic.h index 1ce09a35906e..9fbb03415860 100644 --- a/include/asm-powerpc/ipic.h +++ b/include/asm-powerpc/ipic.h | |||
@@ -79,12 +79,12 @@ extern void ipic_clear_mcp_status(u32 mask); | |||
79 | 79 | ||
80 | #ifdef CONFIG_PPC_MERGE | 80 | #ifdef CONFIG_PPC_MERGE |
81 | extern void ipic_init(struct device_node *node, unsigned int flags); | 81 | extern void ipic_init(struct device_node *node, unsigned int flags); |
82 | extern unsigned int ipic_get_irq(struct pt_regs *regs); | 82 | extern unsigned int ipic_get_irq(void); |
83 | #else | 83 | #else |
84 | extern void ipic_init(phys_addr_t phys_addr, unsigned int flags, | 84 | extern void ipic_init(phys_addr_t phys_addr, unsigned int flags, |
85 | unsigned int irq_offset, | 85 | unsigned int irq_offset, |
86 | unsigned char *senses, unsigned int senses_count); | 86 | unsigned char *senses, unsigned int senses_count); |
87 | extern int ipic_get_irq(struct pt_regs *regs); | 87 | extern int ipic_get_irq(void); |
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | #endif /* __ASM_IPIC_H__ */ | 90 | #endif /* __ASM_IPIC_H__ */ |
diff --git a/include/asm-powerpc/iseries/hv_lp_event.h b/include/asm-powerpc/iseries/hv_lp_event.h index 4065a4de4935..6ce2ce1e2690 100644 --- a/include/asm-powerpc/iseries/hv_lp_event.h +++ b/include/asm-powerpc/iseries/hv_lp_event.h | |||
@@ -50,7 +50,7 @@ struct HvLpEvent { | |||
50 | u64 xCorrelationToken; /* Unique value for source/type x10-x17 */ | 50 | u64 xCorrelationToken; /* Unique value for source/type x10-x17 */ |
51 | }; | 51 | }; |
52 | 52 | ||
53 | typedef void (*LpEventHandler)(struct HvLpEvent *, struct pt_regs *); | 53 | typedef void (*LpEventHandler)(struct HvLpEvent *); |
54 | 54 | ||
55 | /* Register a handler for an event type - returns 0 on success */ | 55 | /* Register a handler for an event type - returns 0 on success */ |
56 | extern int HvLpEvent_registerHandler(HvLpEvent_Type eventType, | 56 | extern int HvLpEvent_registerHandler(HvLpEvent_Type eventType, |
diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/include/asm-powerpc/iseries/it_lp_queue.h index 3f6814769295..428278838821 100644 --- a/include/asm-powerpc/iseries/it_lp_queue.h +++ b/include/asm-powerpc/iseries/it_lp_queue.h | |||
@@ -72,7 +72,7 @@ struct hvlpevent_queue { | |||
72 | extern struct hvlpevent_queue hvlpevent_queue; | 72 | extern struct hvlpevent_queue hvlpevent_queue; |
73 | 73 | ||
74 | extern int hvlpevent_is_pending(void); | 74 | extern int hvlpevent_is_pending(void); |
75 | extern void process_hvlpevents(struct pt_regs *); | 75 | extern void process_hvlpevents(void); |
76 | extern void setup_hvlpevent_queue(void); | 76 | extern void setup_hvlpevent_queue(void); |
77 | 77 | ||
78 | #endif /* _ASM_POWERPC_ISERIES_IT_LP_QUEUE_H */ | 78 | #endif /* _ASM_POWERPC_ISERIES_IT_LP_QUEUE_H */ |
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h index c17c13742401..dac90dc341cb 100644 --- a/include/asm-powerpc/machdep.h +++ b/include/asm-powerpc/machdep.h | |||
@@ -97,7 +97,7 @@ struct machdep_calls { | |||
97 | void (*show_percpuinfo)(struct seq_file *m, int i); | 97 | void (*show_percpuinfo)(struct seq_file *m, int i); |
98 | 98 | ||
99 | void (*init_IRQ)(void); | 99 | void (*init_IRQ)(void); |
100 | unsigned int (*get_irq)(struct pt_regs *); | 100 | unsigned int (*get_irq)(void); |
101 | #ifdef CONFIG_KEXEC | 101 | #ifdef CONFIG_KEXEC |
102 | void (*kexec_cpu_down)(int crash_shutdown, int secondary); | 102 | void (*kexec_cpu_down)(int crash_shutdown, int secondary); |
103 | #endif | 103 | #endif |
diff --git a/include/asm-powerpc/mpic.h b/include/asm-powerpc/mpic.h index a9f9604b9eff..ef0a5458d2b2 100644 --- a/include/asm-powerpc/mpic.h +++ b/include/asm-powerpc/mpic.h | |||
@@ -409,9 +409,9 @@ extern void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask); | |||
409 | void smp_mpic_message_pass(int target, int msg); | 409 | void smp_mpic_message_pass(int target, int msg); |
410 | 410 | ||
411 | /* Fetch interrupt from a given mpic */ | 411 | /* Fetch interrupt from a given mpic */ |
412 | extern unsigned int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs); | 412 | extern unsigned int mpic_get_one_irq(struct mpic *mpic); |
413 | /* This one gets to the primary mpic */ | 413 | /* This one gets to the primary mpic */ |
414 | extern unsigned int mpic_get_irq(struct pt_regs *regs); | 414 | extern unsigned int mpic_get_irq(void); |
415 | 415 | ||
416 | /* Set the EPIC clock ratio */ | 416 | /* Set the EPIC clock ratio */ |
417 | void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio); | 417 | void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio); |