aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 16:28:39 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 16:28:39 -0700
commitdb48726237b40b406dbf2a58dcd1c733dde57607 (patch)
tree9f123bdbe211b6c4ab352c04f4f47e274d77947d
parent07c98c3f79c384abf0503e89cec102e86e7aba0a (diff)
downloadpatches-db48726237b40b406dbf2a58dcd1c733dde57607.tar.gz
2.6.25-git6
Diffstat
-rw-r--r--driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch64
-rw-r--r--ldp/input-add-appleir-driver.patch2
-rw-r--r--ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch2
-rw-r--r--ldp/video-add-the-go7007-driver.patch4
-rw-r--r--version2
5 files changed, 35 insertions, 39 deletions
diff --git a/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch b/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
index fc12964cd25227..8b529d742c01b2 100644
--- a/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
+++ b/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
@@ -50,14 +50,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/x86/kernel/apm_32.c | 8
- drivers/base/power/main.c | 688 ++++++++++++++++++++++++++++++++++-----------
+ drivers/base/power/main.c | 683 ++++++++++++++++++++++++++++++++++-----------
drivers/base/power/power.h | 2
drivers/base/power/trace.c | 4
include/linux/device.h | 9
include/linux/pm.h | 314 ++++++++++++++++++--
- kernel/power/disk.c | 20 -
+ kernel/power/disk.c | 22 -
kernel/power/main.c | 6
- 8 files changed, 851 insertions(+), 200 deletions(-)
+ 8 files changed, 849 insertions(+), 199 deletions(-)
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -163,7 +163,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/**
* device_pm_add - add a device to the list of active devices
-@@ -68,19 +75,32 @@ int device_pm_add(struct device *dev)
+@@ -68,17 +75,25 @@ int device_pm_add(struct device *dev)
dev->bus ? dev->bus->name : "No Bus",
kobject_name(&dev->kobj));
mutex_lock(&dpm_list_mtx);
@@ -176,8 +176,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
dev->parent->bus_id);
- else
- dev_warn(dev, "all devices are sleeping\n");
-- WARN_ON(true);
-+ goto Refuse;
++ WARN_ON(true);
+ }
+ } else if (transition_started) {
+ /*
@@ -185,7 +184,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ * transition is in progress in order to avoid leaving them
+ * unhandled down the road
+ */
-+ goto Refuse;
+ WARN_ON(true);
}
error = dpm_sysfs_add(dev);
- if (!error)
@@ -193,18 +192,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ if (!error) {
+ dev->power.status = DPM_ON;
+ list_add_tail(&dev->power.entry, &dpm_list);
-+ }
-+End:
++ }
mutex_unlock(&dpm_list_mtx);
return error;
-+Refuse:
-+ WARN_ON(true);
-+ error = -EBUSY;
-+ goto End;
}
-
- /**
-@@ -100,73 +120,241 @@ void device_pm_remove(struct device *dev
+@@ -100,73 +115,243 @@ void device_pm_remove(struct device *dev
mutex_unlock(&dpm_list_mtx);
}
@@ -347,6 +339,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ return "thaw";
+ case PM_EVENT_RESTORE:
+ return "restore";
++ case PM_EVENT_RECOVER:
++ return "recover";
+ default:
+ return "(unknown PM event)";
+ }
@@ -467,7 +461,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
int error = 0;
-@@ -175,21 +363,40 @@ static int resume_device(struct device *
+@@ -175,21 +360,40 @@ static int resume_device(struct device *
down(&dev->sem);
@@ -518,7 +512,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
up(&dev->sem);
TRACE_RESUME(error);
-@@ -198,78 +405,161 @@ static int resume_device(struct device *
+@@ -198,78 +402,161 @@ static int resume_device(struct device *
/**
* dpm_resume - Resume every device.
@@ -716,7 +710,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
error = dev->bus->suspend_late(dev, state);
suspend_report_result(dev->bus->suspend_late, error);
}
-@@ -278,37 +568,30 @@ static int suspend_device_late(struct de
+@@ -278,37 +565,30 @@ static int suspend_device_late(struct de
/**
* device_power_down - Shut down special devices.
@@ -762,7 +756,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return error;
}
EXPORT_SYMBOL_GPL(device_power_down);
-@@ -316,7 +599,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
+@@ -316,7 +596,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
/**
* suspend_device - Save state of one device.
* @dev: Device.
@@ -771,7 +765,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*/
static int suspend_device(struct device *dev, pm_message_t state)
{
-@@ -324,24 +607,43 @@ static int suspend_device(struct device
+@@ -324,24 +604,43 @@ static int suspend_device(struct device
down(&dev->sem);
@@ -831,7 +825,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
up(&dev->sem);
return error;
-@@ -349,67 +651,141 @@ static int suspend_device(struct device
+@@ -349,67 +648,141 @@ static int suspend_device(struct device
/**
* dpm_suspend - Suspend every device.
@@ -1418,28 +1412,30 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
local_irq_disable();
/* At this point, device_suspend() has been called, but *not*
* device_power_down(). We *must* call device_power_down() now.
-@@ -224,9 +225,10 @@ static int create_image(int platform_mod
+@@ -224,9 +225,11 @@ static int create_image(int platform_mod
/* NOTE: device_power_up() is just a resume() for devices
* that suspended with irqs off ... no overall powerup.
*/
- device_power_up();
-+ device_power_up(in_suspend ? PMSG_RECOVER : PMSG_RESTORE);
++ device_power_up(in_suspend ?
++ (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
Enable_irqs:
local_irq_enable();
+ device_pm_unlock();
return error;
}
-@@ -280,7 +282,7 @@ int hibernation_snapshot(int platform_mo
+@@ -280,7 +283,8 @@ int hibernation_snapshot(int platform_mo
Finish:
platform_finish(platform_mode);
Resume_devices:
- device_resume();
-+ device_resume(in_suspend ? PMSG_RECOVER : PMSG_RESTORE);
++ device_resume(in_suspend ?
++ (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
Resume_console:
resume_console();
Close:
-@@ -300,8 +302,9 @@ static int resume_target_kernel(void)
+@@ -300,8 +304,9 @@ static int resume_target_kernel(void)
{
int error;
@@ -1450,19 +1446,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (error) {
printk(KERN_ERR "PM: Some devices failed to power down, "
"aborting resume\n");
-@@ -329,9 +332,10 @@ static int resume_target_kernel(void)
+@@ -329,9 +334,10 @@ static int resume_target_kernel(void)
swsusp_free();
restore_processor_state();
touch_softlockup_watchdog();
- device_power_up();
-+ device_power_up(PMSG_THAW);
++ device_power_up(PMSG_RECOVER);
Enable_irqs:
local_irq_enable();
+ device_pm_unlock();
return error;
}
-@@ -350,7 +354,7 @@ int hibernation_restore(int platform_mod
+@@ -350,7 +356,7 @@ int hibernation_restore(int platform_mod
pm_prepare_console();
suspend_console();
@@ -1471,7 +1467,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (error)
goto Finish;
-@@ -362,7 +366,7 @@ int hibernation_restore(int platform_mod
+@@ -362,7 +368,7 @@ int hibernation_restore(int platform_mod
enable_nonboot_cpus();
}
platform_restore_cleanup(platform_mode);
@@ -1480,7 +1476,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Finish:
resume_console();
pm_restore_console();
-@@ -403,6 +407,7 @@ int hibernation_platform_enter(void)
+@@ -403,6 +409,7 @@ int hibernation_platform_enter(void)
if (error)
goto Finish;
@@ -1488,7 +1484,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
local_irq_disable();
error = device_power_down(PMSG_HIBERNATE);
if (!error) {
-@@ -411,6 +416,7 @@ int hibernation_platform_enter(void)
+@@ -411,6 +418,7 @@ int hibernation_platform_enter(void)
while (1);
}
local_irq_enable();
@@ -1496,7 +1492,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/*
* We don't need to reenable the nonboot CPUs or resume consoles, since
-@@ -419,7 +425,7 @@ int hibernation_platform_enter(void)
+@@ -419,7 +427,7 @@ int hibernation_platform_enter(void)
Finish:
hibernation_ops->finish();
Resume_devices:
diff --git a/ldp/input-add-appleir-driver.patch b/ldp/input-add-appleir-driver.patch
index b1eb3cadc53630..6beda1809eb2af 100644
--- a/ldp/input-add-appleir-driver.patch
+++ b/ldp/input-add-appleir-driver.patch
@@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
-@@ -148,6 +148,18 @@ config INPUT_KEYSPAN_REMOTE
+@@ -149,6 +149,18 @@ config INPUT_KEYSPAN_REMOTE
To compile this driver as a module, choose M here: the module will
be called keyspan_remote.
diff --git a/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch b/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch
index 94a0474b25a1f2..deabe80187130e 100644
--- a/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch
+++ b/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -2149,6 +2149,15 @@ config 9P_FS
+@@ -2150,6 +2150,15 @@ config 9P_FS
If unsure, say N.
diff --git a/ldp/video-add-the-go7007-driver.patch b/ldp/video-add-the-go7007-driver.patch
index 0091ea90d6c08e..6c09d6115ccd7d 100644
--- a/ldp/video-add-the-go7007-driver.patch
+++ b/ldp/video-add-the-go7007-driver.patch
@@ -31,7 +31,7 @@ Doesn't build yet, but we have to start somewhere...
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
-@@ -630,6 +630,7 @@ config VIDEO_MEYE
+@@ -639,6 +639,7 @@ config VIDEO_MEYE
module will be called meye.
source "drivers/media/video/saa7134/Kconfig"
@@ -41,7 +41,7 @@ Doesn't build yet, but we have to start somewhere...
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
-@@ -130,6 +130,8 @@ obj-$(CONFIG_USB_KONICAWC) += usbvi
+@@ -133,6 +133,8 @@ obj-$(CONFIG_USB_KONICAWC) += usbvi
obj-$(CONFIG_USB_VICAM) += usbvideo/
obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/
diff --git a/version b/version
index b8cea3cddc6792..09d5b4188bba18 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.25-git5
+2.6.25-git6
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:11:39 +0000