diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:40 +0800 |
| commit | 88720d8b842c59efcc0c4dc17e2107f4dae502f5 (patch) | |
| tree | 967e60ace88cd9e4f9819042eedf3be6a445bb54 /include/linux | |
| parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) | |
| parent | 73895725a9401bd3454757fcfa7d691270ac7498 (diff) | |
Merge tag 'v3.10.73' into linux-linaro-lsk
This is the 3.10.73 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/workqueue.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index ef4df5b86e85..ac14ecec2705 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -71,7 +71,8 @@ enum { /* data contains off-queue information when !WORK_STRUCT_PWQ */ WORK_OFFQ_FLAG_BASE = WORK_STRUCT_COLOR_SHIFT, - WORK_OFFQ_CANCELING = (1 << WORK_OFFQ_FLAG_BASE), + __WORK_OFFQ_CANCELING = WORK_OFFQ_FLAG_BASE, + WORK_OFFQ_CANCELING = (1 << __WORK_OFFQ_CANCELING), /* * When a work item is off queue, its high bits point to the last |