Re: [PATCH] FRV: Fix interaction with new generic header stuff
From: Arnd Bergmann
Date: Sat Jun 13 2009 - 16:32:23 EST
On Saturday 13 June 2009, David Howells wrote:
> Fix interaction with new generic header stuff as added by:
> commit 6103ec56c65c33774c7c38652c8204120c3c7519
> Author: Arnd Bergmann <arnd@xxxxxxxx>
> Date: Wed May 13 22:56:27 2009 +0000
> asm-generic: add generic ABI headers
> The problem is that asm/signal.h has been made to include asm-generic/signal.h,
> but the redundant stuff from asm/signal.h has not been discarded, leading to
> multiple redefinitions.
> Cc: Arnd Bergmann <arnd@xxxxxxxx>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
This was the result of an incorrectly resolved merge conflict on my side,
after you moved the frv headers around. I fixed the same bug for other
architectures, but frv has slipped through for some reason.
My intended fix was to simply change #include <asm-generic/signal.h>
to #include <asm-generic/signal-defs.h>, which would have been guaranteed
to be non-invasive. Your change of course is the long-term cleanup
that reuses the asm-generic file.
Sorry about the breakage.
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/