malta broken on mainline

malta broken on mainline

[Martin Michlmayr]

malta is broken on mainline.  lmo contain a patch "[MIPS] SOCitSC support"
(which looks okay but mainline has a different change, namely "[MIPS] MT:
Reenable EIC support and add support for SOCit SC" which uses some defines
without updating the header file.

Are you aware of this problem?

http://www.linux-mips.org/git?p=linux.git;a=commitdiff;h=d1d5c41425124d5fa4a1ce6a59e13c7da48279c6
vs
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=d725cf3818b12a17d78b87a2de19e8eec17126ae


The error I get is:

  CC      arch/mips/mips-boards/malta/malta_int.o
arch/mips/mips-boards/malta/malta_int.c: In function ‘arch_init_irq’:
arch/mips/mips-boards/malta/malta_int.c:314: error: ‘mips_revision_sconid’ undeclared (first use in this function)
arch/mips/mips-boards/malta/malta_int.c:314: error: (Each undeclared identifier is reported only once
arch/mips/mips-boards/malta/malta_int.c:314: error: for each function it appears in.)
arch/mips/mips-boards/malta/malta_int.c:315: error: ‘MIPS_REVISION_SCON_SOCIT’ undeclared (first use in this function)
arch/mips/mips-boards/malta/malta_int.c:316: error: ‘MIPS_REVISION_SCON_ROCIT’ undeclared (first use in this function)
arch/mips/mips-boards/malta/malta_int.c:323: error: ‘MIPS_REVISION_SCON_SOCITSC’ undeclared (first use in this function)
arch/mips/mips-boards/malta/malta_int.c:324: error: ‘MIPS_REVISION_SCON_SOCITSCP’ undeclared (first use in this function)
make[5]: *** [arch/mips/mips-boards/malta/malta_int.o] Error 1

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: malta broken on mainline

[Chris Dearman]

Martin Michlmayr wrote:
> malta is broken on mainline.  lmo contain a patch "[MIPS] SOCitSC support"
> (which looks okay but mainline has a different change, namely "[MIPS] MT:
> Reenable EIC support and add support for SOCit SC" which uses some defines
> without updating the header file.

   There were 2 separate patches. Unfortunately they got applied in the 
wrong order several days apart. I suppose that in the intervening period 
the changes got pushed to kernel.org.
See 
http://www.linux-mips.org/git?p=linux.git;a=commit;h=d1d5c41425124d5fa4a1ce6a59e13c7da48279c6
for the other patch

Chris

-- 
Chris Dearman          7200 Cambridge Research Park     +44 1223 203108
MIPS Technologies (UK) Waterbeach, Cambs CB25 9TL  fax  +44 1223 203181