Re: [PATCH] fix platform_rename_gsi related ia32 build breakage

[Arnaldo Carvalho de Melo <acme@conectiva.com.br>]

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

OK, last try, of course the patch is busted because the #endif should
be _before_ the break statement.

/me goes looking for a brown paper bag :-(

- Arnaldo

Arnaldo Carvalho de Melo wrote:
> This one compiles and links OK.
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo wrote:
> 
>> arch/i386/kernel/built-in.o(.text+0xeade): In function `pin_2_irq':
>> : undefined reference to `platform_rename_gsi'
>> make: ** [.tmp_vmlinux1] Erro 1
>>
>> Sorry, the patch is not enough...
>>
>> - Arnaldo
>>
>> Arnaldo Carvalho de Melo wrote:
>>
>>> Hi Linus,
>>>
>>>     This is needed to build current BK tree on IA32.
> 
> 
> ------------------------------------------------------------------------
> 
> ===== arch/i386/kernel/io_apic.c 1.116 vs edited =====
> --- 1.116/arch/i386/kernel/io_apic.c	2004-10-28 05:35:33 -03:00
> +++ edited/arch/i386/kernel/io_apic.c	2004-11-10 21:58:57 -02:00
> @@ -1069,12 +1069,14 @@
>  			while (i < apic)
>  				irq += nr_ioapic_registers[i++];
>  			irq += pin;
> +#ifdef CONFIG_ACPI_BOOT
>  			/*
>  			 * For MPS mode, so far only used by ES7000 platform
>  			 */
>  			if (platform_rename_gsi)
>  				irq = platform_rename_gsi(apic, irq);
>  			break;
> +#endif
>  		}
>  		default:
>  		{

[-- Attachment #2: a.patch --]
[-- Type: text/plain, Size: 488 bytes --]

===== arch/i386/kernel/io_apic.c 1.116 vs edited =====
--- 1.116/arch/i386/kernel/io_apic.c	2004-10-28 05:35:33 -03:00
+++ edited/arch/i386/kernel/io_apic.c	2004-11-10 22:17:37 -02:00
@@ -1069,11 +1069,13 @@
 			while (i < apic)
 				irq += nr_ioapic_registers[i++];
 			irq += pin;
+#ifdef CONFIG_ACPI_BOOT
 			/*
 			 * For MPS mode, so far only used by ES7000 platform
 			 */
 			if (platform_rename_gsi)
 				irq = platform_rename_gsi(apic, irq);
+#endif
 			break;
 		}
 		default: