Skip to contentSkip to conversation

lustre: Include unaligned.h instead of access_ok.h

PATCH New Guenter Roeck 1 participant 1 message Aug 1, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/staging/lustre/lustre/obdclass/debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/obdclass/debug.c +1 -1
index 9c934e6d2ea1..c61add46b426 100644
@@ -40,7 +40,7 @@
 
 #define DEBUG_SUBSYSTEM D_OTHER
 
-#include <linux/unaligned/access_ok.h>
+#include <asm/unaligned.h>
 
 #include "../include/obd_support.h"
 #include "../include/lustre_debug.h"
Signature · 1 line
2.1.4