Re: [PATCH] mips: Add #ifdef in file bridge.h

[Nick Krause]

Would you like me to send a new patch fixing this issue? I misread the comment.
Cheers Nick


On Sun, Jul 6, 2014 at 3:08 AM, Jayachandran C. <jchandra@xxxxxxxxxxxx> wrote:
> On Sun, Jul 06, 2014 at 01:58:43AM -0400, Nick Krause wrote:
>> No I didn't I finally learned how to cross compile the kernel it's not
>> hard just have to find the docs for it :).
>> Cheers Nick
>
> There is already an ifdef in the right place in the file. There is not need
> to move it here as these macros are safe for assembly.
>
> The FIXME comment was a note to verfiy the Flash BAR address taken from the
> manual. Ideally, this has to be removed after checking it on hardware. Thanks
> for pointing this out.
>
> But the patch is incorrect and can be dropped.
>
>> On Sat, Jul 5, 2014 at 10:43 AM, Randy Dunlap <rdunlap@xxxxxxxxxxxxx> wrote:
>> > On 07/04/2014 07:50 PM, Nicholas Krause wrote:
>> >> This patch addes a #ifdef __ASSEMBLY__ in order to check if this part
>> >> of the file is configured to fix this #ifdef block in bridge.h for mips.
>> >>
>> >> Signed-off-by: Nicholas Krause <xerofoify@xxxxxxxxx>
>> >> ---
>> >>  arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 2 +-
>> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/arch/mips/include/asm/netlogic/xlp-hal/bridge.h b/arch/mips/include/asm/netlogic/xlp-hal/bridge.h
>> >> index 3067f98..4f315c3 100644
>> >> --- a/arch/mips/include/asm/netlogic/xlp-hal/bridge.h
>> >> +++ b/arch/mips/include/asm/netlogic/xlp-hal/bridge.h
>> >> @@ -143,7 +143,7 @@
>> >>  #define BRIDGE_GIO_WEIGHT            0x2cb
>> >>  #define BRIDGE_FLASH_WEIGHT          0x2cc
>> >>
>> >> -/* FIXME verify */
>> >> +#ifdef __ASSEMBLY__
>> >>  #define BRIDGE_9XX_FLASH_BAR(i)              (0x11 + (i))
>> >>  #define BRIDGE_9XX_FLASH_BAR_LIMIT(i)        (0x15 + (i))
>> >>
>> >>
>> >
>> > Hi,
>> >
>> > Where is the corresponding #endif ?
>> > The #endif at line 185 goes with the #ifndef __ASSEMBLY__ at line 176.
>> >
>> > I think that this patch will cause a build error (or at least a warning).
>> > Did you test it?
>> >
>
> JC.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/