diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-18 22:59:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-18 22:59:07 -0700 |
| commit | 8fd0976702f05042c776848819e5fd2a835f23c9 (patch) | |
| tree | 8a87b0e33bf39adcc53b3ee4be61155dab86417b /mm/swap_state.c | |
| parent | 58935f24a996cb55595c29dd5303bd9b778c8b00 (diff) | |
| parent | 8f50b8e57442d28e41bb736c173d8a2490549a82 (diff) | |
Merge tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux into fixes
OMAP-GPMC: Fixes for for v4.7-rc cycle:
- Fix omap gpmc EXTRADELAY timing. The DT provided timings
were wrongly used causing devices requiring extra delay timing
to fail.
* tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux:
memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
+ Linux 4.7-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'mm/swap_state.c')
| -rw-r--r-- | mm/swap_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 0d457e7db8d6..c99463ac02fb 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -252,7 +252,10 @@ static inline void free_swap_cache(struct page *page) void free_page_and_swap_cache(struct page *page) { free_swap_cache(page); - put_page(page); + if (is_huge_zero_page(page)) + put_huge_zero_page(); + else + put_page(page); } /* |