[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 15/17] Move cdrom_sleep() definition to its original source fi
From: |
Guillem Jover |
Subject: |
[PATCH v2 15/17] Move cdrom_sleep() definition to its original source file |
Date: |
Tue, 30 Aug 2011 02:44:49 +0200 |
* linux/dev/kernel/sched.c (cdrom_sleep): Move to ...
* linux/src/drivers/block/ide-cd.c [MACH]: ... here, make it static.
Include <kern/sched_prim.h>.
---
linux/dev/kernel/sched.c | 10 ----------
linux/src/drivers/block/ide-cd.c | 17 +++++++++++++++--
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/linux/dev/kernel/sched.c b/linux/dev/kernel/sched.c
index 792c2da..7b5c5e4 100644
--- a/linux/dev/kernel/sched.c
+++ b/linux/dev/kernel/sched.c
@@ -326,16 +326,6 @@ schedule (void)
}
void
-cdrom_sleep (int t)
-{
- int xxx;
-
- assert_wait ((event_t) &xxx, TRUE);
- thread_set_timeout (t);
- schedule ();
-}
-
-void
linux_sched_init (void)
{
/*
diff --git a/linux/src/drivers/block/ide-cd.c b/linux/src/drivers/block/ide-cd.c
index 56656cb..e4548f5 100644
--- a/linux/src/drivers/block/ide-cd.c
+++ b/linux/src/drivers/block/ide-cd.c
@@ -153,6 +153,10 @@
/***************************************************************************/
+#ifdef MACH
+#include <kern/sched_prim.h>
+#endif
+
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/delay.h>
@@ -1379,10 +1383,19 @@ static void cdrom_do_packet_command (ide_drive_t *drive)
cdrom_start_packet_command (drive, len, cdrom_do_pc_continuation);
}
-
-#ifndef MACH
/* Sleep for TIME jiffies.
Not to be called from an interrupt handler. */
+#ifdef MACH
+static
+void cdrom_sleep (int time)
+{
+ int xxx;
+
+ assert_wait ((event_t) &xxx, TRUE);
+ thread_set_timeout (time);
+ schedule ();
+}
+#else
static
void cdrom_sleep (int time)
{
--
1.7.5.4
- Re: [PATCH 14/17] Fix initialization from incompatible pointer type, (continued)
- [PATCH 11/17] Remove unused variables, Guillem Jover, 2011/08/25
- [PATCH 10/17] Remove ident tags producing preprocessor warnings, Guillem Jover, 2011/08/25
- [PATCH 09/17] Add header for printf prototype, Guillem Jover, 2011/08/25
- [PATCH 13/17] Match signedness of char pointer comparisons and assignments, Guillem Jover, 2011/08/25
- [PATCH 16/17] Always initialize A and X variables in BPF code, Guillem Jover, 2011/08/25