diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:42 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:42 +0800 |
| commit | 91dc5646819e7fd4a60f5c6dd45030478dadf77b (patch) | |
| tree | 8f080fa65a846a9b772b5bb362e95ce8a7c276ec /include/linux | |
| parent | 42f45c9abdea541a9f966553b5e71dd576d432f9 (diff) | |
| parent | 88720d8b842c59efcc0c4dc17e2107f4dae502f5 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlinux-linaro-lsk-android
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 |