Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1252499 > unrolled thread

linux-next: build failure after merge of the akpm-current tree

Back to article view | Back to linux.kernel

Contents

  linux-next: build failure after merge of the akpm-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-21 08:40 +0200
    Re: linux-next: build failure after merge of the akpm-current tree Minchan Kim <minchan@kernel.org> - 2015-10-21 08:50 +0200
    Re: linux-next: build failure after merge of the akpm-current tree Andrew Morton <akpm@linux-foundation.org> - 2015-10-21 08:50 +0200

#1252499 — linux-next: build failure after merge of the akpm-current tree

Hi Andrew,

After merging the akpm-current tree, today's linux-next build (arm
allnoconfig and others) failed like this:

In file included from init/main.c:50:0:
include/linux/rmap.h:274:1: error: expected declaration specifiers or '...' before '{' token

Caused by commit

  e4f28388eb72 ("mm: simplify reclaim path for MADV_FREE")

Discovered after the linux-next release.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1252501

Hello,

On Wed, Oct 21, 2015 at 05:34:38PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> After merging the akpm-current tree, today's linux-next build (arm
> allnoconfig and others) failed like this:
> 
> In file included from init/main.c:50:0:
> include/linux/rmap.h:274:1: error: expected declaration specifiers or '...' before '{' token
> 
> Caused by commit
> 
>   e4f28388eb72 ("mm: simplify reclaim path for MADV_FREE")
> 
> Discovered after the linux-next release.

It was my bad. Sorry about that.
Here patch goes. Maybe Andrew want to fold it to e4f28388eb72.

Thanks.

From 1062bfcfcc65b4a019666ada3786e95e4b299df6 Mon Sep 17 00:00:00 2001
From: Minchan Kim <minchan@kernel.org>
Date: Wed, 21 Oct 2015 15:41:49 +0900
Subject: [PATCH] mm: fix compile error caused omitting parentheses

This patch fixes build error introudced by
e4f28388eb72 ("mm: simplify reclaim path for MADV_FREE").

Signed-off-by: Minchan Kim <minchan@kernel.org>
---
 include/linux/rmap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 978f65066fd5..853f4f3c6742 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -270,7 +270,7 @@ int rmap_walk(struct page *page, struct rmap_walk_control *rwc);
 
 static inline int page_referenced(struct page *page, int is_locked,
 				  struct mem_cgroup *memcg,
-				  unsigned long *vm_flags,
+				  unsigned long *vm_flags)
 {
 	*vm_flags = 0;
 	return 0;
-- 
1.9.1


> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1252502

On Wed, 21 Oct 2015 17:34:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> After merging the akpm-current tree, today's linux-next build (arm
> allnoconfig and others) failed like this:
> 
> In file included from init/main.c:50:0:
> include/linux/rmap.h:274:1: error: expected declaration specifiers or '...' before '{' token
> 
> Caused by commit
> 
>   e4f28388eb72 ("mm: simplify reclaim path for MADV_FREE")
> 
> Discovered after the linux-next release.

argh, we broke nommu.

--- a/include/linux/rmap.h~mm-dont-split-thp-page-when-syscall-is-called-fix-6-fix
+++ a/include/linux/rmap.h
@@ -270,7 +270,7 @@ int rmap_walk(struct page *page, struct 
 
 static inline int page_referenced(struct page *page, int is_locked,
 				  struct mem_cgroup *memcg,
-				  unsigned long *vm_flags,
+				  unsigned long *vm_flags)
 {
 	*vm_flags = 0;
 	return 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web