tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

Linus Torvalds b25eaebc c3da3148

+32 -7
+1
drivers/staging/b3dfg/b3dfg.c
··· 36 36 #include <linux/wait.h> 37 37 #include <linux/mm.h> 38 38 #include <linux/uaccess.h> 39 + #include <linux/sched.h> 39 40 40 41 static unsigned int b3dfg_nbuf = 2; 41 42
+1
drivers/staging/comedi/drivers/me_daq.c
··· 51 51 */ 52 52 53 53 #include <linux/interrupt.h> 54 + #include <linux/sched.h> 54 55 #include "../comedidev.h" 55 56 56 57 #include "comedi_pci.h"
+1
drivers/staging/comedi/drivers/ni_mio_common.c
··· 62 62 /* #define DEBUG_STATUS_B */ 63 63 64 64 #include <linux/interrupt.h> 65 + #include <linux/sched.h> 65 66 #include "8255.h" 66 67 #include "mite.h" 67 68 #include "comedi_fc.h"
+1
drivers/staging/comedi/drivers/ni_pcidio.c
··· 70 70 /* #define DEBUG_FLAGS */ 71 71 72 72 #include <linux/interrupt.h> 73 + #include <linux/sched.h> 73 74 #include "../comedidev.h" 74 75 75 76 #include "mite.h"
+1 -1
drivers/staging/et131x/et1310_address_map.h
··· 223 223 224 224 extern inline void add_10bit(u32 *v, int n) 225 225 { 226 - *v = INDEX10(*v + n); 226 + *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP); 227 227 } 228 228 229 229 /*
+14 -6
drivers/staging/et131x/et1310_rx.c
··· 1177 1177 1178 1178 static inline u32 bump_fbr(u32 *fbr, u32 limit) 1179 1179 { 1180 - u32 v = *fbr; 1181 - add_10bit(&v, 1); 1182 - if (v > limit) 1183 - v = (*fbr & ~ET_DMA10_MASK) ^ ET_DMA10_WRAP; 1184 - *fbr = v; 1185 - return v; 1180 + u32 v = *fbr; 1181 + v++; 1182 + /* This works for all cases where limit < 1024. The 1023 case 1183 + works because 1023++ is 1024 which means the if condition is not 1184 + taken but the carry of the bit into the wrap bit toggles the wrap 1185 + value correctly */ 1186 + if ((v & ET_DMA10_MASK) > limit) { 1187 + v &= ~ET_DMA10_MASK; 1188 + v ^= ET_DMA10_WRAP; 1189 + } 1190 + /* For the 1023 case */ 1191 + v &= (ET_DMA10_MASK|ET_DMA10_WRAP); 1192 + *fbr = v; 1193 + return v; 1186 1194 } 1187 1195 1188 1196 /**
+1
drivers/staging/hv/osd.c
··· 30 30 #include <linux/ioport.h> 31 31 #include <linux/irq.h> 32 32 #include <linux/interrupt.h> 33 + #include <linux/sched.h> 33 34 #include <linux/wait.h> 34 35 #include <linux/spinlock.h> 35 36 #include <linux/workqueue.h>
+2
drivers/staging/iio/industrialio-core.c
··· 18 18 #include <linux/fs.h> 19 19 #include <linux/interrupt.h> 20 20 #include <linux/poll.h> 21 + #include <linux/sched.h> 22 + #include <linux/wait.h> 21 23 #include <linux/cdev.h> 22 24 #include "iio.h" 23 25 #include "trigger_consumer.h"
+1
drivers/staging/poch/poch.c
··· 20 20 #include <linux/init.h> 21 21 #include <linux/ioctl.h> 22 22 #include <linux/io.h> 23 + #include <linux/sched.h> 23 24 24 25 #include "poch.h" 25 26
+2
drivers/staging/rt2860/common/cmm_data_2860.c
··· 363 363 ULONG SwIdx = pAd->MgmtRing.TxCpuIdx; 364 364 365 365 pTxD = (PTXD_STRUC) pAd->MgmtRing.Cell[SwIdx].AllocVa; 366 + if (!pTxD) 367 + return 0; 366 368 367 369 pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket; 368 370 pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket = NULL;
+1
drivers/staging/rt2860/common/cmm_info.c
··· 25 25 ************************************************************************* 26 26 */ 27 27 28 + #include <linux/sched.h> 28 29 #include "../rt_config.h" 29 30 30 31 INT Show_SSID_Proc(
+1
drivers/staging/rt2860/rt_linux.c
··· 25 25 ************************************************************************* 26 26 */ 27 27 28 + #include <linux/sched.h> 28 29 #include "rt_config.h" 29 30 30 31 ULONG RTDebugLevel = RT_DEBUG_ERROR;
+1
drivers/staging/rt3090/common/cmm_info.c
··· 34 34 --------- ---------- ---------------------------------------------- 35 35 */ 36 36 37 + #include <linux/sched.h> 37 38 #include "../rt_config.h" 38 39 39 40
+1
drivers/staging/rt3090/rt_linux.c
··· 25 25 ************************************************************************* 26 26 */ 27 27 28 + #include <linux/sched.h> 28 29 #include "rt_config.h" 29 30 30 31 ULONG RTDebugLevel = RT_DEBUG_ERROR;
+1
drivers/staging/sep/sep_driver.c
··· 38 38 #include <linux/mm.h> 39 39 #include <linux/poll.h> 40 40 #include <linux/wait.h> 41 + #include <linux/sched.h> 41 42 #include <linux/pci.h> 42 43 #include <linux/firmware.h> 43 44 #include <asm/ioctl.h>
+1
drivers/staging/vme/bridges/vme_ca91cx42.c
··· 25 25 #include <linux/poll.h> 26 26 #include <linux/interrupt.h> 27 27 #include <linux/spinlock.h> 28 + #include <linux/sched.h> 28 29 #include <asm/time.h> 29 30 #include <asm/io.h> 30 31 #include <asm/uaccess.h>
+1
drivers/staging/vme/bridges/vme_tsi148.c
··· 25 25 #include <linux/dma-mapping.h> 26 26 #include <linux/interrupt.h> 27 27 #include <linux/spinlock.h> 28 + #include <linux/sched.h> 28 29 #include <asm/time.h> 29 30 #include <asm/io.h> 30 31 #include <asm/uaccess.h>