Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c457ff8 authored by Fabio Estevam's avatar Fabio Estevam Committed by Matt Wagantall
Browse files

arm64: Provide a namespace to NCAPS 



Building arm64.allmodconfig leads to the following warning:

usb/gadget/function/f_ncm.c:203:0: warning: "NCAPS" redefined
 #define NCAPS (USB_CDC_NCM_NCAP_ETH_FILTER | USB_CDC_NCM_NCAP_CRC_MODE)
 ^
In file included from /home/build/work/batch/arch/arm64/include/asm/io.h:32:0,
                 from /home/build/work/batch/include/linux/clocksource.h:19,
                 from /home/build/work/batch/include/clocksource/arm_arch_timer.h:19,
                 from /home/build/work/batch/arch/arm64/include/asm/arch_timer.h:27,
                 from /home/build/work/batch/arch/arm64/include/asm/timex.h:19,
                 from /home/build/work/batch/include/linux/timex.h:65,
                 from /home/build/work/batch/include/linux/sched.h:19,
                 from /home/build/work/batch/arch/arm64/include/asm/compat.h:25,
                 from /home/build/work/batch/arch/arm64/include/asm/stat.h:23,
                 from /home/build/work/batch/include/linux/stat.h:5,
                 from /home/build/work/batch/include/linux/module.h:10,
                 from /home/build/work/batch/drivers/usb/gadget/function/f_ncm.c:19:
arch/arm64/include/asm/cpufeature.h:27:0: note: this is the location of the previous definition
 #define NCAPS     2

So add a ARM64 prefix to avoid such problem.

Change-Id: I7696eef09a200425958005ef818c8edc6142ca77
Reported-by: default avatarOlof's autobuilder <build@lixom.net>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Git-commit: 06f9eb884be81431d54d7d37390043e3b5b7f14a
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[mattw@codeaurora.org: trivial resolution: update ARM64_NCAPS value]
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 8b3145ac

arch/arm64/include/asm/cpufeature.h

+5 −5
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE	1

#define ARM64_WORKAROUND_845719			2



#define NCAPS					3

#define ARM64_NCAPS				3



#ifndef __ASSEMBLY__



extern DECLARE_BITMAP(cpu_hwcaps, NCAPS);

extern DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS);



static inline bool cpu_have_feature(unsigned int num)

{
@@ -41,16 +41,16 @@ bool system_supports_mixed_endian_el0(void); 


static inline bool cpus_have_cap(unsigned int num)

{

	if (num >= NCAPS)

	if (num >= ARM64_NCAPS)

		return false;

	return test_bit(num, cpu_hwcaps);

}



static inline void cpus_set_cap(unsigned int num)

{

	if (num >= NCAPS)

	if (num >= ARM64_NCAPS)

		pr_warn("Attempt to set an illegal CPU capability (%d >= %d)\n",

			num, NCAPS);

			num, ARM64_NCAPS);

	else

		__set_bit(num, cpu_hwcaps);

}

arch/arm64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ unsigned int compat_elf_hwcap __read_mostly = COMPAT_ELF_HWCAP_DEFAULT; 
unsigned int compat_elf_hwcap2 __read_mostly;

#endif



DECLARE_BITMAP(cpu_hwcaps, NCAPS);

DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS);



unsigned int boot_reason;

EXPORT_SYMBOL(boot_reason);