summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-01-12 20:46:30 -0500
committerKyle McMartin <kyle@redhat.com>2011-01-12 20:46:30 -0500
commit6c1e38b718fa8d9aa28cc70ac0f024ff2b97eab9 (patch)
treee8368b605cc8f0c2fab9b15c5b44d80600ca370a
parent5b032757ea7c6a18ff13fca4370903a2bb22c1aa (diff)
downloadkernel-6c1e38b718fa8d9aa28cc70ac0f024ff2b97eab9.tar.gz
kernel-6c1e38b718fa8d9aa28cc70ac0f024ff2b97eab9.tar.xz
kernel-6c1e38b718fa8d9aa28cc70ac0f024ff2b97eab9.zip
update linux-2.6-silence-noise.patch and suck in gitrev 9
re-enable RONX modules, since it's been fixed to get along with dynamic ftrace.
-rw-r--r--config-debug2
-rw-r--r--config-nodebug2
-rw-r--r--kernel.spec2
-rw-r--r--linux-2.6-silence-noise.patch30
-rw-r--r--sources1
5 files changed, 22 insertions, 15 deletions
diff --git a/config-debug b/config-debug
index 1d45a8938..a249d3b1f 100644
--- a/config-debug
+++ b/config-debug
@@ -98,4 +98,4 @@ CONFIG_KDB_KEYBOARD=y
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
+CONFIG_DEBUG_SET_MODULE_RONX
diff --git a/config-nodebug b/config-nodebug
index 862e021c0..89d3bd0c8 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -98,4 +98,4 @@ CONFIG_KDB_KEYBOARD=y
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
+CONFIG_DEBUG_SET_MODULE_RONX=y
diff --git a/kernel.spec b/kernel.spec
index 7392f34d4..8dca74336 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 4
+%define gitrev 9
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
diff --git a/linux-2.6-silence-noise.patch b/linux-2.6-silence-noise.patch
index ebd58195b..32c678b1f 100644
--- a/linux-2.6-silence-noise.patch
+++ b/linux-2.6-silence-noise.patch
@@ -1,15 +1,3 @@
---- linux-2.6.26.noarch/drivers/base/power/main.c~ 2008-08-22 20:57:57.000000000 -0400
-+++ linux-2.6.26.noarch/drivers/base/power/main.c 2008-08-22 20:58:05.000000000 -0400
-@@ -69,9 +69,6 @@ void device_pm_unlock(void)
- */
- void device_pm_add(struct device *dev)
- {
-- pr_debug("PM: Adding info for %s:%s\n",
-- dev->bus ? dev->bus->name : "No Bus",
-- kobject_name(&dev->kobj));
- mutex_lock(&dpm_list_mtx);
- if (dev->parent) {
- if (dev->parent->power.status >= DPM_SUSPENDING)
From b4e96f34c17e5a79cd28774cc722bb33e7e02c6e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 25 Sep 2008 16:23:33 -0400
@@ -64,3 +52,21 @@ Signed-off-by: Dave Jones <davej@redhat.com>
}
#endif
+This was removed in revision 1.6 of linux-2.6-silence-noise.patch
+in ye olde CVS tree. I have no idea why. Originally the pr_debug in
+device_pm_remove was nuked as well, but that seems to have gotten lost in
+the r1.634 of kernel.spec (2.6.26-rc2-git5.)
+
+diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
+index 2a52270..bacbdd2 100644
+--- a/drivers/base/power/main.c
++++ b/drivers/base/power/main.c
+@@ -87,8 +87,6 @@ void device_pm_unlock(void)
+ */
+ void device_pm_add(struct device *dev)
+ {
+- pr_debug("PM: Adding info for %s:%s\n",
+- dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
+ mutex_lock(&dpm_list_mtx);
+ if (dev->parent && dev->parent->power.in_suspend)
+ dev_warn(dev, "parent %s should not be sleeping\n",
diff --git a/sources b/sources
index 7373dc91e..e0dd5183c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2
b5f8b8a1e82bf1d52404e73421a21f4f patch-2.6.37-git4.bz2
+58ad5016a3b3e12b6364b7cceed44a12 patch-2.6.37-git9.bz2