Messages in this thread Patch in this message | | | Date | Thu, 22 Apr 2004 10:36:20 +0200 (CEST) | Subject | [PATCH] fix compilation of ppc embedded configs | From | Rene Rebe <> |
| |
Hi,
the attached patch converts some arch/ppc/platforms/*_setup.c files to the new openpic_init argument cleanups and additional fixes the includes of platforms/pplus.c.
prpmc750 config and pplus config tested and booted.
--- linux-2.6.6-rc2/arch/ppc/platforms/gemini_setup.c 2004-03-11 03:55:27.000000000 +0100 +++ linux-2.6.5-wip/arch/ppc/platforms/gemini_setup.c 2004-04-19 18:02:39.000000000 +0200 @@ -324,7 +324,7 @@ void __init gemini_init_IRQ(void) { /* gemini has no 8259 */ - openpic_init(1, 0, 0, -1); + openpic_init(0); } #define gemini_rtc_read(x) (readb(GEMINI_RTC+(x))) --- linux-2.6.6-rc2/arch/ppc/platforms/mvme5100_setup.c 2004-03-11 03:55:24.000000000 +0100 +++ linux-2.6.5-wip/arch/ppc/platforms/mvme5100_setup.c 2004-04-19 18:03:09.000000000 +0200 @@ -137,14 +137,14 @@ ppc_md.progress("init_irq: enter", 0); #ifdef CONFIG_MVME5100_IPMC761_PRESENT - openpic_init(1, NUM_8259_INTERRUPTS, NULL, -1); + openpic_init(NUM_8259_INTERRUPTS); for(i=0; i < NUM_8259_INTERRUPTS; i++) irq_desc[i].handler = &i8259_pic; i8259_init(NULL); #else - openpic_init(1, 0, NULL, -1); + openpic_init(0); #endif if ( ppc_md.progress ) --- linux-2.6.6-rc2/arch/ppc/platforms/powerpmc250.c 2004-03-11 03:55:23.000000000 +0100 +++ linux-2.6.5-wip/arch/ppc/platforms/powerpmc250.c 2004-04-19 18:03:28.000000000 +0200 @@ -197,7 +197,7 @@ OpenPIC_InitSenses = powerpmc250_openpic_initsenses; OpenPIC_NumInitSenses = sizeof(powerpmc250_openpic_initsenses); - openpic_init(1, 0, 0, -1); + openpic_init(0); } /* --- linux-2.6.6-rc2/arch/ppc/platforms/pplus.c 2004-04-22 10:27:16.000000000 +0200 +++ linux-2.6.5-wip/arch/ppc/platforms/pplus.c 2004-04-18 22:36:08.000000000 +0200 @@ -19,6 +19,7 @@ #include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/init.h> +#include <linux/initrd.h> #include <linux/ioport.h> #include <linux/console.h> #include <linux/pci.h> --- linux-2.6.6-rc2/arch/ppc/platforms/prpmc750_setup.c 2004-03-11 03:55:25.000000000 +0100 +++ linux-2.6.5-wip/arch/ppc/platforms/prpmc750_setup.c 2004-04-18 22:09:44.000000000 +0200 @@ -39,7 +39,7 @@ #include <platforms/prpmc750.h> #include <asm/open_pic.h> #include <asm/bootinfo.h> -#include <asm/pplus.h> +#include "pplus.h" extern void prpmc750_find_bridges(void); extern int mpic_init(void); @@ -203,7 +203,7 @@ static void __init prpmc750_init_IRQ(void) { - openpic_init(1, 0, 0, -1); + openpic_init(0); } /* --- linux-2.6.6-rc2/arch/ppc/platforms/prpmc800_setup.c 2004-03-11 03:55:28.000000000 +0100 +++ linux-2.6.5-wip/arch/ppc/platforms/prpmc800_setup.c 2004-04-19 18:03:51.000000000 +0200 @@ -197,7 +197,7 @@ static void __init prpmc800_init_IRQ(void) { - openpic_init(1, 0, 0, -1); + openpic_init(0); #define PRIORITY 15 #define VECTOR 16
Sincerely yours, René Rebe - ROCK Linux stable release maintainer
-- René Rebe - Europe/Germany/Berlin rene@rocklinux.org rene@rocklinux-consulting.de http://www.rocklinux.org http://www.rocklinux-consulting.de
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |