- n_r3964-atomicity-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     n_r3964 atomicity fix

has been removed from the -mm tree.  Its filename is

     n_r3964-atomicity-fix.patch

This patch was dropped because an updated version was merged

------------------------------------------------------
Subject: n_r3964 atomicity fix
From: Christian Werner <chw@xxxxxxxxxxxx>


>From http://bugzilla.kernel.org/show_bug.cgi?id=6659.

add_msg() is called in from timer handler
(on_timeout->retry_transmit->remove_from_tx_queue->add_msg)



Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/char/n_r3964.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/char/n_r3964.c~n_r3964-atomicity-fix drivers/char/n_r3964.c
--- devel/drivers/char/n_r3964.c~n_r3964-atomicity-fix	2006-06-09 15:18:05.000000000 -0700
+++ devel-akpm/drivers/char/n_r3964.c	2006-06-09 15:18:05.000000000 -0700
@@ -585,7 +585,7 @@ static void on_receive_block(struct r396
    TRACE_PS(" rx success: got %d chars", length);
 
    /* prepare struct r3964_block_header: */
-   pBlock = kmalloc(length+sizeof(struct r3964_block_header), GFP_KERNEL);
+   pBlock = kmalloc(length+sizeof(struct r3964_block_header), GFP_ATOMIC);
    TRACE_M("on_receive_block - kmalloc %p",pBlock);
 
    if(pBlock==NULL)
@@ -951,7 +951,7 @@ static void add_msg(struct r3964_client_
    {
 queue_the_message:
 
-      pMsg = kmalloc(sizeof(struct r3964_message), GFP_KERNEL);
+      pMsg = kmalloc(sizeof(struct r3964_message), GFP_ATOMIC);
       TRACE_M("add_msg - kmalloc %p",pMsg);
       if(pMsg==NULL) {
          return;
_

Patches currently in -mm which might be from chw@xxxxxxxxxxxx are

n_r3964-atomicity-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux