frv: remove unused cpuinfo_frv and friends to fix future build error (21f45660) · Commits · 戴 / test

Frv has a macro named cpu_data, interfering with variables and struct members with the same name: include/linux/pm_domain.h:75:24: error: expected identifier or '(' before '&' token struct gpd_cpu_data *cpu_data; As struct cpuinfo_frv, boot_cpu_data, cpu_data, and current_cpu_data are not used, removed them to fix this. Signed-off-by:

Geert Uytterhoeven <geert+renesas@glider.be> Reported-by:

kbuild test robot <fengguang.wu@intel.com> Cc: David Howells <dhowells@redhat.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/frv/include/asm/processor.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -34,22 +34,6 @@
		/* Forward declaration, a strange C thing */
		struct task_struct;

		/*
		* CPU type and hardware bug flags. Kept separately for each CPU.
		*/
		struct cpuinfo_frv {
		#ifdef CONFIG_MMU
		unsigned long *pgd_quick;
		unsigned long *pte_quick;
		unsigned long pgtable_cache_sz;
		#endif
		} __cacheline_aligned;

		extern struct cpuinfo_frv __nongprelbss boot_cpu_data;

		#define cpu_data (&boot_cpu_data)
		#define current_cpu_data boot_cpu_data

		/*
		* Bus types
		*/

arch/frv/kernel/setup.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -104,8 +104,6 @@ unsigned long __nongprelbss dma_coherent_mem_end;
		unsigned long __initdata __sdram_old_base;
		unsigned long __initdata num_mappedpages;

		struct cpuinfo_frv __nongprelbss boot_cpu_data;

		char __initdata command_line[COMMAND_LINE_SIZE];
		char __initdata redboot_command_line[COMMAND_LINE_SIZE];

Admin message