diff options
| author | Tom Rini | 2023-05-31 16:30:16 -0400 |
|---|---|---|
| committer | Tom Rini | 2023-05-31 16:30:16 -0400 |
| commit | e863c7b2854bf9a882939f828023508fb1a1bc16 (patch) | |
| tree | f79172936480f220dacc9dab8bf8bebb1a80571f /arch/mips/include/asm/unaligned.h | |
| parent | 06af8fcf6ce2833dc4e8a897a1467248c86d0205 (diff) | |
| parent | 60f1ba7b68f25a8d6eff65928ac87fdbfb80add4 (diff) | |
Merge branch '2023-05-31-cleanup-unaligned-access-macros' into next
To quote the author:
There are two versions of get/set_unaligned, get_unaligned_be64,
put_unaligned_le64 etc in U-Boot causing confusion (and bugs).
In this patch-set, I'm trying to fix that with a single unified version of
the access macros to be used across all archs. This work is inspired by
similar changes in this Linux kernel by Arnd Bergman,
https://lore.kernel.org/lkml/20210514100106.3404011-1-arnd@kernel.org/
Diffstat (limited to 'arch/mips/include/asm/unaligned.h')
| -rw-r--r-- | arch/mips/include/asm/unaligned.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/arch/mips/include/asm/unaligned.h b/arch/mips/include/asm/unaligned.h index debb9cf7aba..7fb482abc38 100644 --- a/arch/mips/include/asm/unaligned.h +++ b/arch/mips/include/asm/unaligned.h @@ -1,23 +1,2 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org) - */ -#ifndef _ASM_MIPS_UNALIGNED_H -#define _ASM_MIPS_UNALIGNED_H - -#include <linux/compiler.h> -#if defined(__MIPSEB__) -#define get_unaligned __get_unaligned_be -#define put_unaligned __put_unaligned_be -#elif defined(__MIPSEL__) -#define get_unaligned __get_unaligned_le -#define put_unaligned __put_unaligned_le -#else -#error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???" -#endif - -#include <linux/unaligned/le_byteshift.h> -#include <linux/unaligned/be_byteshift.h> -#include <linux/unaligned/generic.h> - -#endif /* _ASM_MIPS_UNALIGNED_H */ +#include <asm-generic/unaligned.h> |