Merge misc fixes from Andrew Morton: "15 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: lib/stackdepot: export save/fetch stack for drivers mm: kmemleak: scan .data.ro_after_init memcg: prevent memcg caches to be both OFF_SLAB & OBJFREELIST_SLAB coredump: fix unfreezable coredumping task mm/filemap: don't allow partially uptodate page for pipes mm/hugetlb: fix huge page reservation leak in private mapping error paths ocfs2: fix not enough credit panic Revert "console: don't prefer first registered if DT specifies stdout-path" mm: hwpoison: fix thp split handling in memory_failure() swapfile: fix memory corruption via malformed swapfile mm/cma.c: check the max limit for cma allocation scripts/bloat-o-meter: fix SIGPIPE shmem: fix pageflags after swapping DMA32 object mm, frontswap: make sure allocated frontswap map is assigned mm: remove extra newline from allocation stall warning
Showing the changes to include/linux (2 of 19 files). Show all
Unified · Split
| @@ -173,12 +173,6 @@ static inline void console_sysfs_notify(void) · 172 unmodified lines | ||
| 173 | 173 | #endif |
| 174 | 174 | extern bool console_suspend_enabled; |
| 175 | 175 | |
| 176 | −#ifdef CONFIG_OF | |
| 177 | −extern void console_set_by_of(void); | |
| 178 | −#else | |
| 179 | −static inline void console_set_by_of(void) {} | |
| 180 | −#endif | |
| 181 | − | |
| 182 | 176 | /* Suspend and resume console messages over PM events */ |
| 183 | 177 | extern void suspend_console(void); |
| 184 | 178 | extern void resume_console(void); |
| @@ -106,8 +106,9 @@ static inline void frontswap_invalidate_area(unsigned type) · 105 unmodified lines | ||
| 106 | 106 | |
| 107 | 107 | static inline void frontswap_init(unsigned type, unsigned long *map) |
| 108 | 108 | { |
| 109 | − if (frontswap_enabled()) | |
| 110 | − __frontswap_init(type, map); | |
| 109 | +#ifdef CONFIG_FRONTSWAP | |
| 110 | + __frontswap_init(type, map); | |
| 111 | +#endif | |
| 111 | 112 | } |
| 112 | 113 | |
| 113 | 114 | #endif /* _LINUX_FRONTSWAP_H */ |