2.4.6 kernel linux/mm.h does not define GFP_BUFFER...

diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index d00512a3dab1af4bd0950282e161e11d4ebb6887..5ebff2d228d68a09bb60ebc546194c0d737d5e55 100644 (file)
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -325,7 +325,7 @@ typedef struct
        // divisors of master clock for pacing
        unsigned int divisor1;
        unsigned int divisor2;
-       unsigned int count;     //number of samples remaining
+       volatile unsigned int count;    //number of samples remaining
 } cb_pcidas_private;
 
 /*

diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c
index a2d3b567841f03aee9326734f751baef06f08e68..d5be73a3e30651b41522ff35fac9b8f86aad316a 100644 (file)
--- a/comedi/drivers/das16.c
+++ b/comedi/drivers/das16.c
@@ -1259,7 +1259,7 @@ static int das16_attach(comedi_device *dev, comedi_devconfig *it)
        if(dma_chan == 1 || dma_chan == 3)
        {
                // allocate dma buffer
-               devpriv->dma_buffer = kmalloc(DAS16_DMA_SIZE, GFP_BUFFER | GFP_DMA);
+               devpriv->dma_buffer = kmalloc(DAS16_DMA_SIZE, GFP_KERNEL | GFP_DMA);
                if(devpriv->dma_buffer == NULL)
                        return -ENOMEM;
                if(request_dma(dma_chan, "das16"))

diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index 0e0d11f249798a084a5873202fb798692d60ccb2..71f1386ce20853cb15118009d1508f680b762871 100644 (file)
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -648,11 +648,11 @@ static int das1800_attach(comedi_device *dev, comedi_devconfig *it)
                                devpriv->dma1 = dma1;
                        }
                        devpriv->dma_buf_max_size = 0x1ff00;
-                       devpriv->dma_buf0 = kmalloc(devpriv->dma_buf_max_size, GFP_BUFFER | GFP_DMA);
+                       devpriv->dma_buf0 = kmalloc(devpriv->dma_buf_max_size, GFP_KERNEL | GFP_DMA);
                        if(devpriv->dma_buf0 == NULL)
                                return -ENOMEM;
                        devpriv->dma_current_buf = devpriv->dma_buf0;
-                       devpriv->dma_buf1 = kmalloc(devpriv->dma_buf_max_size, GFP_BUFFER | GFP_DMA);
+                       devpriv->dma_buf1 = kmalloc(devpriv->dma_buf_max_size, GFP_KERNEL | GFP_DMA);
                        if(devpriv->dma_buf1 == NULL)
                                return -ENOMEM;
                        flags = claim_dma_lock();

diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c
index a291052addd2c1324b147f50465687bae0959a61..6d4a24d72b9f1f86584f37d366b077a7fc52795b 100644 (file)
--- a/comedi/drivers/ni_at_a2150.c
+++ b/comedi/drivers/ni_at_a2150.c
@@ -35,6 +35,9 @@ Options:
        [1] - irq
        [2] - dma channel
 
+References (from ftp://ftp.natinst.com/support/manuals):
+
+          320360.pdf  AT-A2150 User Manual
 */
 
 #include <linux/kernel.h>
@@ -360,7 +363,7 @@ static int a2150_attach(comedi_device *dev, comedi_devconfig *it)
                        printk(" failed to allocate dma channel %i\n", dma);
                        return -EINVAL;
                }
-               devpriv->dma_buffer = kmalloc(A2150_DMA_BUFFER_SIZE, GFP_BUFFER | GFP_DMA);
+               devpriv->dma_buffer = kmalloc(A2150_DMA_BUFFER_SIZE, GFP_KERNEL | GFP_DMA);
                if(devpriv->dma_buffer == NULL)
                        return -ENOMEM;