tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+23
-41
+23
-3
arch/m68k/include/asm/unaligned.h
+23
-3
arch/m68k/include/asm/unaligned.h
···
1
-
#ifdef __uClinux__
2
-
#include "unaligned_no.h"
1
+
#ifndef _ASM_M68KNOMMU_UNALIGNED_H
2
+
#define _ASM_M68KNOMMU_UNALIGNED_H
3
+
4
+
5
+
#ifdef CONFIG_COLDFIRE
6
+
#include <linux/unaligned/be_struct.h>
7
+
#include <linux/unaligned/le_byteshift.h>
8
+
#include <linux/unaligned/generic.h>
9
+
10
+
#define get_unaligned __get_unaligned_be
11
+
#define put_unaligned __put_unaligned_be
12
+
3
13
#else
4
-
#include "unaligned_mm.h"
14
+
/*
15
+
* The m68k can do unaligned accesses itself.
16
+
*/
17
+
#include <linux/unaligned/access_ok.h>
18
+
#include <linux/unaligned/generic.h>
19
+
20
+
#define get_unaligned __get_unaligned_be
21
+
#define put_unaligned __put_unaligned_be
22
+
5
23
#endif
24
+
25
+
#endif /* _ASM_M68KNOMMU_UNALIGNED_H */
-13
arch/m68k/include/asm/unaligned_mm.h
-13
arch/m68k/include/asm/unaligned_mm.h
···
1
-
#ifndef _ASM_M68K_UNALIGNED_H
2
-
#define _ASM_M68K_UNALIGNED_H
3
-
4
-
/*
5
-
* The m68k can do unaligned accesses itself.
6
-
*/
7
-
#include <linux/unaligned/access_ok.h>
8
-
#include <linux/unaligned/generic.h>
9
-
10
-
#define get_unaligned __get_unaligned_be
11
-
#define put_unaligned __put_unaligned_be
12
-
13
-
#endif /* _ASM_M68K_UNALIGNED_H */
-25
arch/m68k/include/asm/unaligned_no.h
-25
arch/m68k/include/asm/unaligned_no.h
···
1
-
#ifndef _ASM_M68KNOMMU_UNALIGNED_H
2
-
#define _ASM_M68KNOMMU_UNALIGNED_H
3
-
4
-
5
-
#ifdef CONFIG_COLDFIRE
6
-
#include <linux/unaligned/be_struct.h>
7
-
#include <linux/unaligned/le_byteshift.h>
8
-
#include <linux/unaligned/generic.h>
9
-
10
-
#define get_unaligned __get_unaligned_be
11
-
#define put_unaligned __put_unaligned_be
12
-
13
-
#else
14
-
/*
15
-
* The m68k can do unaligned accesses itself.
16
-
*/
17
-
#include <linux/unaligned/access_ok.h>
18
-
#include <linux/unaligned/generic.h>
19
-
20
-
#define get_unaligned __get_unaligned_be
21
-
#define put_unaligned __put_unaligned_be
22
-
23
-
#endif
24
-
25
-
#endif /* _ASM_M68KNOMMU_UNALIGNED_H */