| Message ID | 20240905184848.318978-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | c3565a35d97102fbea69e324086d5e33ee2ab34e |
| Headers | show |
| Series | [v1,1/1] PM: hibernate: Remove unused stub for saveable_highmem_page() | expand |
On Thu, Sep 5, 2024 at 8:48 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > When saveable_highmem_page() is unused, it prevents kernel builds > with clang, `make W=1` and CONFIG_WERROR=y: > > kernel/power/snapshot.c:1369:21: error: unused function 'saveable_highmem_page' [-Werror,-Wunused-function] > 1369 | static inline void *saveable_highmem_page(struct zone *z, unsigned long p) > | ^~~~~~~~~~~~~~~~~~~~~ > > Fix this by removing unused stub. > > See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static > inline functions for W=1 build"). > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > kernel/power/snapshot.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c > index 405eddbda4fc..30894d8f0a78 100644 > --- a/kernel/power/snapshot.c > +++ b/kernel/power/snapshot.c > @@ -1365,11 +1365,6 @@ static unsigned int count_highmem_pages(void) > } > return n; > } > -#else > -static inline void *saveable_highmem_page(struct zone *z, unsigned long p) > -{ > - return NULL; > -} > #endif /* CONFIG_HIGHMEM */ > > /** > -- Applied as 6.12 material, thanks!
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 405eddbda4fc..30894d8f0a78 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1365,11 +1365,6 @@ static unsigned int count_highmem_pages(void) } return n; } -#else -static inline void *saveable_highmem_page(struct zone *z, unsigned long p) -{ - return NULL; -} #endif /* CONFIG_HIGHMEM */ /**
When saveable_highmem_page() is unused, it prevents kernel builds with clang, `make W=1` and CONFIG_WERROR=y: kernel/power/snapshot.c:1369:21: error: unused function 'saveable_highmem_page' [-Werror,-Wunused-function] 1369 | static inline void *saveable_highmem_page(struct zone *z, unsigned long p) | ^~~~~~~~~~~~~~~~~~~~~ Fix this by removing unused stub. See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build"). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- kernel/power/snapshot.c | 5 ----- 1 file changed, 5 deletions(-)