diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-04-18 11:29:04 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-04-18 11:29:04 -0300 |
commit | 69bff8d36f5ec8e9beffeb41aaede0f07418d7f4 (patch) | |
tree | 4de90b9e04682f0f147dc1319b1783d1ef3733c0 /patches/intel_ips-produces-constant-load-of-1.patch | |
parent | cc23ca504e54659c24f0663a7b9221db21bd8fb2 (diff) | |
parent | ee751891605129530527d57dc245b10efec20942 (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
Diffstat (limited to 'patches/intel_ips-produces-constant-load-of-1.patch')
-rw-r--r-- | patches/intel_ips-produces-constant-load-of-1.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/patches/intel_ips-produces-constant-load-of-1.patch b/patches/intel_ips-produces-constant-load-of-1.patch new file mode 100644 index 0000000..b259aa8 --- /dev/null +++ b/patches/intel_ips-produces-constant-load-of-1.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c +index 1294a39..85c8ad4 100644 +--- a/drivers/platform/x86/intel_ips.c ++++ b/drivers/platform/x86/intel_ips.c +@@ -1111,7 +1111,7 @@ static int ips_monitor(void *data) + last_msecs = jiffies_to_msecs(jiffies); + expire = jiffies + msecs_to_jiffies(IPS_SAMPLE_PERIOD); + +- __set_current_state(TASK_UNINTERRUPTIBLE); ++ __set_current_state(TASK_INTERRUPTIBLE); + mod_timer(&timer, expire); + schedule(); +
\ No newline at end of file |