On Mon, Oct 17, 2016 at 03:56:21PM +0100, Paul Burton wrote: > The MIPS-specific asm/unaligned.h provides nothing that the generic > version doesn't - it simply uses MIPS-specific endianness macros in > place of generic ones & lacks support for > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. Remove it & switch to using the > generic version to remove duplication. > > Signed-off-by: Paul Burton <paul.burton@xxxxxxxxxx> > Cc: linux-mips@xxxxxxxxxxxxxx > Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Reviewed-by: James Hogan <james.hogan@xxxxxxxxxx> Cheers James > --- > > arch/mips/include/asm/Kbuild | 1 + > arch/mips/include/asm/unaligned.h | 28 ---------------------------- > 2 files changed, 1 insertion(+), 28 deletions(-) > delete mode 100644 arch/mips/include/asm/unaligned.h > > diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild > index 9740066..96b5be5 100644 > --- a/arch/mips/include/asm/Kbuild > +++ b/arch/mips/include/asm/Kbuild > @@ -17,6 +17,7 @@ generic-y += sections.h > generic-y += segment.h > generic-y += serial.h > generic-y += trace_clock.h > +generic-y += unaligned.h > generic-y += user.h > generic-y += word-at-a-time.h > generic-y += xor.h > diff --git a/arch/mips/include/asm/unaligned.h b/arch/mips/include/asm/unaligned.h > deleted file mode 100644 > index 42f66c3..0000000 > --- a/arch/mips/include/asm/unaligned.h > +++ /dev/null > @@ -1,28 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2007 Ralf Baechle (ralf@xxxxxxxxxxxxxx) > - */ > -#ifndef _ASM_MIPS_UNALIGNED_H > -#define _ASM_MIPS_UNALIGNED_H > - > -#include <linux/compiler.h> > -#if defined(__MIPSEB__) > -# include <linux/unaligned/be_struct.h> > -# include <linux/unaligned/le_byteshift.h> > -# define get_unaligned __get_unaligned_be > -# define put_unaligned __put_unaligned_be > -#elif defined(__MIPSEL__) > -# include <linux/unaligned/le_struct.h> > -# include <linux/unaligned/be_byteshift.h> > -# define get_unaligned __get_unaligned_le > -# define put_unaligned __put_unaligned_le > -#else > -# error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???" > -#endif > - > -# include <linux/unaligned/generic.h> > - > -#endif /* _ASM_MIPS_UNALIGNED_H */ > -- > 2.10.0 > >
Attachment:
signature.asc
Description: Digital signature
