diff options
-rw-r--r-- | arch/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/irqinit_32.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/vmlinux_64.lds.S | 1 | ||||
-rw-r--r-- | arch/x86/mm/init_32.c | 3 | ||||
-rw-r--r-- | include/linux/init.h | 1 | ||||
-rw-r--r-- | include/linux/kernel_stat.h | 2 |
7 files changed, 2 insertions, 8 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 071004d3a1b1..0267babe5eb9 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -102,3 +102,4 @@ config HAVE_CLK | |||
102 | help | 102 | help |
103 | The <linux/clk.h> calls support software clock gating and | 103 | The <linux/clk.h> calls support software clock gating and |
104 | thus are a key power management tool on many systems. | 104 | thus are a key power management tool on many systems. |
105 | |||
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 5fef4fece4a5..0d1c26a583c5 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -1254,7 +1254,6 @@ static int __init acpi_parse_madt_ioapic_entries(void) | |||
1254 | return count; | 1254 | return count; |
1255 | } | 1255 | } |
1256 | 1256 | ||
1257 | |||
1258 | count = | 1257 | count = |
1259 | acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr, | 1258 | acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr, |
1260 | nr_irqs); | 1259 | nr_irqs); |
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index a8d35998d308..845aa9803e80 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -184,4 +184,3 @@ void __init native_init_IRQ(void) | |||
184 | 184 | ||
185 | irq_ctx_init(smp_processor_id()); | 185 | irq_ctx_init(smp_processor_id()); |
186 | } | 186 | } |
187 | |||
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S index 3245ad72594a..46e05447405b 100644 --- a/arch/x86/kernel/vmlinux_64.lds.S +++ b/arch/x86/kernel/vmlinux_64.lds.S | |||
@@ -173,7 +173,6 @@ SECTIONS | |||
173 | *(.x86_cpu_dev.init) | 173 | *(.x86_cpu_dev.init) |
174 | } | 174 | } |
175 | __x86_cpu_dev_end = .; | 175 | __x86_cpu_dev_end = .; |
176 | |||
177 | SECURITY_INIT | 176 | SECURITY_INIT |
178 | 177 | ||
179 | . = ALIGN(8); | 178 | . = ALIGN(8); |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 91343c2694b4..8396868e82c5 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -66,7 +66,6 @@ static unsigned long __meminitdata table_end; | |||
66 | static unsigned long __meminitdata table_top; | 66 | static unsigned long __meminitdata table_top; |
67 | 67 | ||
68 | static int __initdata after_init_bootmem; | 68 | static int __initdata after_init_bootmem; |
69 | int after_bootmem; | ||
70 | 69 | ||
71 | static __init void *alloc_low_page(unsigned long *phys) | 70 | static __init void *alloc_low_page(unsigned long *phys) |
72 | { | 71 | { |
@@ -989,8 +988,6 @@ void __init mem_init(void) | |||
989 | 988 | ||
990 | set_highmem_pages_init(); | 989 | set_highmem_pages_init(); |
991 | 990 | ||
992 | after_bootmem = 1; | ||
993 | |||
994 | codesize = (unsigned long) &_etext - (unsigned long) &_text; | 991 | codesize = (unsigned long) &_etext - (unsigned long) &_text; |
995 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; | 992 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; |
996 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | 993 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; |
diff --git a/include/linux/init.h b/include/linux/init.h index 70ad53e1eab8..93538b696e3d 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -246,7 +246,6 @@ struct obs_kernel_param { | |||
246 | 246 | ||
247 | /* Relies on boot_command_line being set */ | 247 | /* Relies on boot_command_line being set */ |
248 | void __init parse_early_param(void); | 248 | void __init parse_early_param(void); |
249 | |||
250 | #endif /* __ASSEMBLY__ */ | 249 | #endif /* __ASSEMBLY__ */ |
251 | 250 | ||
252 | /** | 251 | /** |
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index a9d0d360b776..89b6ecd41473 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
@@ -28,7 +28,7 @@ struct cpu_usage_stat { | |||
28 | 28 | ||
29 | struct kernel_stat { | 29 | struct kernel_stat { |
30 | struct cpu_usage_stat cpustat; | 30 | struct cpu_usage_stat cpustat; |
31 | unsigned int irqs[NR_IRQS]; | 31 | unsigned int irqs[NR_IRQS]; |
32 | }; | 32 | }; |
33 | 33 | ||
34 | DECLARE_PER_CPU(struct kernel_stat, kstat); | 34 | DECLARE_PER_CPU(struct kernel_stat, kstat); |