From: Olaf Hering <olaf@aepfle.de>
To: Linus Torvalds <torvalds@osdl.org>,
Paul Mackeras <paulus@samba.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>,
Andrew Morton <akpm@osdl.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Dmitry Torokhov <dtor@mail.ru>, Greg KH <greg@kroah.com>,
David Brownell <david-b@pacbell.net>,
Alan Stern <stern@rowland.harvard.edu>
Subject: [PATCH] ppc: PReP fixup after irq changes
Date: Fri, 6 Oct 2006 23:06:48 +0200 [thread overview]
Message-ID: <20061006210648.GA8428@aepfle.de> (raw)
In-Reply-To: <20061006205216.GA8272@aepfle.de>
compile fixes for PReP
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
xmon still needs some attention
arch/ppc/syslib/open_pic.c | 14 +++++++-------
include/asm-ppc/open_pic.h | 6 +++---
include/asm-ppc/smp.h | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
Index: linux-2.6/include/asm-ppc/open_pic.h
===================================================================
--- linux-2.6.orig/include/asm-ppc/open_pic.h
+++ linux-2.6/include/asm-ppc/open_pic.h
@@ -48,12 +48,12 @@ extern void openpic_init(int linux_irq_o
extern void openpic_init_nmi_irq(u_int irq);
extern void openpic_set_irq_priority(u_int irq, u_int pri);
extern void openpic_hookup_cascade(u_int irq, char *name,
- int (*cascade_fn)(struct pt_regs *));
+ int (*cascade_fn)(void));
extern u_int openpic_irq(void);
extern void openpic_eoi(void);
extern void openpic_request_IPIs(void);
extern void do_openpic_setup_cpu(void);
-extern int openpic_get_irq(struct pt_regs *regs);
+extern int openpic_get_irq(void);
extern void openpic_reset_processor_phys(u_int cpumask);
extern void openpic_setup_ISU(int isu_num, unsigned long addr);
extern void openpic_cause_IPI(u_int ipi, cpumask_t cpumask);
@@ -93,6 +93,6 @@ extern void openpic2_init(int linux_irq_
extern void openpic2_init_nmi_irq(u_int irq);
extern u_int openpic2_irq(void);
extern void openpic2_eoi(void);
-extern int openpic2_get_irq(struct pt_regs *regs);
+extern int openpic2_get_irq(void);
extern void openpic2_setup_ISU(int isu_num, unsigned long addr);
#endif /* _PPC_KERNEL_OPEN_PIC_H */
Index: linux-2.6/arch/ppc/syslib/open_pic.c
===================================================================
--- linux-2.6.orig/arch/ppc/syslib/open_pic.c
+++ linux-2.6/arch/ppc/syslib/open_pic.c
@@ -45,7 +45,7 @@ static u_int NumSources;
static int open_pic_irq_offset;
static volatile OpenPIC_Source __iomem *ISR[NR_IRQS];
static int openpic_cascade_irq = -1;
-static int (*openpic_cascade_fn)(struct pt_regs *);
+static int (*openpic_cascade_fn)(void);
/* Global Operations */
static void openpic_disable_8259_pass_through(void);
@@ -54,7 +54,7 @@ static void openpic_set_spurious(u_int v
#ifdef CONFIG_SMP
/* Interprocessor Interrupts */
static void openpic_initipi(u_int ipi, u_int pri, u_int vector);
-static irqreturn_t openpic_ipi_action(int cpl, void *dev_id, struct pt_regs *);
+static irqreturn_t openpic_ipi_action(int cpl, void *dev_id);
#endif
/* Timer Interrupts */
@@ -700,7 +700,7 @@ static struct irqaction openpic_cascade_
void __init
openpic_hookup_cascade(u_int irq, char *name,
- int (*cascade_fn)(struct pt_regs *))
+ int (*cascade_fn)(void))
{
openpic_cascade_irq = irq;
openpic_cascade_fn = cascade_fn;
@@ -857,16 +857,16 @@ static void openpic_end_ipi(unsigned int
{
}
-static irqreturn_t openpic_ipi_action(int cpl, void *dev_id, struct pt_regs *regs)
+static irqreturn_t openpic_ipi_action(int cpl, void *dev_id)
{
- smp_message_recv(cpl-OPENPIC_VEC_IPI-open_pic_irq_offset, regs);
+ smp_message_recv(cpl-OPENPIC_VEC_IPI-open_pic_irq_offset);
return IRQ_HANDLED;
}
#endif /* CONFIG_SMP */
int
-openpic_get_irq(struct pt_regs *regs)
+openpic_get_irq(void)
{
int irq = openpic_irq();
@@ -876,7 +876,7 @@ openpic_get_irq(struct pt_regs *regs)
* This should move to irq.c eventually. -- paulus
*/
if (irq == openpic_cascade_irq && openpic_cascade_fn != NULL) {
- int cirq = openpic_cascade_fn(regs);
+ int cirq = openpic_cascade_fn();
/* Allow for the cascade being shared with other devices */
if (cirq != -1) {
Index: linux-2.6/include/asm-ppc/smp.h
===================================================================
--- linux-2.6.orig/include/asm-ppc/smp.h
+++ linux-2.6/include/asm-ppc/smp.h
@@ -39,7 +39,7 @@ extern struct smp_ops_t *smp_ops;
extern void smp_send_tlb_invalidate(int);
extern void smp_send_xmon_break(int cpu);
struct pt_regs;
-extern void smp_message_recv(int, struct pt_regs *);
+extern void smp_message_recv(int);
extern int __cpu_disable(void);
extern void __cpu_die(unsigned int cpu);
next prev parent reply other threads:[~2006-10-06 21:16 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-02 16:20 [PATCH 1/3] IRQ: Typedef the IRQ flow handler function type David Howells
2006-10-02 16:20 ` [PATCH 2/3] IRQ: Typedef the IRQ " David Howells
[not found] ` <20061002162053.17763.26032.stgit@warthog.cambridge.redhat.com>
2006-10-02 20:21 ` [PATCH 3/3] IRQ: Maintain regs pointer globally rather than passing to IRQ handlers Andrew Morton
2006-10-02 20:18 ` Ingo Molnar
2006-10-02 20:54 ` Linus Torvalds
2006-10-02 21:01 ` Andrew Morton
2006-10-02 21:12 ` Linus Torvalds
2006-10-02 21:19 ` Andi Kleen
2006-10-02 21:46 ` Linus Torvalds
2006-10-02 21:47 ` Ingo Molnar
2006-10-02 21:59 ` Andi Kleen
2006-10-02 22:33 ` Linus Torvalds
2006-10-03 10:43 ` Ingo Molnar
[not found] ` <fa.v9OUIBlFjbmpdm2jHjUOj/6fm5Y@ifi.uio.no>
2006-10-07 18:44 ` Bill Waddington
2006-10-02 21:12 ` David Miller
2006-10-02 21:18 ` Thomas Gleixner
2006-10-02 22:59 ` Karsten Wiese
2006-10-03 0:36 ` Dave Airlie
2006-10-03 10:21 ` David Howells
2006-10-05 8:01 ` David Woodhouse
2006-10-03 10:01 ` David Howells
2006-10-03 10:30 ` David Howells
2006-10-02 20:43 ` Dmitry Torokhov
2006-10-02 20:56 ` Andrew Morton
2006-10-02 23:52 ` Greg KH
2006-10-02 20:46 ` David Brownell
2006-10-02 20:58 ` Andrew Morton
2006-10-02 21:34 ` Alan Stern
2006-10-02 23:00 ` David Brownell
2006-10-03 18:03 ` Alan Stern
2006-10-06 3:45 ` David Brownell
2006-10-06 17:42 ` Alan Stern
2006-10-05 14:22 ` David Howells
2006-10-05 19:46 ` Andrew Morton
2006-10-05 20:19 ` Thomas Gleixner
2006-10-05 20:20 ` Dmitry Torokhov
2006-10-05 20:34 ` Greg KH
2006-10-05 23:35 ` Linus Torvalds
2006-10-06 1:31 ` [PATCH] powerpc: irq change build breaks Olof Johansson
2006-10-06 4:22 ` Benjamin Herrenschmidt
2006-10-06 16:42 ` [PATCH 3/3] IRQ: Maintain regs pointer globally rather than passing to IRQ handlers Russell King
2006-10-06 18:01 ` Linus Torvalds
2006-10-07 2:54 ` Matthew Wilcox
2006-10-07 14:44 ` Matthew Wilcox
2006-10-06 18:53 ` [PATCH] fix mesh compile errors after irq changes Olaf Hering
2006-10-06 19:09 ` Geert Uytterhoeven
2006-10-06 20:34 ` [PATCH] powerpc: fixup " Olaf Hering
2006-10-06 20:52 ` [PATCH] powerpc: spu " Olaf Hering
2006-10-06 21:06 ` Olaf Hering [this message]
2006-10-07 0:19 ` [PATCH] powerpc: " Paul Mackerras
2006-10-07 12:25 ` Paul Mackerras
2006-10-06 0:52 ` [PATCH 3/3] IRQ: Maintain regs pointer globally rather than passing to IRQ handlers Jeff Garzik
2006-10-06 11:25 ` Alan Cox
2006-10-06 11:15 ` Jeff Garzik
2006-10-06 11:11 ` Ingo Molnar
2006-10-06 11:27 ` Jeff Garzik
2006-10-06 11:25 ` Ingo Molnar
2006-10-06 14:07 ` Dmitry Torokhov
2006-10-06 14:16 ` Jeff Garzik
2006-10-06 15:18 ` [PATCH, RAW] IRQ: Maintain irq number " Jeff Garzik
2006-10-06 15:20 ` Jeff Garzik
2006-10-06 15:47 ` Linus Torvalds
2006-10-06 16:21 ` Dmitry Torokhov
2006-10-06 16:40 ` Linus Torvalds
2006-10-06 16:38 ` Jeff Garzik
2006-10-06 8:03 ` [PATCH 3/3] IRQ: Maintain regs pointer " Gregor Jasny
[not found] <fa.FU9k10MvHKEiGBkmyRa0N7lIvX4@ifi.uio.no>
[not found] ` <fa.YmeJPP3GwSahgI09Gcaha4kqm84@ifi.uio.no>
[not found] ` <fa.qbSmIOXP3NtOgNMHs5oazelaSJs@ifi.uio.no>
[not found] ` <fa.AB8rZ1kwd3vQ1HCbYfV1438E4A0@ifi.uio.no>
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061006210648.GA8428@aepfle.de \
--to=olaf@aepfle.de \
--cc=akpm@osdl.org \
--cc=benh@kernel.crashing.org \
--cc=david-b@pacbell.net \
--cc=dhowells@redhat.com \
--cc=dtor@mail.ru \
--cc=greg@kroah.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=stern@rowland.harvard.edu \
--cc=tglx@linutronix.de \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox