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
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
block
/
carmel.c
diff --git
a/drivers/block/carmel.c
b/drivers/block/carmel.c
index
8181921
..
38fd6fe
100644
(file)
--- a/
drivers/block/carmel.c
+++ b/
drivers/block/carmel.c
@@
-413,7
+413,7
@@
static unsigned long carm_major_alloc;
static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
unsigned int cmd, unsigned long arg)
{
static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
unsigned int cmd, unsigned long arg)
{
- void __user *usermem = (void *) arg;
+ void __user *usermem = (void
__user
*) arg;
struct carm_port *port = ino->i_bdev->bd_disk->private_data;
struct hd_geometry geom;
struct carm_port *port = ino->i_bdev->bd_disk->private_data;
struct hd_geometry geom;
@@
-438,17
+438,6
@@
static int carm_bdev_ioctl(struct inode *ino, struct file *fil,
return -EOPNOTSUPP;
}
return -EOPNOTSUPP;
}
-static inline unsigned long msecs_to_jiffies(unsigned long msecs)
-{
- return ((HZ * msecs + 999) / 1000);
-}
-
-static void msleep(unsigned long msecs)
-{
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(msecs_to_jiffies(msecs));
-}
-
static const u32 msg_sizes[] = { 32, 64, 128, CARM_MSG_SIZE };
static inline int carm_lookup_bucket(u32 msg_size)
static const u32 msg_sizes[] = { 32, 64, 128, CARM_MSG_SIZE };
static inline int carm_lookup_bucket(u32 msg_size)