diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-10-09 18:30:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 22:26:03 -0400 |
commit | 21f456607a7acc73947580a84eb36d180d2562b7 (patch) | |
tree | 1b46f8abb2a6b1b1967a43395b254fff450fb3d5 /arch/frv | |
parent | f203c3b33f0891da98ae3dcf829851c48473ed60 (diff) |
frv: remove unused cpuinfo_frv and friends to fix future build error
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>
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/include/asm/processor.h | 16 | ||||
-rw-r--r-- | arch/frv/kernel/setup.c | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h index 6554e78893f2..ae8d423e79d9 100644 --- a/arch/frv/include/asm/processor.h +++ b/arch/frv/include/asm/processor.h | |||
@@ -35,22 +35,6 @@ | |||
35 | struct task_struct; | 35 | struct task_struct; |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * CPU type and hardware bug flags. Kept separately for each CPU. | ||
39 | */ | ||
40 | struct cpuinfo_frv { | ||
41 | #ifdef CONFIG_MMU | ||
42 | unsigned long *pgd_quick; | ||
43 | unsigned long *pte_quick; | ||
44 | unsigned long pgtable_cache_sz; | ||
45 | #endif | ||
46 | } __cacheline_aligned; | ||
47 | |||
48 | extern struct cpuinfo_frv __nongprelbss boot_cpu_data; | ||
49 | |||
50 | #define cpu_data (&boot_cpu_data) | ||
51 | #define current_cpu_data boot_cpu_data | ||
52 | |||
53 | /* | ||
54 | * Bus types | 38 | * Bus types |
55 | */ | 39 | */ |
56 | #define EISA_bus 0 | 40 | #define EISA_bus 0 |
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 9f3a7a62d787..9f4a9a607dbe 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c | |||
@@ -104,8 +104,6 @@ unsigned long __nongprelbss dma_coherent_mem_end; | |||
104 | unsigned long __initdata __sdram_old_base; | 104 | unsigned long __initdata __sdram_old_base; |
105 | unsigned long __initdata num_mappedpages; | 105 | unsigned long __initdata num_mappedpages; |
106 | 106 | ||
107 | struct cpuinfo_frv __nongprelbss boot_cpu_data; | ||
108 | |||
109 | char __initdata command_line[COMMAND_LINE_SIZE]; | 107 | char __initdata command_line[COMMAND_LINE_SIZE]; |
110 | char __initdata redboot_command_line[COMMAND_LINE_SIZE]; | 108 | char __initdata redboot_command_line[COMMAND_LINE_SIZE]; |
111 | 109 | ||