Commit fb1de5a4 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

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: 8c4f1364 ("Staging: lustre: Use put_unaligned_le64")
Cc: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f171240
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define DEBUG_SUBSYSTEM D_OTHER #define DEBUG_SUBSYSTEM D_OTHER
#include <linux/unaligned/access_ok.h> #include <asm/unaligned.h>
#include "../include/obd_support.h" #include "../include/obd_support.h"
#include "../include/lustre_debug.h" #include "../include/lustre_debug.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment