Skip to contentSkip to conversation

Patch "staging: lustre: Include unaligned.h instead of access_ok.h" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Aug 14, 2015

Subsystems (2)
Stable branch Staging
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

staging: lustre: Include unaligned.h instead of access_ok.h

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
staging-lustre-include-unaligned.h-instead-of-access_ok.h.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From fb1de5a4c825a389f054cc3803e06116d2fbdc7e Mon Sep 17 00:00:00 2001

From: Guenter Roeck <[email protected]>
Date: Sat, 1 Aug 2015 07:01:24 -0700
Subject: staging: lustre: Include unaligned.h instead of access_ok.h

From: Guenter Roeck <[email protected]>

commit fb1de5a4c825a389f054cc3803e06116d2fbdc7e upstream.

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]>
Signed-off-by Guenter Roeck <[email protected]>
Signed-off-by Greg Kroah-Hartman <[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
@@ -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"

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/hwmon-dell-smm-blacklist-dell-studio-xps-8100.patch queue-4.1/hwmon-nct7904-export-i2c-module-alias-information.patch queue-4.1/staging-lustre-include-unaligned.h-instead-of-access_ok.h.patch