From 2558fe401bebd7e5de9bafd21e111870f5a2544f Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Sat, 28 Mar 2009 19:55:20 +0000
Subject: [PATCH] --- yaml --- r: 139567 b: refs/heads/master c:
 ad5b365c1266b0c9e8e254a3c1cc4ef66bf33cba h: refs/heads/master i:   139565:
 cd5df878eeea81e9c0cbe2d8bd27423fec2bc11e   139563:
 dd61eca905ae37c5807ae93d7be76bdb91c0be0d   139559:
 5e7726a7aaa2c6319c560f0bea74efee876e5240   139551:
 579a652f614ca7d2d65d05c7b512bd53618a54c6 v: v3

---
 [refs]               | 2 +-
 trunk/fs/lockd/mon.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 38ad055ae4be..f0b8195f6e77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8c45dfab78a1919f6f8a3ea46998c487eb7e12
+refs/heads/master: ad5b365c1266b0c9e8e254a3c1cc4ef66bf33cba
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 5e2c4d5ac827..6d5d4a4169e5 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -16,6 +16,8 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
 
+#include <asm/unaligned.h>
+
 #define NLMDBG_FACILITY		NLMDBG_MONITOR
 #define NSM_PROGRAM		100024
 #define NSM_VERSION		1
@@ -274,10 +276,12 @@ static void nsm_init_private(struct nsm_handle *nsm)
 {
 	u64 *p = (u64 *)&nsm->sm_priv.data;
 	struct timespec ts;
+	s64 ns;
 
 	ktime_get_ts(&ts);
-	*p++ = timespec_to_ns(&ts);
-	*p = (unsigned long)nsm;
+	ns = timespec_to_ns(&ts);
+	put_unaligned(ns, p);
+	put_unaligned((unsigned long)nsm, p + 1);
 }
 
 static struct nsm_handle *nsm_create_handle(const struct sockaddr *sap,