diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-21 16:10:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-21 16:10:42 +1100 |
| commit | 846bb7788aced3ff6bfb5f674899ee5bc783e98e (patch) | |
| tree | a19c658572beb8963dabe962f626265845b5d6b2 /include/linux/pm.h | |
| parent | 8cc156311126614ff6a59560e4eb20731156f799 (diff) | |
| parent | da691fd2697453e910a4bd0c8daaa80da48a0935 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 8049f9868cd9..a224c7f5c377 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -550,6 +550,7 @@ struct dev_pm_info { unsigned int irq_safe:1; unsigned int use_autosuspend:1; unsigned int timer_autosuspends:1; + unsigned int memalloc_noio:1; enum rpm_request request; enum rpm_status runtime_status; int runtime_error; |