From: adilger <adilger>
Date: Thu, 10 Apr 2003 09:23:37 +0000 (+0000)
Subject: Merge from b_devel.
X-Git-Tag: v1_7_100~1^36~43
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1bf7a2620eb9f70e55f621019b58b5a255ec2e36;p=fs%2Flustre-release.git

Merge from b_devel.
---

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index fed9a8f..dec9a4f 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -15,13 +15,14 @@
 #ifdef __KERNEL__
 #include <linux/ctype.h>
 #include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/smp_lock.h>
 #else 
 #include <liblustre.h>
 #endif
 
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
-#include <linux/smp_lock.h>
 
 struct uuid {
 	__u32	time_low;