[kernel] r16955 - dists/squeeze/linux-2.6/debian/patches/debian

[Ben Hutchings]

Author: benh
Date: Mon Feb 28 14:53:31 2011
New Revision: 16955

Log:
Don't use #ifndef MODULE; it changes symbol versions for modules

Modified:
   dists/squeeze/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-in-2.6.32.29.patch

Modified: dists/squeeze/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-in-2.6.32.29.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-in-2.6.32.29.patch	Mon Feb 28 08:48:08 2011	(r16954)
+++ dists/squeeze/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-in-2.6.32.29.patch	Mon Feb 28 14:53:31 2011	(r16955)
@@ -1,33 +1,12 @@
-From c21f57566f4a6fe8ae66d887c5757e492c3a1107 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 18 Feb 2011 03:36:47 +0000
 Subject: [PATCH] sched: Avoid ABI change in 2.6.32.29
 
 Hide changes in scheduler internals from genksyms.
 
-Guard all the scheduler internals declared in <linux/sched.h> (struct
-sched_group, struct sched_domain, struct sched_class, etc.) with
-'#ifndef MODULE' to ensure modules really don't use them.
-
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
- include/linux/sched.h |    6 ++++++
- kernel/sched.c        |    4 ++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 4f96d18..508d511 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -816,6 +816,8 @@ enum cpu_idle_type {
- 	CPU_MAX_IDLE_TYPES
- };
- 
-+#ifndef MODULE /* modules must not use this */
-+
- /*
-  * sched-domains (multiprocessor balancing) declarations:
-  */
 @@ -897,7 +899,9 @@ struct sched_group {
  	 * single CPU.
  	 */
@@ -38,17 +17,6 @@
  
  	/*
  	 * The CPUs this group covers.
-@@ -1161,6 +1165,8 @@ struct sched_class {
- };
- #endif /* __GENKSYMS__ */
- 
-+#endif /* !MODULE */
-+
- struct load_weight {
- 	unsigned long weight, inv_weight;
- };
-diff --git a/kernel/sched.c b/kernel/sched.c
-index ecc5ffc..c937a96 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
 @@ -528,7 +528,9 @@ struct rq {
@@ -71,6 +39,3 @@
  
  	unsigned char idle_at_tick;
  	/* For active balancing */
--- 
-1.7.4.1
-