linux-next: build failure after merge of the tmem tree

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


Hi Konrad,

After merging the tmem tree, today's linux-next build (x86_64
allmodconfig) failed like this:

mm/frontswap.c: In function 'frontswap_shrink':
mm/frontswap.c:217:3: error: implicit declaration of function 'security_vm_enough_memory_kern' [-Werror=implicit-function-declaration]

Caused by commit 8174e70a6bde ("mm: frontswap: core frontswap
functionality") interacting with commit 191c542442fd ("mm: collapse
security_vm_enough_memory() variants into a single function") from the
security tree.

I applied the following merge fix:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 15 Feb 2012 14:35:31 +1100
Subject: [PATCH] mm: frontswap: update for security_vm_enough_memory API change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 mm/frontswap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/frontswap.c b/mm/frontswap.c
index d7c91e3..2b80c5a 100644
--- a/mm/frontswap.c
+++ b/mm/frontswap.c
@@ -214,7 +214,7 @@ void frontswap_shrink(unsigned long target_pages)
 			pages_to_unuse = 0; /* unuse all */
 		}
 		/* ensure there is enough RAM to fetch pages from frontswap */
-		if (security_vm_enough_memory_kern(pages))
+		if (security_vm_enough_memory_mm(current->mm, pages))
 			continue;
 		vm_unacct_memory(pages);
 		break;
-- 
1.7.9

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp_c4dwihg6k.pgp
Description: PGP signature


[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux