Re: 2.6.7-rc3-mm1

Nguyen, Tom L
2004-06-10T00:52:09Z

On Wed, Jun 09, 2004 at 01:35:15PM -0300, Norberto Bensa wrote:
>Hello,
>
>Andrew Morton wrote:
>>
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.7-rc3/
2.6
>>.7-rc3-mm1/
>
> CC drivers/pci/msi.o
>drivers/pci/msi.c: In function `msi_address_init':
>drivers/pci/msi.c:265: error: invalid operands to binary <<
>make[2]: *** [drivers/pci/msi.o] Error 1
>make[1]: *** [drivers/pci] Error 2
>make: *** [drivers] Error 2
>
>The offending line is:
>
> msi_address->lo_address.value |= (MSI_TARGET_CPU <<
MSI_TARGET_CPU_SHIFT);

Somehow the change in TARGET_CPUS generated this error in UP
environment. Patch
below will fix it.

Thanks,
Long

------------------------------------------------------------------------
-----------

diff -urN linux-2.6.7-rc3-mm1/include/asm-i386/msi.h
2.6.7-rc3-mm1-fix/include/asm-i386/msi.h
--- linux-2.6.7-rc3-mm1/include/asm-i386/msi.h 2004-05-09
22:32:52.000000000 -0400
+++ 2.6.7-rc3-mm1-fix/include/asm-i386/msi.h 2004-06-09
17:21:07.000000000 -0400
@@ -16,7 +16,7 @@
#ifdef CONFIG_SMP
#define MSI_TARGET_CPU logical_smp_processor_id()
#else
-#define MSI_TARGET_CPU TARGET_CPUS
+#define MSI_TARGET_CPU cpu_to_logical_apicid(first_cpu(cpu_online_map))
#endif

#endif /* ASM_MSI_H */