diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-07 16:17:14 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-07 16:17:14 +0900 |
commit | 1b62200ec11c97095dbccb91841bcc037386ca1f (patch) | |
tree | 19b7021c58a03b6deee5342b72656343dfc4078e | |
parent | 264a08866119c2dd919620eff67686ef59f7ace1 (diff) | |
download | ltsi-kernel-1b62200ec11c97095dbccb91841bcc037386ca1f.tar.gz |
update to 3.0.33 upstream release
5 files changed, 67 insertions, 132 deletions
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch index bc00d8acb7e28..ddba84798093d 100644 --- a/patches.ltsi/ltsi-makefile-addition.patch +++ b/patches.ltsi/ltsi-makefile-addition.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 - SUBLEVEL = 31 + SUBLEVEL = 33 -EXTRAVERSION = +EXTRAVERSION = -ltsi NAME = Sneaky Weasel diff --git a/patches.pramfs/08-pramfs-headers.patch b/patches.pramfs/08-pramfs-headers.patch index d4d4f8098b7fb..143f221e8dfbd 100644 --- a/patches.pramfs/08-pramfs-headers.patch +++ b/patches.pramfs/08-pramfs-headers.patch @@ -315,7 +315,7 @@ Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com> struct vm_area_struct; struct vfsmount; struct cred; -@@ -2346,6 +2347,7 @@ extern int nonseekable_open(struct inode +@@ -2347,6 +2348,7 @@ extern int nonseekable_open(struct inode #ifdef CONFIG_FS_XIP extern ssize_t xip_file_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); diff --git a/patches.runtime_pm/0041-PM-Runtime-Add-macro-to-test-for-runtime-PM-events.patch b/patches.runtime_pm/0041-PM-Runtime-Add-macro-to-test-for-runtime-PM-events.patch index fc1bad7145e58..c9238f0373528 100644 --- a/patches.runtime_pm/0041-PM-Runtime-Add-macro-to-test-for-runtime-PM-events.patch +++ b/patches.runtime_pm/0041-PM-Runtime-Add-macro-to-test-for-runtime-PM-events.patch @@ -36,11 +36,9 @@ Signed-off-by: Simon Horman <horms@verge.net.au> sound/usb/card.c | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) -diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt -index c9ffa9c..e8662a5 100644 --- a/Documentation/usb/power-management.txt +++ b/Documentation/usb/power-management.txt -@@ -439,10 +439,10 @@ cause autosuspends to fail with -EBUSY if the driver needs to use the +@@ -439,10 +439,10 @@ cause autosuspends to fail with -EBUSY i device. External suspend calls should never be allowed to fail in this way, @@ -55,11 +53,9 @@ index c9ffa9c..e8662a5 100644 Mutual exclusion -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 9f3a8b3..0a06b97 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1109,7 +1109,7 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1112,7 +1112,7 @@ static int btusb_suspend(struct usb_inte return 0; spin_lock_irq(&data->txlock); @@ -68,11 +64,9 @@ index 9f3a8b3..0a06b97 100644 set_bit(BTUSB_SUSPENDING, &data->flags); spin_unlock_irq(&data->txlock); } else { -diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c -index 9d8710f..1782693 100644 --- a/drivers/hid/hid-picolcd.c +++ b/drivers/hid/hid-picolcd.c -@@ -2409,7 +2409,7 @@ static int picolcd_raw_event(struct hid_device *hdev, +@@ -2409,7 +2409,7 @@ static int picolcd_raw_event(struct hid_ #ifdef CONFIG_PM static int picolcd_suspend(struct hid_device *hdev, pm_message_t message) { @@ -81,11 +75,9 @@ index 9d8710f..1782693 100644 return 0; picolcd_suspend_backlight(hid_get_drvdata(hdev)); -diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 38c261a..17fdfe6 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c -@@ -1330,7 +1330,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1330,7 +1330,7 @@ static int hid_suspend(struct usb_interf struct usbhid_device *usbhid = hid->driver_data; int status; @@ -94,7 +86,7 @@ index 38c261a..17fdfe6 100644 spin_lock_irq(&usbhid->lock); /* Sync with error handler */ if (!test_bit(HID_RESET_PENDING, &usbhid->iofl) && !test_bit(HID_CLEAR_HALT, &usbhid->iofl) -@@ -1365,7 +1365,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1365,7 +1365,7 @@ static int hid_suspend(struct usb_interf return -EIO; } @@ -103,7 +95,7 @@ index 38c261a..17fdfe6 100644 spin_lock_irq(&usbhid->lock); if (test_bit(HID_LED_ON, &usbhid->iofl)) { spin_unlock_irq(&usbhid->lock); -@@ -1378,8 +1378,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1378,8 +1378,7 @@ static int hid_suspend(struct usb_interf hid_cancel_delayed_stuff(usbhid); hid_cease_io(usbhid); @@ -113,11 +105,9 @@ index 38c261a..17fdfe6 100644 /* lost race against keypresses */ status = hid_start_in(hid); if (status < 0) -diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c -index 46a6b67..caadbf2 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1480,7 +1480,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message) +@@ -1502,7 +1502,7 @@ int usbnet_suspend (struct usb_interface if (!dev->suspend_count++) { spin_lock_irq(&dev->txq.lock); /* don't autosuspend while transmitting */ @@ -126,11 +116,9 @@ index 46a6b67..caadbf2 100644 spin_unlock_irq(&dev->txq.lock); return -EBUSY; } else { -diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c -index 298f2b0..9a644d0 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c -@@ -599,7 +599,7 @@ void i2400mu_disconnect(struct usb_interface *iface) +@@ -599,7 +599,7 @@ void i2400mu_disconnect(struct usb_inter * * As well, the device might refuse going to sleep for whichever * reason. In this case we just fail. For system suspend/hibernate, @@ -139,7 +127,7 @@ index 298f2b0..9a644d0 100644 * suspend call comes from the USB stack or from the system and act * in consequence. * -@@ -615,7 +615,7 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg) +@@ -615,7 +615,7 @@ int i2400mu_suspend(struct usb_interface struct i2400m *i2400m = &i2400mu->i2400m; #ifdef CONFIG_PM @@ -148,11 +136,9 @@ index 298f2b0..9a644d0 100644 is_autosuspend = 1; #endif -diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c -index 158f631..4748313 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c -@@ -1319,7 +1319,7 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1319,7 +1319,7 @@ static int acm_suspend(struct usb_interf struct acm *acm = usb_get_intfdata(intf); int cnt; @@ -161,11 +147,9 @@ index 158f631..4748313 100644 int b; spin_lock_irq(&acm->write_lock); -diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c -index 76f0613..e42fae7 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c -@@ -814,13 +814,13 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message) +@@ -817,13 +817,13 @@ static int wdm_suspend(struct usb_interf dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor); /* if this is an autosuspend the caller does the locking */ @@ -181,7 +165,7 @@ index 76f0613..e42fae7 100644 (test_bit(WDM_IN_USE, &desc->flags) || test_bit(WDM_RESPONDING, &desc->flags))) { spin_unlock_irq(&desc->iuspin); -@@ -833,7 +833,7 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message) +@@ -836,7 +836,7 @@ static int wdm_suspend(struct usb_interf kill_urbs(desc); cancel_work_sync(&desc->rxwork); } @@ -190,11 +174,9 @@ index 76f0613..e42fae7 100644 mutex_unlock(&desc->wlock); mutex_unlock(&desc->rlock); } -diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c -index 75b4bc0..3ffdb0e 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c -@@ -1046,8 +1046,7 @@ static int usb_resume_device(struct usb_device *udev, pm_message_t msg) +@@ -1046,8 +1046,7 @@ static int usb_resume_device(struct usb_ /* Non-root devices on a full/low-speed bus must wait for their * companion high-speed root hub, in case a handoff is needed. */ @@ -204,7 +186,7 @@ index 75b4bc0..3ffdb0e 100644 device_pm_wait_for_dev(&udev->dev, &udev->bus->hs_companion->root_hub->dev); -@@ -1075,7 +1074,7 @@ static int usb_suspend_interface(struct usb_device *udev, +@@ -1075,7 +1074,7 @@ static int usb_suspend_interface(struct if (driver->suspend) { status = driver->suspend(intf, msg); @@ -213,7 +195,7 @@ index 75b4bc0..3ffdb0e 100644 dev_err(&intf->dev, "%s error %d\n", "suspend", status); } else { -@@ -1189,7 +1188,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) +@@ -1189,7 +1188,7 @@ static int usb_suspend_both(struct usb_d status = usb_suspend_interface(udev, intf, msg); /* Ignore errors during system sleep transitions */ @@ -222,7 +204,7 @@ index 75b4bc0..3ffdb0e 100644 status = 0; if (status != 0) break; -@@ -1199,7 +1198,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) +@@ -1199,7 +1198,7 @@ static int usb_suspend_both(struct usb_d status = usb_suspend_device(udev, msg); /* Again, ignore errors during system sleep transitions */ @@ -231,11 +213,9 @@ index 75b4bc0..3ffdb0e 100644 status = 0; } -diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index 45e0908..c284e97 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -1950,7 +1950,7 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg) +@@ -1950,7 +1950,7 @@ int hcd_bus_suspend(struct usb_device *r int old_state = hcd->state; dev_dbg(&rhdev->dev, "bus %s%s\n", @@ -244,7 +224,7 @@ index 45e0908..c284e97 100644 if (HCD_DEAD(hcd)) { dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend"); return 0; -@@ -1986,7 +1986,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) +@@ -1986,7 +1986,7 @@ int hcd_bus_resume(struct usb_device *rh int old_state = hcd->state; dev_dbg(&rhdev->dev, "usb %s%s\n", @@ -253,11 +233,9 @@ index 45e0908..c284e97 100644 if (HCD_DEAD(hcd)) { dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "resume"); return 0; -diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 3776ddf..8c390a4 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -2352,7 +2352,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) +@@ -2349,7 +2349,7 @@ int usb_port_suspend(struct usb_device * dev_dbg(&udev->dev, "won't remote wakeup, status %d\n", status); /* bail if autosuspend is requested */ @@ -266,7 +244,7 @@ index 3776ddf..8c390a4 100644 return status; } } -@@ -2377,12 +2377,12 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) +@@ -2374,12 +2374,12 @@ int usb_port_suspend(struct usb_device * USB_CTRL_SET_TIMEOUT); /* System sleep transitions should never fail */ @@ -281,7 +259,7 @@ index 3776ddf..8c390a4 100644 usb_set_device_state(udev, USB_STATE_SUSPENDED); msleep(10); } -@@ -2533,7 +2533,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) +@@ -2530,7 +2530,7 @@ int usb_port_resume(struct usb_device *u } else { /* drive resume for at least 20 msec */ dev_dbg(&udev->dev, "usb %sresume\n", @@ -290,7 +268,7 @@ index 3776ddf..8c390a4 100644 msleep(25); /* Virtual root hubs can trigger on GET_PORT_STATUS to -@@ -2635,7 +2635,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg) +@@ -2632,7 +2632,7 @@ static int hub_suspend(struct usb_interf udev = hdev->children [port1-1]; if (udev && udev->can_submit) { dev_warn(&intf->dev, "port %d nyet suspended\n", port1); @@ -299,11 +277,9 @@ index 3776ddf..8c390a4 100644 return -EBUSY; } } -diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c -index d5d136a..b18179b 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c -@@ -1009,7 +1009,7 @@ static int sierra_suspend(struct usb_serial *serial, pm_message_t message) +@@ -1012,7 +1012,7 @@ static int sierra_suspend(struct usb_ser struct sierra_intf_private *intfdata; int b; @@ -312,11 +288,9 @@ index d5d136a..b18179b 100644 intfdata = serial->private; spin_lock_irq(&intfdata->susp_lock); b = intfdata->in_flight; -diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c -index e4fad5e..d555ca9 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c -@@ -651,7 +651,7 @@ int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message) +@@ -651,7 +651,7 @@ int usb_wwan_suspend(struct usb_serial * dbg("%s entered", __func__); @@ -325,11 +299,9 @@ index e4fad5e..d555ca9 100644 spin_lock_irq(&intfdata->susp_lock); b = intfdata->in_flight; spin_unlock_irq(&intfdata->susp_lock); -diff --git a/include/linux/pm.h b/include/linux/pm.h -index f7c84c9..18de9f8 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h -@@ -366,6 +366,8 @@ extern struct dev_pm_ops generic_subsys_pm_ops; +@@ -366,6 +366,8 @@ extern struct dev_pm_ops generic_subsys_ #define PMSG_AUTO_RESUME ((struct pm_message) \ { .event = PM_EVENT_AUTO_RESUME, }) @@ -338,11 +310,9 @@ index f7c84c9..18de9f8 100644 /** * Device run-time power management status. * -diff --git a/sound/usb/card.c b/sound/usb/card.c -index 57a8e2d..e782fb5 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c -@@ -631,7 +631,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) +@@ -631,7 +631,7 @@ static int usb_audio_suspend(struct usb_ if (chip == (void *)-1L) return 0; @@ -351,6 +321,3 @@ index 57a8e2d..e782fb5 100644 snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); if (!chip->num_suspended_intf++) { list_for_each(p, &chip->pcm_list) { --- -1.7.10.1.362.g242cab3 - diff --git a/patches.runtime_pm/0055-plist-Remove-the-need-to-supply-locks-to-plist-heads.patch b/patches.runtime_pm/0055-plist-Remove-the-need-to-supply-locks-to-plist-heads.patch index 24a7397fe1d08..72beeeec2b43f 100644 --- a/patches.runtime_pm/0055-plist-Remove-the-need-to-supply-locks-to-plist-heads.patch +++ b/patches.runtime_pm/0055-plist-Remove-the-need-to-supply-locks-to-plist-heads.patch @@ -19,18 +19,16 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Simon Horman <horms@verge.net.au> --- - include/linux/plist.h | 55 +++-------------------------------------------- - include/linux/rtmutex.h | 4 ++-- - kernel/fork.c | 2 +- - kernel/futex.c | 2 +- - kernel/power/qos.c | 6 +++--- - kernel/rtmutex.c | 2 +- - kernel/sched.c | 4 ++-- - lib/plist.c | 7 +----- + include/linux/plist.h | 55 ++---------------------------------------------- + include/linux/rtmutex.h | 4 +-- + kernel/fork.c | 2 - + kernel/futex.c | 2 - + kernel/power/qos.c | 6 ++--- + kernel/rtmutex.c | 2 - + kernel/sched.c | 4 +-- + lib/plist.c | 7 ------ 8 files changed, 14 insertions(+), 68 deletions(-) -diff --git a/include/linux/plist.h b/include/linux/plist.h -index c9b9f32..aa0fb39 100644 --- a/include/linux/plist.h +++ b/include/linux/plist.h @@ -77,14 +77,9 @@ @@ -93,12 +91,11 @@ index c9b9f32..aa0fb39 100644 * plist_head_init - dynamic struct plist_head initializer * @head: &struct plist_head pointer - * @lock: spinlock protecting the list (debugging) - */ - static inline void +- */ +-static inline void -plist_head_init(struct plist_head *head, spinlock_t *lock) -+plist_head_init(struct plist_head *head) - { - INIT_LIST_HEAD(&head->node_list); +-{ +- INIT_LIST_HEAD(&head->node_list); -#ifdef CONFIG_DEBUG_PI_LIST - head->spinlock = lock; - head->rawlock = NULL; @@ -109,11 +106,12 @@ index c9b9f32..aa0fb39 100644 - * plist_head_init_raw - dynamic struct plist_head initializer - * @head: &struct plist_head pointer - * @lock: raw_spinlock protecting the list (debugging) -- */ --static inline void + */ + static inline void -plist_head_init_raw(struct plist_head *head, raw_spinlock_t *lock) --{ -- INIT_LIST_HEAD(&head->node_list); ++plist_head_init(struct plist_head *head) + { + INIT_LIST_HEAD(&head->node_list); -#ifdef CONFIG_DEBUG_PI_LIST - head->rawlock = lock; - head->spinlock = NULL; @@ -121,8 +119,6 @@ index c9b9f32..aa0fb39 100644 } /** -diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h -index 8d522ff..de17134 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h @@ -66,7 +66,7 @@ struct hrtimer_sleeper; @@ -134,7 +130,7 @@ index 8d522ff..de17134 100644 , .owner = NULL \ __DEBUG_RT_MUTEX_INITIALIZER(mutexname)} -@@ -100,7 +100,7 @@ extern void rt_mutex_unlock(struct rt_mutex *lock); +@@ -100,7 +100,7 @@ extern void rt_mutex_unlock(struct rt_mu #ifdef CONFIG_RT_MUTEXES # define INIT_RT_MUTEXES(tsk) \ @@ -143,11 +139,9 @@ index 8d522ff..de17134 100644 INIT_RT_MUTEX_DEBUG(tsk) #else # define INIT_RT_MUTEXES(tsk) -diff --git a/kernel/fork.c b/kernel/fork.c -index a4e453b..c66f27f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -1016,7 +1016,7 @@ static void rt_mutex_init_task(struct task_struct *p) +@@ -1017,7 +1017,7 @@ static void rt_mutex_init_task(struct ta { raw_spin_lock_init(&p->pi_lock); #ifdef CONFIG_RT_MUTEXES @@ -156,11 +150,9 @@ index a4e453b..c66f27f 100644 p->pi_blocked_on = NULL; #endif } -diff --git a/kernel/futex.c b/kernel/futex.c -index a2a01ef..6e57b21 100644 --- a/kernel/futex.c +++ b/kernel/futex.c -@@ -2746,7 +2746,7 @@ static int __init futex_init(void) +@@ -2736,7 +2736,7 @@ static int __init futex_init(void) futex_cmpxchg_enabled = 1; for (i = 0; i < ARRAY_SIZE(futex_queues); i++) { @@ -169,8 +161,6 @@ index a2a01ef..6e57b21 100644 spin_lock_init(&futex_queues[i].lock); } -diff --git a/kernel/power/qos.c b/kernel/power/qos.c -index 3bf69f1..61b4738 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -74,7 +74,7 @@ static DEFINE_SPINLOCK(pm_qos_lock); @@ -182,7 +172,7 @@ index 3bf69f1..61b4738 100644 .notifiers = &cpu_dma_lat_notifier, .name = "cpu_dma_latency", .target_value = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE, -@@ -84,7 +84,7 @@ static struct pm_qos_object cpu_dma_pm_qos = { +@@ -84,7 +84,7 @@ static struct pm_qos_object cpu_dma_pm_q static BLOCKING_NOTIFIER_HEAD(network_lat_notifier); static struct pm_qos_object network_lat_pm_qos = { @@ -191,7 +181,7 @@ index 3bf69f1..61b4738 100644 .notifiers = &network_lat_notifier, .name = "network_latency", .target_value = PM_QOS_NETWORK_LAT_DEFAULT_VALUE, -@@ -95,7 +95,7 @@ static struct pm_qos_object network_lat_pm_qos = { +@@ -95,7 +95,7 @@ static struct pm_qos_object network_lat_ static BLOCKING_NOTIFIER_HEAD(network_throughput_notifier); static struct pm_qos_object network_throughput_pm_qos = { @@ -200,11 +190,9 @@ index 3bf69f1..61b4738 100644 .notifiers = &network_throughput_notifier, .name = "network_throughput", .target_value = PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE, -diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c -index ab44911..255e166 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c -@@ -890,7 +890,7 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name) +@@ -890,7 +890,7 @@ void __rt_mutex_init(struct rt_mutex *lo { lock->owner = NULL; raw_spin_lock_init(&lock->wait_lock); @@ -213,11 +201,9 @@ index ab44911..255e166 100644 debug_rt_mutex_init(lock, name); } -diff --git a/kernel/sched.c b/kernel/sched.c -index 063d7a4..75a7b6f 100644 --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -7924,7 +7924,7 @@ static void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq) +@@ -7923,7 +7923,7 @@ static void init_rt_rq(struct rt_rq *rt_ #ifdef CONFIG_SMP rt_rq->rt_nr_migratory = 0; rt_rq->overloaded = 0; @@ -226,7 +212,7 @@ index 063d7a4..75a7b6f 100644 #endif rt_rq->rt_time = 0; -@@ -8129,7 +8129,7 @@ void __init sched_init(void) +@@ -8128,7 +8128,7 @@ void __init sched_init(void) #endif #ifdef CONFIG_RT_MUTEXES @@ -235,11 +221,9 @@ index 063d7a4..75a7b6f 100644 #endif /* -diff --git a/lib/plist.c b/lib/plist.c -index 0ae7e64..a0a4da4 100644 --- a/lib/plist.c +++ b/lib/plist.c -@@ -56,11 +56,6 @@ static void plist_check_list(struct list_head *top) +@@ -56,11 +56,6 @@ static void plist_check_list(struct list static void plist_check_head(struct plist_head *head) { @@ -260,6 +244,3 @@ index 0ae7e64..a0a4da4 100644 for (i = 0; i < ARRAY_SIZE(test_node); i++) plist_node_init(test_node + i, 0); --- -1.7.10.1.362.g242cab3 - diff --git a/patches.runtime_pm/0124-freezer-make-freezing-test-freeze-conditions-in-effe.patch b/patches.runtime_pm/0124-freezer-make-freezing-test-freeze-conditions-in-effe.patch index 918d265969cdb..851545fe6d32a 100644 --- a/patches.runtime_pm/0124-freezer-make-freezing-test-freeze-conditions-in-effe.patch +++ b/patches.runtime_pm/0124-freezer-make-freezing-test-freeze-conditions-in-effe.patch @@ -45,14 +45,12 @@ Acked-by: Paul Menage <paul@paulmenage.org> (for the cgroup portions) Signed-off-by: Simon Horman <horms@verge.net.au> --- include/linux/freezer.h | 33 +++++++++---------------- - kernel/cgroup_freezer.c | 10 +++++++- - kernel/fork.c | 1 - - kernel/freezer.c | 62 ++++++++++++++++++++++++++++++----------------- - kernel/power/process.c | 15 +++++++++--- + kernel/cgroup_freezer.c | 10 ++++++- + kernel/fork.c | 1 + kernel/freezer.c | 62 ++++++++++++++++++++++++++++++------------------ + kernel/power/process.c | 15 ++++++++--- 5 files changed, 72 insertions(+), 49 deletions(-) -diff --git a/include/linux/freezer.h b/include/linux/freezer.h -index 08a63a7..e01df77 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -5,8 +5,13 @@ @@ -69,7 +67,7 @@ index 08a63a7..e01df77 100644 /* * Check if a process has been frozen */ -@@ -15,28 +20,16 @@ static inline int frozen(struct task_struct *p) +@@ -15,28 +20,16 @@ static inline int frozen(struct task_str return p->flags & PF_FROZEN; } @@ -104,7 +102,7 @@ index 08a63a7..e01df77 100644 } static inline bool should_send_signal(struct task_struct *p) -@@ -164,9 +157,7 @@ static inline void set_freezable_with_signal(void) +@@ -164,9 +157,7 @@ static inline void set_freezable_with_si }) #else /* !CONFIG_FREEZER */ static inline int frozen(struct task_struct *p) { return 0; } @@ -115,11 +113,9 @@ index 08a63a7..e01df77 100644 static inline bool __refrigerator(bool check_kthr_stop) { return false; } static inline int freeze_processes(void) { return -ENOSYS; } -diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c -index 61ef5b5..ab79783 100644 --- a/kernel/cgroup_freezer.c +++ b/kernel/cgroup_freezer.c -@@ -145,7 +145,11 @@ static struct cgroup_subsys_state *freezer_create(struct cgroup_subsys *ss, +@@ -145,7 +145,11 @@ static struct cgroup_subsys_state *freez static void freezer_destroy(struct cgroup_subsys *ss, struct cgroup *cgroup) { @@ -132,7 +128,7 @@ index 61ef5b5..ab79783 100644 } /* task is frozen or will freeze immediately when next it gets woken */ -@@ -314,10 +318,14 @@ static int freezer_change_state(struct cgroup *cgroup, +@@ -314,10 +318,14 @@ static int freezer_change_state(struct c switch (goal_state) { case CGROUP_THAWED: @@ -147,11 +143,9 @@ index 61ef5b5..ab79783 100644 freezer->state = CGROUP_FREEZING; retval = try_to_freeze_cgroup(cgroup, freezer); break; -diff --git a/kernel/fork.c b/kernel/fork.c -index c66f27f..35799b7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -1002,7 +1002,6 @@ static void copy_flags(unsigned long clone_flags, struct task_struct *p) +@@ -1003,7 +1003,6 @@ static void copy_flags(unsigned long clo new_flags |= PF_FORKNOEXEC; new_flags |= PF_STARTING; p->flags = new_flags; @@ -159,8 +153,6 @@ index c66f27f..35799b7 100644 } SYSCALL_DEFINE1(set_tid_address, int __user *, tidptr) -diff --git a/kernel/freezer.c b/kernel/freezer.c -index 96f9667..8bf25f4 100644 --- a/kernel/freezer.c +++ b/kernel/freezer.c @@ -11,9 +11,41 @@ @@ -205,7 +197,7 @@ index 96f9667..8bf25f4 100644 /* Refrigerator is place where frozen processes are stored :-). */ bool __refrigerator(bool check_kthr_stop) { -@@ -23,17 +55,11 @@ bool __refrigerator(bool check_kthr_stop) +@@ -23,17 +55,11 @@ bool __refrigerator(bool check_kthr_stop long save; /* @@ -225,7 +217,7 @@ index 96f9667..8bf25f4 100644 current->flags |= PF_FROZEN; spin_unlock_irq(&freezer_lock); -@@ -105,18 +131,12 @@ static void fake_signal_wake_up(struct task_struct *p) +@@ -105,18 +131,12 @@ static void fake_signal_wake_up(struct t bool freeze_task(struct task_struct *p, bool sig_only) { unsigned long flags; @@ -248,7 +240,7 @@ index 96f9667..8bf25f4 100644 if (should_send_signal(p)) { fake_signal_wake_up(p); -@@ -129,10 +149,9 @@ bool freeze_task(struct task_struct *p, bool sig_only) +@@ -129,10 +149,9 @@ bool freeze_task(struct task_struct *p, } else { wake_up_state(p, TASK_INTERRUPTIBLE); } @@ -269,11 +261,9 @@ index 96f9667..8bf25f4 100644 if (frozen(p)) { wake_up_process(p); } else { -diff --git a/kernel/power/process.c b/kernel/power/process.c -index 9f6f5c7..0beb51e 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c -@@ -101,7 +101,7 @@ static int try_to_freeze_tasks(bool sig_only) +@@ -101,7 +101,7 @@ static int try_to_freeze_tasks(bool sig_ read_lock(&tasklist_lock); do_each_thread(g, p) { if (!wakeup && !freezer_should_skip(p) && @@ -324,6 +314,3 @@ index 9f6f5c7..0beb51e 100644 __thaw_task(p); } while_each_thread(g, p); read_unlock(&tasklist_lock); --- -1.7.10.1.362.g242cab3 - |