diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-02 14:59:52 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-02 15:23:39 +0900 |
| commit | ed29668d1aa2c6f01e61dd616df13b5241cee7e0 (patch) | |
| tree | a086cf6311ed8623b292d3ea8d73c03f53207be0 /include/linux | |
| parent | 65c959a39b7e9ad6b443b74904486b4a75b0232f (diff) | |
| parent | 3a99df9a3d14cd866b5516f8cba515a3bfd554ab (diff) | |
| download | linux-stable-ed29668d1aa2c6f01e61dd616df13b5241cee7e0.tar.gz linux-stable-ed29668d1aa2c6f01e61dd616df13b5241cee7e0.tar.bz2 linux-stable-ed29668d1aa2c6f01e61dd616df13b5241cee7e0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Smooth Cong Wang's bug fix into 'net-next'. Basically put
the bulk of the tcf_block_put() logic from 'net' into
tcf_block_put_ext(), but after the offload unbind.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm_qos.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 6737a8c9e8c6..032b55909145 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -27,17 +27,16 @@ enum pm_qos_flags_status { PM_QOS_FLAGS_ALL, }; -#define PM_QOS_DEFAULT_VALUE (-1) -#define PM_QOS_LATENCY_ANY S32_MAX +#define PM_QOS_DEFAULT_VALUE -1 #define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC) #define PM_QOS_NETWORK_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC) #define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE 0 #define PM_QOS_MEMORY_BANDWIDTH_DEFAULT_VALUE 0 #define PM_QOS_RESUME_LATENCY_DEFAULT_VALUE 0 -#define PM_QOS_RESUME_LATENCY_NO_CONSTRAINT PM_QOS_LATENCY_ANY #define PM_QOS_LATENCY_TOLERANCE_DEFAULT_VALUE 0 #define PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT (-1) +#define PM_QOS_LATENCY_ANY ((s32)(~(__u32)0 >> 1)) #define PM_QOS_FLAG_NO_POWER_OFF (1 << 0) #define PM_QOS_FLAG_REMOTE_WAKEUP (1 << 1) |