From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Glauber Costa <glommer@parallels.com>, Tejun Heo <tj@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: build failure after merge of the final tree (net-next tree related)
Date: Wed, 14 Dec 2011 18:07:52 +1100 [thread overview]
Message-ID: <20111214180752.7893d5460c6fca84d63cab0e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2910 bytes --]
Hi ,
After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:
In file included from include/linux/tcp.h:211:0,
from include/linux/ipv6.h:221,
from include/net/ipv6.h:16,
from include/linux/sunrpc/clnt.h:26,
from include/linux/nfs_fs.h:50,
from init/do_mounts.c:20:
include/net/sock.h: In function 'memcg_memory_allocated_add':
include/net/sock.h:1000:20: error: 'OVER_LIMIT' undeclared (first use in this function)
And several other similar ones.
Caused by commit e1aab161e013 ("socket: initial cgroup code") from the
net-next tree. OVER_LIMIT is only defined it CONFIG_INET is set.
I applied the following (stupid) patch for today (just because reverting
the above commit would probably be too hard - we have cgroup stuff all
over the place :-( ):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 18:01:12 +1100
Subject: [PATCH] socket: bad fix for cgroup code breakage
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/net/sock.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 6fe0dae..0603973 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -986,6 +986,7 @@ static inline long sk_prot_mem_limits(const struct sock *sk, int index)
return prot[index];
}
+#ifdef CONFIG_INET
static inline void memcg_memory_allocated_add(struct cg_proto *prot,
unsigned long amt,
int *parent_status)
@@ -999,6 +1000,7 @@ static inline void memcg_memory_allocated_add(struct cg_proto *prot,
if (ret < 0)
*parent_status = OVER_LIMIT;
}
+#endif
static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
unsigned long amt)
@@ -1028,12 +1030,14 @@ sk_memory_allocated_add(struct sock *sk, int amt, int *parent_status)
{
struct proto *prot = sk->sk_prot;
+#ifdef CONFIG_INET
if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
memcg_memory_allocated_add(sk->sk_cgrp, amt, parent_status);
/* update the root cgroup regardless */
atomic_long_add_return(amt, prot->memory_allocated);
return memcg_memory_allocated_read(sk->sk_cgrp);
}
+#endif
return atomic_long_add_return(amt, prot->memory_allocated);
}
@@ -1043,9 +1047,11 @@ sk_memory_allocated_sub(struct sock *sk, int amt, int parent_status)
{
struct proto *prot = sk->sk_prot;
+#ifdef CONFIG_INET
if (mem_cgroup_sockets_enabled && sk->sk_cgrp &&
parent_status != OVER_LIMIT) /* Otherwise was uncharged already */
memcg_memory_allocated_sub(sk->sk_cgrp, amt);
+#endif
atomic_long_sub(amt, prot->memory_allocated);
}
--
1.7.7.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-12-14 7:08 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 7:07 Stephen Rothwell [this message]
2011-12-14 18:35 ` linux-next: build failure after merge of the final tree (net-next tree related) David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-03-18 7:27 Stephen Rothwell
2014-03-19 3:13 ` David Miller
2014-03-17 10:21 Stephen Rothwell
2014-03-19 3:11 ` David Miller
2014-03-17 10:13 Stephen Rothwell
2013-09-02 9:11 Stephen Rothwell
2013-09-02 9:18 ` Cong Wang
2013-07-03 7:48 Stephen Rothwell
2013-07-03 7:51 ` Sedat Dilek
2013-07-03 8:45 ` Eliezer Tamir
2013-07-03 19:17 ` David Miller
2013-06-26 7:56 Stephen Rothwell
2013-06-26 8:07 ` Alexey Brodkin
2013-06-26 8:36 ` David Miller
2013-04-23 7:46 Stephen Rothwell
2013-04-23 17:10 ` David Miller
2013-04-23 23:44 ` David Rientjes
2013-04-12 6:00 Stephen Rothwell
2013-04-12 7:08 ` David Miller
2013-03-28 5:04 Stephen Rothwell
2013-03-28 5:19 ` David Miller
2013-01-03 3:23 Stephen Rothwell
2013-01-03 3:28 ` David Miller
2013-01-03 9:51 ` David Miller
2012-09-20 7:36 Stephen Rothwell
2012-09-20 9:10 ` Mika Westerberg
2012-09-20 20:45 ` David Miller
2012-09-20 22:15 ` Stephen Rothwell
2012-09-20 22:22 ` Benjamin Herrenschmidt
2012-09-20 22:53 ` David Miller
2012-09-21 21:46 ` Benjamin Herrenschmidt
2012-09-22 20:00 ` David Miller
2012-09-22 21:20 ` Benjamin Herrenschmidt
2012-09-20 22:28 ` Stephen Rothwell
2012-09-21 1:37 ` Stephen Rothwell
2012-09-05 5:39 Stephen Rothwell
2012-09-05 21:46 ` David Miller
2012-09-04 6:58 Stephen Rothwell
2012-09-04 18:20 ` David Miller
2012-09-04 19:50 ` Jerry Chu
2012-07-22 6:34 Stephen Rothwell
2012-07-22 7:29 ` Jiri Pirko
2012-05-03 6:16 Stephen Rothwell
2012-05-03 6:26 ` David Miller
2012-04-30 5:58 Stephen Rothwell
2012-04-30 17:22 ` David Miller
2012-04-19 6:28 Stephen Rothwell
2012-04-19 6:40 ` David Miller
2012-04-10 5:29 Stephen Rothwell
2012-04-10 13:26 ` David Miller
2012-04-05 3:25 Stephen Rothwell
2012-04-05 3:59 ` David Miller
2012-04-06 7:09 ` Giuseppe CAVALLARO
2012-04-06 7:30 ` Giuseppe CAVALLARO
2012-02-20 5:15 Stephen Rothwell
2012-02-20 5:46 ` David Miller
2011-11-23 4:00 Stephen Rothwell
2011-11-23 12:09 ` Neil Horman
2011-11-23 23:02 ` Andrew Morton
2011-11-23 23:44 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111214180752.7893d5460c6fca84d63cab0e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=glommer@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).