error: ‘enable_acpi’ redeclared as different kind of symbol

Zhengyuan Liu report this error:

Building the latest 2003 LTS can trigger following compilation error:
    
            In file included from ./include/acpi/acpi_io.h:7:0,
                             from ./include/linux/acpi.h:47,
                             from ./arch/arm64/include/asm/machine_t.h:26,
                             from arch/arm64/kernel/process.c:64:
            ./arch/arm64/include/asm/acpi.h:82:20: error: ‘enable_acpi’ redeclared as different kind of symbol
             static inline void enable_acpi(void)
                                ^~~~~~~~~~~
            In file included from arch/arm64/kernel/process.c:61:0:
            ./arch/arm64/include/asm/mpam_sched.h:46:2: note: previous definition of ‘enable_acpi’ was here
              enable_acpi,
    
The redefinition was introduced by commit 7e66740ad725 
("MPAM / ACPI: Refactoring MPAM init process and set MPAM ACPI as entrance")

Hey xiexiuqi, Welcome to openEuler Community.
All of the projects in openEuler Community are maintained by @openeuler-ci-bot.
That means the developers can comment below every pull request or issue to trigger Bot Commands.
Please follow instructions at https://gitee.com/openeuler/community/blob/master/en/sig-infrastructure/command.md to find the details.

Thanks for your report.

The enum variable and function has the same name, we will fix soon.
The simplest way is to change a name.

No compilation error is reported in my environment. (gcc 7.3)
Maybe the two variables appear in the same scope due to "asm/machine_t.h".

I re-check the latest openEuler-1.0-LTS branch, it's ok.

Anyway, we'll send a fix patch soon.

Fix Patch arm64/mpam: Migrate old MSCs' discovery process to new branch :

branch	commit
openEuler-1.0-LTS	3a6c2e475890258e27d2abdb31716b9397a21b90
kernel-4.19	2e0bba630bfc4ee46ea62beb030a21b4331b63f9

commit 3a6c2e475890258e27d2abdb31716b9397a21b90
Author: Wang ShaoBo <bobo.shaobowang@huawei.com>
Date:   Mon Jan 4 15:13:04 2021 +0800

    arm64/mpam: Migrate old MSCs' discovery process to new branch


diff --git a/arch/arm64/include/asm/mpam_sched.h b/arch/arm64/include/asm/mpam_sched.h
index 350296157087..08ed349b6efa 100644
--- a/arch/arm64/include/asm/mpam_sched.h
+++ b/arch/arm64/include/asm/mpam_sched.h
@@ -40,14 +40,6 @@ static inline void mpam_sched_in(void)
                __mpam_sched_in();
 }

-enum mpam_enable_type {
-       enable_denied = 0,
-       enable_default,
-       enable_acpi,
-};
-
-extern enum mpam_enable_type __read_mostly mpam_enabled;
-
 #else

this patch has been merged into branch openEuler-1.0-LTS and kernel-4.19

Thanks
---- CHENG Jian

GVP openEuler / kernel

内容风险标识

评论 (3)

GVPopenEuler / kernel

内容风险标识