git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
cdrom
/
sbpcd.c
diff --git
a/drivers/cdrom/sbpcd.c
b/drivers/cdrom/sbpcd.c
index
8846749
..
31e563f
100644
(file)
--- a/
drivers/cdrom/sbpcd.c
+++ b/
drivers/cdrom/sbpcd.c
@@
-461,7
+461,7
@@
static int sbpcd[] =
/*
* Protects access to global structures etc.
*/
/*
* Protects access to global structures etc.
*/
-static
spinlock_t sbpcd_lock __cacheline_aligned = SPIN_LOCK_UNLOCKED
;
+static
__cacheline_aligned DEFINE_SPINLOCK(sbpcd_lock)
;
static struct request_queue *sbpcd_queue;
MODULE_PARM(sbpcd, "2i");
static struct request_queue *sbpcd_queue;
MODULE_PARM(sbpcd, "2i");
@@
-1161,11
+1161,11
@@
static void EvaluateStatus(int st)
return;
}
/*==========================================================================*/
return;
}
/*==========================================================================*/
+static int cmd_out_T(void);
+
static int get_state_T(void)
{
int i;
static int get_state_T(void)
{
int i;
-
- static int cmd_out_T(void);
clr_cmdbuf();
current_drive->n_bytes=1;
clr_cmdbuf();
current_drive->n_bytes=1;
@@
-1308,13
+1308,14
@@
static int cc_ReadError(void)
return (i);
}
/*==========================================================================*/
return (i);
}
/*==========================================================================*/
+static int cc_DriveReset(void);
+
static int cmd_out_T(void)
{
#undef CMDT_TRIES
#define CMDT_TRIES 1000
#define TEST_FALSE_FF 1
static int cmd_out_T(void)
{
#undef CMDT_TRIES
#define CMDT_TRIES 1000
#define TEST_FALSE_FF 1
-
- static int cc_DriveReset(void);
+
int i, j, l=0, m, ntries;
unsigned long flags;
int i, j, l=0, m, ntries;
unsigned long flags;