Commit b25eaebc authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: rt2860sta: prevent a panic when disabling when associated
  staging: more sched.h fixes
  Staging: et131x: Fix the add_10bit macro
  Staging: et131x: Correct WRAP bit handling
  staging: Complete sched.h removal from interrupt.h
  Staging: vme: fix sched.h build breakage
  Staging: poch: fix sched.h build breakage
  Staging: b3dfg: fix sched.h build breakage
  Staging: comedi: fix sched.h build breakage
  Staging: iio: Fix missing include <linux/sched.h>
parents c3da3148 0af49167
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/sched.h>
static unsigned int b3dfg_nbuf = 2; static unsigned int b3dfg_nbuf = 2;
......
...@@ -51,6 +51,7 @@ from http://www.comedi.org ...@@ -51,6 +51,7 @@ from http://www.comedi.org
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h>
#include "../comedidev.h" #include "../comedidev.h"
#include "comedi_pci.h" #include "comedi_pci.h"
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
/* #define DEBUG_STATUS_B */ /* #define DEBUG_STATUS_B */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h>
#include "8255.h" #include "8255.h"
#include "mite.h" #include "mite.h"
#include "comedi_fc.h" #include "comedi_fc.h"
......
...@@ -70,6 +70,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org ...@@ -70,6 +70,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org
/* #define DEBUG_FLAGS */ /* #define DEBUG_FLAGS */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h>
#include "../comedidev.h" #include "../comedidev.h"
#include "mite.h" #include "mite.h"
......
...@@ -223,7 +223,7 @@ typedef union _TXDMA_PR_NUM_DES_t { ...@@ -223,7 +223,7 @@ typedef union _TXDMA_PR_NUM_DES_t {
extern inline void add_10bit(u32 *v, int n) extern inline void add_10bit(u32 *v, int n)
{ {
*v = INDEX10(*v + n); *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP);
} }
/* /*
......
...@@ -1178,9 +1178,17 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) ...@@ -1178,9 +1178,17 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
static inline u32 bump_fbr(u32 *fbr, u32 limit) static inline u32 bump_fbr(u32 *fbr, u32 limit)
{ {
u32 v = *fbr; u32 v = *fbr;
add_10bit(&v, 1); v++;
if (v > limit) /* This works for all cases where limit < 1024. The 1023 case
v = (*fbr & ~ET_DMA10_MASK) ^ ET_DMA10_WRAP; works because 1023++ is 1024 which means the if condition is not
taken but the carry of the bit into the wrap bit toggles the wrap
value correctly */
if ((v & ET_DMA10_MASK) > limit) {
v &= ~ET_DMA10_MASK;
v ^= ET_DMA10_WRAP;
}
/* For the 1023 case */
v &= (ET_DMA10_MASK|ET_DMA10_WRAP);
*fbr = v; *fbr = v;
return v; return v;
} }
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/cdev.h> #include <linux/cdev.h>
#include "iio.h" #include "iio.h"
#include "trigger_consumer.h" #include "trigger_consumer.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/sched.h>
#include "poch.h" #include "poch.h"
......
...@@ -363,6 +363,8 @@ int RtmpPCIMgmtKickOut( ...@@ -363,6 +363,8 @@ int RtmpPCIMgmtKickOut(
ULONG SwIdx = pAd->MgmtRing.TxCpuIdx; ULONG SwIdx = pAd->MgmtRing.TxCpuIdx;
pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[SwIdx].AllocVa; pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[SwIdx].AllocVa;
if (!pTxD)
return 0;
pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket; pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket;
pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL; pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
************************************************************************* *************************************************************************
*/ */
#include <linux/sched.h>
#include "../rt_config.h" #include "../rt_config.h"
INT Show_SSID_Proc( INT Show_SSID_Proc(
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
************************************************************************* *************************************************************************
*/ */
#include <linux/sched.h>
#include "rt_config.h" #include "rt_config.h"
ULONG RTDebugLevel = RT_DEBUG_ERROR; ULONG RTDebugLevel = RT_DEBUG_ERROR;
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
--------- ---------- ---------------------------------------------- --------- ---------- ----------------------------------------------
*/ */
#include <linux/sched.h>
#include "../rt_config.h" #include "../rt_config.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
************************************************************************* *************************************************************************
*/ */
#include <linux/sched.h>
#include "rt_config.h" #include "rt_config.h"
ULONG RTDebugLevel = RT_DEBUG_ERROR; ULONG RTDebugLevel = RT_DEBUG_ERROR;
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/sched.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sched.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sched.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment