diff for duplicates of <20120626152734.GA6509@breakpoint.cc> diff --git a/a/1.txt b/N1/1.txt index 525be01..0ce48a6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,3 +12,51 @@ On Fri, Jun 22, 2012 at 03:30:36PM +0100, Mel Gorman wrote: > + This is used via sk_memalloc_socks() by SLAB. + +>From 3da9ab9972845974da114c5a6624335e6371b2d5 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Tue, 26 Jun 2012 17:18:20 +0200 +Subject: [PATCH] export sk_memalloc_socks() only with CONFIG_NET + +|mm/built-in.o: In function `atomic_read': +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|mm/built-in.o:include/asm/atomic.h:25: more undefined references to `memalloc_socks' follow + +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + include/net/sock.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/include/net/sock.h b/include/net/sock.h +index db0c20c..767c443 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -659,11 +659,20 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag) + return test_bit(flag, &sk->sk_flags); + } + ++#ifdef CONFIG_NET + extern struct static_key memalloc_socks; + static inline int sk_memalloc_socks(void) + { + return static_key_false(&memalloc_socks); + } ++#else ++ ++static inline int sk_memalloc_socks(void) ++{ ++ return 0; ++} ++ ++#endif + + static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask) + { +-- +1.7.10 + +Sebastian diff --git a/a/content_digest b/N1/content_digest index b5b9814..cdb4bf4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -29,6 +29,54 @@ "> +EXPORT_SYMBOL_GPL(memalloc_socks);\n" "> +\n" "\n" - This is used via sk_memalloc_socks() by SLAB. + "This is used via sk_memalloc_socks() by SLAB.\n" + "\n" + ">From 3da9ab9972845974da114c5a6624335e6371b2d5 Mon Sep 17 00:00:00 2001\n" + "From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n" + "Date: Tue, 26 Jun 2012 17:18:20 +0200\n" + "Subject: [PATCH] export sk_memalloc_socks() only with CONFIG_NET\n" + "\n" + "|mm/built-in.o: In function `atomic_read':\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|mm/built-in.o:include/asm/atomic.h:25: more undefined references to `memalloc_socks' follow\n" + "\n" + "Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n" + "---\n" + " include/net/sock.h | 9 +++++++++\n" + " 1 file changed, 9 insertions(+)\n" + "\n" + "diff --git a/include/net/sock.h b/include/net/sock.h\n" + "index db0c20c..767c443 100644\n" + "--- a/include/net/sock.h\n" + "+++ b/include/net/sock.h\n" + "@@ -659,11 +659,20 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag)\n" + " \treturn test_bit(flag, &sk->sk_flags);\n" + " }\n" + " \n" + "+#ifdef CONFIG_NET\n" + " extern struct static_key memalloc_socks;\n" + " static inline int sk_memalloc_socks(void)\n" + " {\n" + " \treturn static_key_false(&memalloc_socks);\n" + " }\n" + "+#else\n" + "+\n" + "+static inline int sk_memalloc_socks(void)\n" + "+{\n" + "+\treturn 0;\n" + "+}\n" + "+\n" + "+#endif\n" + " \n" + " static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask)\n" + " {\n" + "-- \n" + "1.7.10\n" + "\n" + Sebastian -5fe80e5aa8c7903405f7eb1de62b0ca003ad8f77833c170959eaa9f022de09cf +f858b6ae50e42f6016ec4f3367e12e3ecaae5b15166eda3e30a6b98744998860
diff --git a/a/1.txt b/N2/1.txt index 525be01..8659fdf 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,3 +12,57 @@ On Fri, Jun 22, 2012 at 03:30:36PM +0100, Mel Gorman wrote: > + This is used via sk_memalloc_socks() by SLAB. + +>From 3da9ab9972845974da114c5a6624335e6371b2d5 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Tue, 26 Jun 2012 17:18:20 +0200 +Subject: [PATCH] export sk_memalloc_socks() only with CONFIG_NET + +|mm/built-in.o: In function `atomic_read': +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|include/asm/atomic.h:25: undefined reference to `memalloc_socks' +|mm/built-in.o:include/asm/atomic.h:25: more undefined references to `memalloc_socks' follow + +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + include/net/sock.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/include/net/sock.h b/include/net/sock.h +index db0c20c..767c443 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -659,11 +659,20 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag) + return test_bit(flag, &sk->sk_flags); + } + ++#ifdef CONFIG_NET + extern struct static_key memalloc_socks; + static inline int sk_memalloc_socks(void) + { + return static_key_false(&memalloc_socks); + } ++#else ++ ++static inline int sk_memalloc_socks(void) ++{ ++ return 0; ++} ++ ++#endif + + static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask) + { +-- +1.7.10 + +Sebastian + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index b5b9814..0facbf5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -29,6 +29,60 @@ "> +EXPORT_SYMBOL_GPL(memalloc_socks);\n" "> +\n" "\n" - This is used via sk_memalloc_socks() by SLAB. + "This is used via sk_memalloc_socks() by SLAB.\n" + "\n" + ">From 3da9ab9972845974da114c5a6624335e6371b2d5 Mon Sep 17 00:00:00 2001\n" + "From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n" + "Date: Tue, 26 Jun 2012 17:18:20 +0200\n" + "Subject: [PATCH] export sk_memalloc_socks() only with CONFIG_NET\n" + "\n" + "|mm/built-in.o: In function `atomic_read':\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|include/asm/atomic.h:25: undefined reference to `memalloc_socks'\n" + "|mm/built-in.o:include/asm/atomic.h:25: more undefined references to `memalloc_socks' follow\n" + "\n" + "Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n" + "---\n" + " include/net/sock.h | 9 +++++++++\n" + " 1 file changed, 9 insertions(+)\n" + "\n" + "diff --git a/include/net/sock.h b/include/net/sock.h\n" + "index db0c20c..767c443 100644\n" + "--- a/include/net/sock.h\n" + "+++ b/include/net/sock.h\n" + "@@ -659,11 +659,20 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag)\n" + " \treturn test_bit(flag, &sk->sk_flags);\n" + " }\n" + " \n" + "+#ifdef CONFIG_NET\n" + " extern struct static_key memalloc_socks;\n" + " static inline int sk_memalloc_socks(void)\n" + " {\n" + " \treturn static_key_false(&memalloc_socks);\n" + " }\n" + "+#else\n" + "+\n" + "+static inline int sk_memalloc_socks(void)\n" + "+{\n" + "+\treturn 0;\n" + "+}\n" + "+\n" + "+#endif\n" + " \n" + " static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask)\n" + " {\n" + "-- \n" + "1.7.10\n" + "\n" + "Sebastian\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -5fe80e5aa8c7903405f7eb1de62b0ca003ad8f77833c170959eaa9f022de09cf +84af0cf62e2ca50ef1757e67d8dd622b6ec262a269cfe371901e00eec2b1cf6c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.