diff options
author | Guenter Roeck <linux@roeck-us.net> | 2015-08-01 10:01:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-05 01:13:25 -0400 |
commit | fb1de5a4c825a389f054cc3803e06116d2fbdc7e (patch) | |
tree | 7aec8bf4368e5467732f42329d5b2fedb76a4142 | |
parent | 1f17124006b65482d9084c01e252b59dbca8db8f (diff) |
staging: lustre: Include unaligned.h instead of access_ok.h
Including access_ok.h causes the ia64:allmodconfig build (and maybe others)
to fail with
include/linux/unaligned/le_struct.h:6:19: error:
redefinition of 'get_unaligned_le16'
include/linux/unaligned/access_ok.h:7:19: note:
previous definition of 'get_unaligned_le16' was here
include/linux/unaligned/le_struct.h:26:20: error:
redefinition of 'put_unaligned_le32'
include/linux/unaligned/access_ok.h:42:20: note:
previous definition of 'put_unaligned_le32' was here
include/linux/unaligned/le_struct.h:31:20: error:
redefinition of 'put_unaligned_le64'
include/linux/unaligned/access_ok.h:47:20: note:
previous definition of 'put_unaligned_le64' was here
Include unaligned.h instead and leave it up to the architecture to decide
how to implement unaligned accesses.
Fixes: 8c4f136497315 ("Staging: lustre: Use put_unaligned_le64")
Cc: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/lustre/lustre/obdclass/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/debug.c b/drivers/staging/lustre/lustre/obdclass/debug.c index 9c934e6d2ea1..c61add46b426 100644 --- a/drivers/staging/lustre/lustre/obdclass/debug.c +++ b/drivers/staging/lustre/lustre/obdclass/debug.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #define DEBUG_SUBSYSTEM D_OTHER | 41 | #define DEBUG_SUBSYSTEM D_OTHER |
42 | 42 | ||
43 | #include <linux/unaligned/access_ok.h> | 43 | #include <asm/unaligned.h> |
44 | 44 | ||
45 | #include "../include/obd_support.h" | 45 | #include "../include/obd_support.h" |
46 | #include "../include/lustre_debug.h" | 46 | #include "../include/lustre_debug.h" |