David Howells cd888e8a12 UAPI: ndctl: Fix g++-unsupported initialisation in headers ... [ Upstream commit 9607871f37 ] The following code in the linux/ndctl header file: static inline const char *nvdimm_bus_cmd_name(unsigned cmd) { static const char * const names[] = { [ND_CMD_ARS_CAP] = "ars_cap", [ND_CMD_ARS_START] = "ars_start", [ND_CMD_ARS_STATUS] = "ars_status", [ND_CMD_CLEAR_ERROR] = "clear_error", [ND_CMD_CALL] = "cmd_call", }; if (cmd < ARRAY_SIZE(names) && names[cmd]) return names[cmd]; return "unknown"; } is broken in a number of ways: (1) ARRAY_SIZE() is not generally defined. (2) g++ does not support "non-trivial" array initialisers fully yet. (3) Every file that calls this function will acquire a copy of names[]. The same goes for nvdimm_cmd_name(). Fix all three by converting to a switch statement where each case returns a string. That way if cmd is a constant, the compiler can trivially reduce it and, if not, the compiler can use a shared lookup table if it thinks that is more efficient. A better way would be to remove these functions and their arrays from the header entirely. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2018-11-13 11:08:32 -08:00
..
acpi	ACPICA: Update version to 20180810	2018-08-14 23:49:13 +02:00
asm-generic	vmlinux.lds.h: Fix linker warnings about orphan .LPBX sections	2018-10-12 08:55:29 +11:00
clocksource
crypto
drm	drm: Get ref on CRTC commit object when waiting for flip_done	2018-10-18 14:23:13 -04:00
dt-bindings	ARM: SoC: late updates	2018-08-25 14:12:36 -07:00
keys
kvm	KVM: arm/arm64: vgic-v3: Add core support for Group0 SGIs	2018-08-12 12:06:34 +01:00
linux	signal: Introduce COMPAT_SIGMINSTKSZ for use in compat_sys_sigaltstack	2018-11-13 11:08:25 -08:00
math-emu
media	media: v4l: event: Prevent freeing event subscriptions while accessed	2018-10-03 06:32:51 -04:00
memory
misc
net	Revert "net: simplify sock_poll_wait"	2018-11-04 14:50:51 +01:00
pcmcia	pcmcia: remove long deprecated pcmcia_request_exclusive_irq() function	2018-08-18 12:30:42 -07:00
ras
rdma	Second merge window update	2018-08-23 15:34:48 -07:00
scsi	SCSI misc on 20180815	2018-08-15 22:06:26 -07:00
soc	soc: fsl: qbman: add APIs to retrieve the probing status	2018-09-27 15:43:35 -05:00
sound	ASoC: Fixes for v4.19	2018-09-17 18:59:21 +02:00
target
trace	RxRPC fixes	2018-10-10 22:27:38 -07:00
uapi	UAPI: ndctl: Fix g++-unsupported initialisation in headers	2018-11-13 11:08:32 -08:00
video	fbdev changes for v4.19:	2018-08-23 15:44:58 -07:00
xen	xen/balloon: add runtime control for scrubbing ballooned out pages	2018-09-14 08:51:10 -04:00