On Fri, Feb 24, 2017 at 10:24:31AM +0100, Jonas Bonn wrote: > Hi Stafford, > > Squash this patch into the memcpy patch in order to prevent surprises for > anyone doing a git bisection through here.
Hi Jonas, Thanks for reviewing. Good spot. I intentionally didn't squash this one just to give Valentin credit on the fix. Also, since it wouldnt really be broken (build or boot issues) in the initial patch I didnt think it would be a bisect issue. Also, I noticed a lot of Valintin's patches pushed by people are separated out not squashed. -Stafford > /Jonas > > On 02/24/2017 05:32 AM, Stafford Horne wrote: > > From: Valentin Rothberg <valentinrothb...@gmail.com> > > > > The Kconfig option for OR12000 is OR1K_1200. > > > > Signed-off-by: Valentin Rothberg <valentinrothb...@gmail.com> > > Signed-off-by: Stafford Horne <sho...@gmail.com> > > --- > > arch/openrisc/lib/memcpy.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/openrisc/lib/memcpy.c b/arch/openrisc/lib/memcpy.c > > index 4706f01..669887a 100644 > > --- a/arch/openrisc/lib/memcpy.c > > +++ b/arch/openrisc/lib/memcpy.c > > @@ -17,7 +17,7 @@ > > #include <linux/string.h> > > -#ifdef CONFIG_OR1200 > > +#ifdef CONFIG_OR1K_1200 > > /* > > * Do memcpy with word copies and loop unrolling. This gives the > > * best performance on the OR1200 and MOR1KX archirectures > >
