[kernel] r16353 - in dists/sid/linux-2.6/debian/patches: debian series
Ben Hutchings
benh at alioth.debian.org
Sat Sep 25 17:52:02 UTC 2010
Author: benh
Date: Sat Sep 25 17:51:55 2010
New Revision: 16353
Log:
Hide another private structure change from genksyms
Added:
dists/sid/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-due-to-rq-change.patch
Modified:
dists/sid/linux-2.6/debian/patches/debian/revert-sched-2.6.32.22-changes.patch
dists/sid/linux-2.6/debian/patches/series/24
Modified: dists/sid/linux-2.6/debian/patches/debian/revert-sched-2.6.32.22-changes.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/revert-sched-2.6.32.22-changes.patch Sat Sep 25 01:21:34 2010 (r16352)
+++ dists/sid/linux-2.6/debian/patches/debian/revert-sched-2.6.32.22-changes.patch Sat Sep 25 17:51:55 2010 (r16353)
@@ -340,15 +340,15 @@
printk("Disabling non-boot CPUs ...\n");
for_each_online_cpu(cpu) {
if (cpu == first_cpu)
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 98d4048..9990074 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -542,6 +542,7 @@ struct rq {
+@@ -542,9 +542,7 @@ struct rq {
struct load_weight load;
unsigned long nr_load_updates;
u64 nr_switches;
-+ u64 nr_migrations_in;
+-#ifdef __GENKSYMS__
+ u64 nr_migrations_in;
+-#endif
struct cfs_rq cfs;
struct rt_rq rt;
Added: dists/sid/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-due-to-rq-change.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-due-to-rq-change.patch Sat Sep 25 17:51:55 2010 (r16353)
@@ -0,0 +1,28 @@
+From 1ca2d3f2cd05612d5787dab9813cb5d04af1b3e3 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 25 Sep 2010 18:36:44 +0100
+Subject: [PATCH] sched: Avoid ABI change due to rq change
+
+This structure is private but genksyms doesn't know that.
+
+---
+ kernel/sched.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 3480822..e3ee9f7 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -542,6 +542,9 @@ struct rq {
+ struct load_weight load;
+ unsigned long nr_load_updates;
+ u64 nr_switches;
++#ifdef __GENKSYMS__
++ u64 nr_migrations_in;
++#endif
+
+ struct cfs_rq cfs;
+ struct rt_rq rt;
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/series/24
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/24 Sat Sep 25 01:21:34 2010 (r16352)
+++ dists/sid/linux-2.6/debian/patches/series/24 Sat Sep 25 17:51:55 2010 (r16353)
@@ -34,6 +34,7 @@
+ features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch
+ debian/revert-sched-Pre-compute-cpumask_weight-sched_domain.patch
+ debian/sched-Avoid-ABI-change-due-to-sched_class-changes.patch
++ debian/sched-Avoid-ABI-change-due-to-rq-change.patch
- debian/i915-Blacklist-i830-i845-i855-for-KMS.patch
+ bugfix/all/phonet-Restrict-to-initial-namespace.patch
- bugfix/all/keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch
More information about the Kernel-svn-changes
mailing list