Skip to contentSkip to conversation

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

DISCUSSION Stephen Rothwell 2 participants 2 messages Sep 11, 2024 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the tip tree, today's linux-next build (arm64 defconfig) failed like this:

drivers/cpufreq/cppc_cpufreq.c: In function 'cppc_freq_invariance_init':
drivers/cpufreq/cppc_cpufreq.c:227:35: error: 'NSER_PER_MSEC' undeclared (first use in this function); did you mean 'NSEC_PER_MSEC'?

  227 |                 .sched_runtime  = NSER_PER_MSEC,
      |                                   ^~~~~~~~~~~~~
      |                                   NSEC_PER_MSEC
drivers/cpufreq/cppc_cpufreq.c:227:35: note: each undeclared identifier is reported only once for each function it appears in
drivers/cpufreq/cppc_cpufreq.c:229:17: error: request for member 'sched_period' in something not a structure or union
  229 |                 .sched_period   = 10 * NSEC_PER_MSEC,
      |                 ^

Caused by commit

b3a47ff09554 ("cpufreq/cppc: Use NSEC_PER_MSEC for deadline task")

I have reverted that commit for today.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 15 lines · Stephen Rothwell

Hi all,

After merging the tip tree, today's linux-next build (arm64 defconfig) failed like this:

drivers/cpufreq/cppc_cpufreq.c: In function 'cppc_freq_invariance_init':
drivers/cpufreq/cppc_cpufreq.c:227:35: error: 'NSER_PER_MSEC' undeclared (first use in this function); did you mean 'NSEC_PER_MSEC'?

  227 |                 .sched_runtime  = NSER_PER_MSEC,
      |                                   ^~~~~~~~~~~~~
      |                                   NSEC_PER_MSEC
drivers/cpufreq/cppc_cpufreq.c:227:35: note: each undeclared identifier is reported only once for each function it appears in
drivers/cpufreq/cppc_cpufreq.c:229:17: error: request for member 'sched_period' in something not a structure or union
  229 |                 .sched_period   = 10 * NSEC_PER_MSEC,
      |                 ^
Quoted 5 lines

Caused by commit

b3a47ff09554 ("cpufreq/cppc: Use NSEC_PER_MSEC for deadline task")

I have reverted that commit for today.

Thanks, I've rebased tip/sched/core and fixed it up. Sorry for the fail.