Applied. Thanks!
Alex
On Thu, Sep 9, 2021 at 2:07 PM Lyude Paul <lyude@xxxxxxxxxx> wrote:
>
> Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
>
> On Thu, 2021-09-09 at 18:56 +0200, Michel Dänzer wrote:
> > From: Michel Dänzer <mdaenzer@xxxxxxxxxx>
> >
> > This was unusual; normally, inline functions are declared static as
> > well, and defined in a header file if used by multiple compilation
> > units. The latter would be more involved in this case, so just drop
> > the inline declaration for now.
> >
> > Fixes compile failure building for ppc64le on RHEL 8:
> >
> > In file included from ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h:32,
> > from ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:33:
> > ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c: In function
> > ‘amdgpu_ras_recovery_init’:
> > ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h:90:17: error: inlining
> > failed in call
> > to ‘always_inline’ ‘amdgpu_ras_eeprom_max_record_count’: function body not
> > available
> > 90 | inline uint32_t amdgpu_ras_eeprom_max_record_count(void);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1985:34: note: called from here
> > 1985 | max_eeprom_records_len =
> > amdgpu_ras_eeprom_max_record_count();
> > |
> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > # The function is called amdgpu_ras_eeprom_get_record_max_length on
> > # stable branches
> > Fixes: c84d46707ebb "drm/amdgpu: validate bad page threshold in ras(v3)"
> > Signed-off-by: Michel Dänzer <mdaenzer@xxxxxxxxxx>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
> > index 194590252bb9..210f30867870 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
> > @@ -756,7 +756,7 @@ int amdgpu_ras_eeprom_read(struct
> > amdgpu_ras_eeprom_control *control,
> > return res;
> > }
> >
> > -inline uint32_t amdgpu_ras_eeprom_max_record_count(void)
> > +uint32_t amdgpu_ras_eeprom_max_record_count(void)
> > {
> > return RAS_MAX_RECORD_COUNT;
> > }
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
> > index f95fc61b3021..6bb00578bfbb 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
> > @@ -120,7 +120,7 @@ int amdgpu_ras_eeprom_read(struct
> > amdgpu_ras_eeprom_control *control,
> > int amdgpu_ras_eeprom_append(struct amdgpu_ras_eeprom_control *control,
> > struct eeprom_table_record *records, const u32
> > num);
> >
> > -inline uint32_t amdgpu_ras_eeprom_max_record_count(void);
> > +uint32_t amdgpu_ras_eeprom_max_record_count(void);
> >
> > void amdgpu_ras_debugfs_set_ret_size(struct amdgpu_ras_eeprom_control
> > *control);
> >
>
> --
> Cheers,
> Lyude Paul (she/her)
> Software Engineer at Red Hat
>
