2008-11-19 22:03:36

by Richard Holden

Subject: [PATCH] Fix arch/x86/kernel/genx2apic_uv_x.c build warning when !CONFIG_HOTPLUG_CPU

Fix
arch/x86/kernel/genx2apic_uv_x.c:403: warning: 'uv_heartbeat_disable' defined but not used

the function is only used when CONFIG_HOTPLUG_CPU is defined.

Signed-off-by: Richard A. Holden III <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/genx2apic_uv_x.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index fb80b17..3076bc6 100644
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -399,6 +399,7 @@ static void __cpuinit uv_heartbeat_enable(int cpu)
uv_heartbeat_enable(0);
}

+#ifdef CONFIG_HOTPLUG_CPU
static void __cpuinit uv_heartbeat_disable(int cpu)
{
if (uv_cpu_hub_info(cpu)->scir.enabled) {
@@ -408,7 +409,6 @@ static void __cpuinit uv_heartbeat_disable(int cpu)
uv_set_cpu_scir_bits(cpu, 0xff);
}

-#ifdef CONFIG_HOTPLUG_CPU
/*
* cpu hotplug notifier
*/
--
1.5.6.4

2008-11-19 22:03:50

by Richard Holden

Subject: [PATCH] Fix arch/x86/kernel/setup.c build warning when !CONFIG_X86_RESERVE_LOW_64K

Fix
arch/x86/kernel/setup.c:592: warning: 'dmi_low_memory_corruption' defined but not used

this is only used if CONFIG_X86_RESERVE_LOW_64K is defined.

Signed-off-by: Richard A. Holden III <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/setup.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 598435b..e417308 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -588,6 +588,7 @@ static struct x86_quirks default_x86_quirks __initdata;

struct x86_quirks *x86_quirks __initdata = &default_x86_quirks;

+#ifdef CONFIG_X86_RESERVE_LOW_64K
static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
{
printk(KERN_NOTICE
@@ -599,6 +600,7 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)

return 0;
}
+#endif

/* List of systems that have known low memory corruption BIOS problems */
static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
--
1.5.6.4

2008-11-20 08:03:39

by Ingo Molnar

Subject: Re: [PATCH] Fix arch/x86/kernel/genx2apic_uv_x.c build warning when !CONFIG_HOTPLUG_CPU

* Richard A. Holden III <[email protected]> wrote:

> Fix
> arch/x86/kernel/genx2apic_uv_x.c:403: warning: 'uv_heartbeat_disable' defined but not used
>
> the function is only used when CONFIG_HOTPLUG_CPU is defined.

applied to tip/x86/uv, thanks Richard!

Ingo

2008-11-20 08:05:30

by Ingo Molnar

Subject: Re: [PATCH] Fix arch/x86/kernel/setup.c build warning when !CONFIG_X86_RESERVE_LOW_64K

* Richard A. Holden III <[email protected]> wrote:

> Fix
> arch/x86/kernel/setup.c:592: warning: 'dmi_low_memory_corruption' defined but not used
>
> this is only used if CONFIG_X86_RESERVE_LOW_64K is defined.
>
> Signed-off-by: Richard A. Holden III <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
> ---
> arch/x86/kernel/setup.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)

applied to tip/x86/memory-corruption-check, thanks Richard!

Ingo