lustre: Include unaligned.h instead of access_ok.h
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 hereinclude/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 hereinclude/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.
--- drivers/staging/lustre/lustre/obdclass/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/obdclass/debug.c +1 -1
@@ -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