---

yaml --- r: 259777 b: refs/heads/master c: 15cf23d h: refs/heads/master i: 259775: f58ab57 v: v3
git-mirror · Jul 5, 2011 · 048a4f8 · 048a4f8
1 parent 91128a0
commit 048a4f8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 31 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e92aa8c6584b9a5d861c971c3dbfc18f5c57b5a
+refs/heads/master: 15cf23d5f2fa3f0990aeab540d6ef1d444524b25
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -45,7 +45,6 @@ DHDOFILES = \
 	dhd_custom_gpio.o \
 	dhd_sdio.o	\
 	dhd_linux.o \
-	dhd_linux_sched.o \
 	bcmsdh.o \
 	bcmsdh_linux.o	\
 	bcmsdh_sdmmc.o \

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -938,8 +938,6 @@ extern int write_to_file(dhd_pub_t *dhd, u8 *buf, int size);
 extern int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr);
 #endif				/* defined(OOB_INTR_ONLY) */
 
-int setScheduler(struct task_struct *p, int policy, struct sched_param *param);
-
 extern void dhd_timeout_start(dhd_timeout_t *tmo, uint usec);
 extern int dhd_timeout_expired(dhd_timeout_t *tmo);
 

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1244,7 +1244,7 @@ static int dhd_watchdog_thread(void *data)
 		struct sched_param param;
 		param.sched_priority = (dhd_watchdog_prio < MAX_RT_PRIO) ?
 		    dhd_watchdog_prio : (MAX_RT_PRIO - 1);
-		setScheduler(current, SCHED_FIFO, &param);
+		sched_setscheduler(current, SCHED_FIFO, &param);
 	}
 #endif				/* DHD_SCHED */
 
@@ -1305,7 +1305,7 @@ static int dhd_dpc_thread(void *data)
 		param.sched_priority =
 		    (dhd_dpc_prio <
 		     MAX_RT_PRIO) ? dhd_dpc_prio : (MAX_RT_PRIO - 1);
-		setScheduler(current, SCHED_FIFO, &param);
+		sched_setscheduler(current, SCHED_FIFO, &param);
 	}
 #endif				/* DHD_SCHED */
 

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c