diff options
author | Ju, Seokmann <sju@lsil.com> | 2005-05-16 18:32:17 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-20 16:47:59 -0400 |
commit | 672b2d38da4fff4c4452685a25fb88b65243d1a6 (patch) | |
tree | 49d12244bc6a9250cabd4e512b58c675291e1f03 /drivers/scsi/megaraid/megaraid_mm.c | |
parent | 7e8a226147eec1a874ed371832bc0b0e11fdfd19 (diff) |
[SCSI] megaraid version 2.20.4.6
Signed-off by: Seokmann Ju <sju@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_mm.c')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index 9f1b550713ec..37d110e864c4 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
@@ -10,13 +10,12 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | * | 11 | * |
12 | * FILE : megaraid_mm.c | 12 | * FILE : megaraid_mm.c |
13 | * Version : v2.20.2.5 (Jan 21 2005) | 13 | * Version : v2.20.2.6 (Mar 7 2005) |
14 | * | 14 | * |
15 | * Common management module | 15 | * Common management module |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "megaraid_mm.h" | 18 | #include "megaraid_mm.h" |
19 | #include <linux/smp_lock.h> | ||
20 | 19 | ||
21 | 20 | ||
22 | // Entry points for char node driver | 21 | // Entry points for char node driver |
@@ -61,7 +60,7 @@ EXPORT_SYMBOL(mraid_mm_unregister_adp); | |||
61 | EXPORT_SYMBOL(mraid_mm_adapter_app_handle); | 60 | EXPORT_SYMBOL(mraid_mm_adapter_app_handle); |
62 | 61 | ||
63 | static int majorno; | 62 | static int majorno; |
64 | static uint32_t drvr_ver = 0x02200201; | 63 | static uint32_t drvr_ver = 0x02200206; |
65 | 64 | ||
66 | static int adapters_count_g; | 65 | static int adapters_count_g; |
67 | static struct list_head adapters_list_g; | 66 | static struct list_head adapters_list_g; |
@@ -1231,9 +1230,9 @@ mraid_mm_compat_ioctl(struct file *filep, unsigned int cmd, | |||
1231 | unsigned long arg) | 1230 | unsigned long arg) |
1232 | { | 1231 | { |
1233 | int err; | 1232 | int err; |
1234 | lock_kernel(); | 1233 | |
1235 | err = mraid_mm_ioctl(NULL, filep, cmd, arg); | 1234 | err = mraid_mm_ioctl(NULL, filep, cmd, arg); |
1236 | unlock_kernel(); | 1235 | |
1237 | return err; | 1236 | return err; |
1238 | } | 1237 | } |
1239 | #endif | 1238 | #endif |