Skip to content

Commit

Permalink
staging: lustre: Include unaligned.h instead of access_ok.h
Browse files Browse the repository at this point in the history
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: 8c4f136 ("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>
  • Loading branch information
Guenter Roeck authored and Greg Kroah-Hartman committed Aug 5, 2015
1 parent 1f17124 commit fb1de5a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/staging/lustre/lustre/obdclass/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fb1de5a

Please sign in to comment.