On Thu, Apr 28, 2016 at 12:45:44PM -0600, Stephen Warren wrote: > From: Stephen Warren <swar...@nvidia.com> > > Commit 724219a65f55 "ARM: always perform per-CPU GIC init" removed some > ifdefs to unify the MULTIENTRY-vs-non-MULTIENTRY paths. However, the > wrong endif was removed. This patch adds back that missing endif, and > adds a new ifdef to match the endif the now-correctly-terminated block > used to match against. Use "git show -U25 724219a65f55" to see enough > context to make the original issue clear. > > In practical terms, this makes no difference to runtime behaviour. The > code that was incorrectly compiled into the binary when ifndef MULTIENTRY > is a no-op for other cases, since branch_if_master evaluates to a hard- > coded jump. The only issues were: > > - A few extra instructions were added to the binary. > - The comment on the endif at the very end of the function, indicating > which ifdef it matched, were wrong. > > An alternative might be to simply fix the comment on that trailing ifdef, > but that only addresses the second point above, not the first. > > Fixes: 724219a65f55 ("ARM: always perform per-CPU GIC init") > Cc: Masahiro Yamada <yamada.masah...@socionext.com> > Signed-off-by: Stephen Warren <swar...@nvidia.com> > Reviewed-by: Masahiro Yamada <yamada.masah...@socionext.com>
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot