mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
m68k: use non-mmu version of unaligned.h for all m68k
The non-mmu version is appropriately ifdef'ed to be used "as is" on all m68k varients. So switch to it as the only unaligned.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
f358cbcd49
commit
af85fe9e5e
3 changed files with 23 additions and 41 deletions
|
@ -1,5 +1,25 @@
|
|||
#ifdef __uClinux__
|
||||
#include "unaligned_no.h"
|
||||
#ifndef _ASM_M68KNOMMU_UNALIGNED_H
|
||||
#define _ASM_M68KNOMMU_UNALIGNED_H
|
||||
|
||||
|
||||
#ifdef CONFIG_COLDFIRE
|
||||
#include <linux/unaligned/be_struct.h>
|
||||
#include <linux/unaligned/le_byteshift.h>
|
||||
#include <linux/unaligned/generic.h>
|
||||
|
||||
#define get_unaligned __get_unaligned_be
|
||||
#define put_unaligned __put_unaligned_be
|
||||
|
||||
#else
|
||||
#include "unaligned_mm.h"
|
||||
/*
|
||||
* The m68k can do unaligned accesses itself.
|
||||
*/
|
||||
#include <linux/unaligned/access_ok.h>
|
||||
#include <linux/unaligned/generic.h>
|
||||
|
||||
#define get_unaligned __get_unaligned_be
|
||||
#define put_unaligned __put_unaligned_be
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_M68KNOMMU_UNALIGNED_H */
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
#ifndef _ASM_M68K_UNALIGNED_H
|
||||
#define _ASM_M68K_UNALIGNED_H
|
||||
|
||||
/*
|
||||
* The m68k can do unaligned accesses itself.
|
||||
*/
|
||||
#include <linux/unaligned/access_ok.h>
|
||||
#include <linux/unaligned/generic.h>
|
||||
|
||||
#define get_unaligned __get_unaligned_be
|
||||
#define put_unaligned __put_unaligned_be
|
||||
|
||||
#endif /* _ASM_M68K_UNALIGNED_H */
|
|
@ -1,25 +0,0 @@
|
|||
#ifndef _ASM_M68KNOMMU_UNALIGNED_H
|
||||
#define _ASM_M68KNOMMU_UNALIGNED_H
|
||||
|
||||
|
||||
#ifdef CONFIG_COLDFIRE
|
||||
#include <linux/unaligned/be_struct.h>
|
||||
#include <linux/unaligned/le_byteshift.h>
|
||||
#include <linux/unaligned/generic.h>
|
||||
|
||||
#define get_unaligned __get_unaligned_be
|
||||
#define put_unaligned __put_unaligned_be
|
||||
|
||||
#else
|
||||
/*
|
||||
* The m68k can do unaligned accesses itself.
|
||||
*/
|
||||
#include <linux/unaligned/access_ok.h>
|
||||
#include <linux/unaligned/generic.h>
|
||||
|
||||
#define get_unaligned __get_unaligned_be
|
||||
#define put_unaligned __put_unaligned_be
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_M68KNOMMU_UNALIGNED_H */
|
Loading…
Reference in a new issue