aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h')
-rw-r--r--drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h
index 51cba6a..06c6029 100644
--- a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h
+++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h
@@ -35,6 +35,9 @@
#include "../include/linux/westbridge/cyashal.h"
#include "../include/linux/westbridge/cyastoria.h"
+#define __USE_SYNC_FUNCTION__
+#define __FOR_KERNEL_2_6_35__
+
struct request;
struct task_struct;
@@ -48,12 +51,15 @@ struct cyasblkdev_queue {
int (*issue_fn)(struct cyasblkdev_queue *, struct request *);
void *data;
struct request_queue *queue;
+ int test_code;
};
extern int cyasblkdev_init_queue(struct cyasblkdev_queue *, spinlock_t *);
extern void cyasblkdev_cleanup_queue(struct cyasblkdev_queue *);
extern void cyasblkdev_queue_suspend(struct cyasblkdev_queue *);
extern void cyasblkdev_queue_resume(struct cyasblkdev_queue *);
+extern void cy_as_acquire_common_lock(void);
+extern void cy_as_release_common_lock(void);
extern cy_as_device_handle cyasdevice_getdevhandle(void);
#define MOD_LOGS 1