diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:04:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:04:39 +0100 |
| commit | b472b8e22f9f9bc88dc73017d61609684289fb13 (patch) | |
| tree | cbb2ec0c2fd2cf6d9f4d2e323e97aa757bd93c59 /arch/alpha/kernel/process.c | |
| parent | USB: isp1760-if: Change to use irq_of_parse_and_map (diff) | |
| parent | Linux 3.7-rc3 (diff) | |
| download | linux-b472b8e22f9f9bc88dc73017d61609684289fb13.tar.xz linux-b472b8e22f9f9bc88dc73017d61609684289fb13.zip | |
Merge 3.7-rc3 into usb-next.
This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
drivers/usb/misc/ezusb.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/alpha/kernel/process.c')
| -rw-r--r-- | arch/alpha/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 4054e0ffe2b2..51987dcf79b8 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -49,7 +49,7 @@ EXPORT_SYMBOL(pm_power_off); void cpu_idle(void) { - set_thread_flag(TIF_POLLING_NRFLAG); + current_thread_info()->status |= TS_POLLING; while (1) { /* FIXME -- EV6 and LCA45 know how to power down |