From 6239e71e60c7aaee9e82522c382184e43c924630 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 22 Jul 2010 22:58:01 -0700
Subject: [PATCH] --- yaml --- r: 204789 b: refs/heads/master c:
 c7f52cdc2f3e1733d3864e439ac2e92edd99ef31 h: refs/heads/master i:   204787:
 17569aaea102fc70c96dc91b65142913f08be46b v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/include/asm/setup.h      | 2 +-
 trunk/include/asm-generic/vmlinux.lds.h | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3de577328029..21e536a998b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b43275d661baa5f1f72dacd9033d6eda09d9fe87
+refs/heads/master: c7f52cdc2f3e1733d3864e439ac2e92edd99ef31
diff --git a/trunk/arch/x86/include/asm/setup.h b/trunk/arch/x86/include/asm/setup.h
index 86b1506f4179..ef292c792d74 100644
--- a/trunk/arch/x86/include/asm/setup.h
+++ b/trunk/arch/x86/include/asm/setup.h
@@ -82,7 +82,7 @@ void *extend_brk(size_t size, size_t align);
  * executable.)
  */
 #define RESERVE_BRK(name,sz)						\
-	static void __section(.discard) __used				\
+	static void __section(.discard.text) __used			\
 	__brk_reservation_fn_##name##__(void) {				\
 		asm volatile (						\
 			".pushsection .brk_reservation,\"aw\",@nobits;" \
diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h
index 48c5299cbf26..ae6b88eb1de1 100644
--- a/trunk/include/asm-generic/vmlinux.lds.h
+++ b/trunk/include/asm-generic/vmlinux.lds.h
@@ -643,6 +643,7 @@
 	EXIT_DATA							\
 	EXIT_CALL							\
 	*(.discard)							\
+	*(.discard.*)							\
 	}
 
 /**