- r3964-fix-gfp_kernel-allocations-in-timer-function.patch removed from -mm tree

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

 



The patch titled

     R3964: fix GFP_KERNEL allocations in timer function

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

     r3964-fix-gfp_kernel-allocations-in-timer-function.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: R3964: fix GFP_KERNEL allocations in timer function
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>


In the error case, add_msg() gets called from timer functions, so should
be using GFP_ATOMIC instead of GFP_KERNEL.

Ref: http://bugzilla.kernel.org/show_bug.cgi?id=6659.  Thanks to Christian
Werner <chw@xxxxxxxxxxxx> for reporting, and for the initial fix.

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

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

diff -puN drivers/char/n_r3964.c~r3964-fix-gfp_kernel-allocations-in-timer-function drivers/char/n_r3964.c
--- a/drivers/char/n_r3964.c~r3964-fix-gfp_kernel-allocations-in-timer-function
+++ a/drivers/char/n_r3964.c
@@ -951,7 +951,8 @@ static void add_msg(struct r3964_client_
    {
 queue_the_message:
 
-      pMsg = kmalloc(sizeof(struct r3964_message), GFP_KERNEL);
+      pMsg = kmalloc(sizeof(struct r3964_message),
+		     error_code?GFP_ATOMIC:GFP_KERNEL);
       TRACE_M("add_msg - kmalloc %p",pMsg);
       if(pMsg==NULL) {
          return;
_

Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are

origin.patch
git-gfs2.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall2.patch
remove-gratuitous-inclusion-of-linux-configh-from.patch
use-list_add_tail-instead-of-list_add.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