linux-next: build failure after merge of the pm tree

[Stephen Rothwell]

Hi all,

After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/idle/intel_idle.c: In function 'adl_idle_state_table_update':
drivers/idle/intel_idle.c:1701:17: error: 'disable_promotion_to_c1e' undeclared (first use in this function)
 1701 |                 disable_promotion_to_c1e = true;
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/idle/intel_idle.c:1701:17: note: each undeclared identifier is reported only once for each function it appears in
drivers/idle/intel_idle.c:1706:9: error: implicit declaration of function 'c1e_promotion_enable' [-Werror=implicit-function-declaration]
 1706 |         c1e_promotion_enable();
      |         ^~~~~~~~~~~~~~~~~~~~
drivers/idle/intel_idle.c: At top level:
drivers/idle/intel_idle.c:1854:13: error: conflicting types for 'c1e_promotion_enable'; have 'void(void)' [-Werror]
 1854 | static void c1e_promotion_enable(void)
      |             ^~~~~~~~~~~~~~~~~~~~
drivers/idle/intel_idle.c:1854:13: error: static declaration of 'c1e_promotion_enable' follows non-static declaration
drivers/idle/intel_idle.c:1706:9: note: previous implicit declaration of 'c1e_promotion_enable' with type 'void(void)'
 1706 |         c1e_promotion_enable();
      |         ^~~~~~~~~~~~~~~~~~~~

Caused by commit

  39c184a6a9a7 ("intel_idle: Fix the 'preferred_cstates' module parameter")

interacting with commit

  cc6e234b8264 ("intel_idle: Add AlderLake support")

Presumably this should have been fixed up in commit

  55ecda6f25ef ("Merge branch 'intel-idle' into linux-next")

I have used the pm tree from next-20220427 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpzooOaCMxFR.pgp
Description: OpenPGP digital signature