diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-21 13:40:45 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-21 13:40:45 -0700 |
| commit | b8fa4a3ee5972568ce10d8b23cc314b773381002 (patch) | |
| tree | 5eaf89932e71fd9f61fbb4341ce8a35b480986ec /include/linux | |
| parent | b2faab1e4d852d9088893a4d88f8fe3d069f38ee (diff) | |
| parent | 4ad454918b1a7e4cccb373d3b1034052c49f6105 (diff) | |
Merge tag 'v4.4.26' into android-4.4.y
This is the 4.4.26 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/88pm80x.h | 4 | ||||
| -rw-r--r-- | include/linux/mm.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h index d409ceb2231e..c118a7ec94d6 100644 --- a/include/linux/mfd/88pm80x.h +++ b/include/linux/mfd/88pm80x.h @@ -350,7 +350,7 @@ static inline int pm80x_dev_suspend(struct device *dev) int irq = platform_get_irq(pdev, 0); if (device_may_wakeup(dev)) - set_bit((1 << irq), &chip->wu_flag); + set_bit(irq, &chip->wu_flag); return 0; } @@ -362,7 +362,7 @@ static inline int pm80x_dev_resume(struct device *dev) int irq = platform_get_irq(pdev, 0); if (device_may_wakeup(dev)) - clear_bit((1 << irq), &chip->wu_flag); + clear_bit(irq, &chip->wu_flag); return 0; } diff --git a/include/linux/mm.h b/include/linux/mm.h index b009ab1a69a0..f8a729751faa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2124,6 +2124,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma, #define FOLL_MIGRATION 0x400 /* wait for page to replace migration entry */ #define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */ #define FOLL_MLOCK 0x1000 /* lock present pages */ +#define FOLL_COW 0x4000 /* internal GUP flag */ typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, void *data); |