Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932491AbVJCSOn (ORCPT ); Mon, 3 Oct 2005 14:14:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932492AbVJCSOm (ORCPT ); Mon, 3 Oct 2005 14:14:42 -0400 Received: from c-24-10-253-213.hsd1.ut.comcast.net ([24.10.253.213]:11648 "EHLO linux.site") by vger.kernel.org with ESMTP id S932491AbVJCSOm (ORCPT ); Mon, 3 Oct 2005 14:14:42 -0400 Subject: [patch 1/1] ES7000 platform update (i386) To: akpm@osdl.org Cc: ak@suse.de, linux-kernel@vger.kernel.org, Natalie.Protasevich@unisys.com From: Natalie.Protasevich@unisys.com Date: Sun, 02 Oct 2005 16:07:46 -0700 Message-Id: <20051002230747.AFDF643F57@linux.site> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2727 Lines: 65 This is platform code update for ES7000: disables IRQ overrides for the recent ES7000 (Rascal/Zorro), cleans up the compile warning. The patch only affects the ES7000 subach. Signed-off-by: --- arch/i386/mach-es7000/es7000.h | 2 +- arch/i386/mach-es7000/es7000plat.c | 5 ++++- include/asm-i386/mach-es7000/mach_mpparse.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff -puN arch/i386/mach-es7000/es7000.h~es7000_plat_update arch/i386/mach-es7000/es7000.h --- linux-2.6.14-rc2-mm2/arch/i386/mach-es7000/es7000.h~es7000_plat_update 2005-10-02 15:06:09.523620888 -0700 +++ linux-2.6.14-rc2-mm2-root/arch/i386/mach-es7000/es7000.h 2005-10-02 15:10:22.708130992 -0700 @@ -106,6 +106,6 @@ struct mip_reg { extern int parse_unisys_oem (char *oemptr); extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); -extern void setup_unisys (); +extern void setup_unisys(void); extern int es7000_start_cpu(int cpu, unsigned long eip); extern void es7000_sw_apic(void); diff -puN arch/i386/mach-es7000/es7000plat.c~es7000_plat_update arch/i386/mach-es7000/es7000plat.c --- linux-2.6.14-rc2-mm2/arch/i386/mach-es7000/es7000plat.c~es7000_plat_update 2005-10-02 15:06:09.558615568 -0700 +++ linux-2.6.14-rc2-mm2-root/arch/i386/mach-es7000/es7000plat.c 2005-10-02 15:11:18.916586008 -0700 @@ -62,6 +62,9 @@ static unsigned int base; static int es7000_rename_gsi(int ioapic, int gsi) { + if (es7000_plat == 2) + return gsi; + if (!base) { int i; for (i = 0; i < nr_ioapics; i++) @@ -76,7 +79,7 @@ es7000_rename_gsi(int ioapic, int gsi) #endif /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */ void __init -setup_unisys () +setup_unisys(void) { /* * Determine the generation of the ES7000 currently running. diff -puN include/asm-i386/mach-es7000/mach_mpparse.h~es7000_plat_update include/asm-i386/mach-es7000/mach_mpparse.h --- linux-2.6.14-rc2-mm2/include/asm-i386/mach-es7000/mach_mpparse.h~es7000_plat_update 2005-10-02 15:06:09.594610096 -0700 +++ linux-2.6.14-rc2-mm2-root/include/asm-i386/mach-es7000/mach_mpparse.h 2005-10-02 15:11:41.029224376 -0700 @@ -16,7 +16,7 @@ static inline void mpc_oem_pci_bus(struc extern int parse_unisys_oem (char *oemptr); extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); -extern void setup_unisys(); +extern void setup_unisys(void); static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid) _ - 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/