[folded] drivers-base-memoryc-fix-memory_dev_init-long-delay-v2.patch removed from -mm tree

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

 



The patch titled
     Subject: drivers-base-memoryc-fix-memory_dev_init-long-delay-v2
has been removed from the -mm tree.  Its filename was
     drivers-base-memoryc-fix-memory_dev_init-long-delay-v2.patch

This patch was dropped because it was folded into drivers-base-memoryc-fix-memory_dev_init-long-delay.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
From: Yinghai Lu <yinghai@xxxxxxxxxx>
Subject: drivers-base-memoryc-fix-memory_dev_init-long-delay-v2

-v2: check the sections_per_block, and update cc list

Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Cc: Kay Sievers <kay.sievers@xxxxxxxx>
Cc: Nathan Fontenot <nfont@xxxxxxxxxxxxxx>
Cc: Robin Holt <holt@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/base/memory.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN drivers/base/memory.c~drivers-base-memoryc-fix-memory_dev_init-long-delay-v2 drivers/base/memory.c
--- a/drivers/base/memory.c~drivers-base-memoryc-fix-memory_dev_init-long-delay-v2
+++ a/drivers/base/memory.c
@@ -579,8 +579,9 @@ static int add_memory_section(int nid, s
 
 	mutex_lock(&mem_sysfs_mutex);
 
-	/* don't need to find memory block for BOOT */
-	if (context != BOOT)
+	if (context == BOOT && sections_per_block == 1) {
+		/* don't need to find memory block in this case */
+	} else
 		mem = find_memory_block(section);
 
 	if (mem) {
_

Patches currently in -mm which might be from yinghai@xxxxxxxxxx are

linux-next.patch
drivers-base-memoryc-fix-memory_dev_init-long-delay.patch
x86-mm-fix-the-size-calculation-of-mapping-tables.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