2011-03-22 09:24:57

by Rakib Mullick

Subject: [PATCH] x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context.

When CONFIG_X86_MPPARSE=y and CONFIG_X86_IO_APIC=n, then we get the
following warning:

arch/x86/kernel/mpparse.c:723: warning: ?check_slot? defined but not used

So, put check_slot into CONFIG_X86_IO_APIC context. Its only called
from CONFIG_X86_IO_APIC=y context.

Signed-off-by: Rakib Mullick <[email protected]>
---

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 6f789a8..5a532ce 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -714,10 +714,6 @@ static void __init check_irq_src(struct
mpc_intsrc *m, int *nr_m_spare)
*nr_m_spare += 1;
}
}
-#else /* CONFIG_X86_IO_APIC */
-static
-inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
-#endif /* CONFIG_X86_IO_APIC */

static int
check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
@@ -731,6 +727,10 @@ check_slot(unsigned long mpc_new_phys, unsigned
long mpc_new_length, int count)

return ret;
}
+#else /* CONFIG_X86_IO_APIC */
+static
+inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
+#endif /* CONFIG_X86_IO_APIC */

static int __init replace_intsrc_all(struct mpc_table *mpc,
unsigned long mpc_new_phys,

2011-03-22 15:37:29

by Rakib Mullick

Subject: [tip:x86/urgent] x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context

Commit-ID: cbb84c4cc1ad0ab8faaffd899ccc9b14a88c91be
Gitweb: http://git.kernel.org/tip/cbb84c4cc1ad0ab8faaffd899ccc9b14a88c91be
Author: Rakib Mullick <[email protected]>
AuthorDate: Tue, 22 Mar 2011 15:24:54 +0600
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 22 Mar 2011 13:00:22 +0100

x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context

When CONFIG_X86_MPPARSE=y and CONFIG_X86_IO_APIC=n, then we get
the following warning:

arch/x86/kernel/mpparse.c:723: warning: 'check_slot' defined but not used

So, put check_slot into CONFIG_X86_IO_APIC context. Its only
called from CONFIG_X86_IO_APIC=y context.

Signed-off-by: Rakib Mullick <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/mpparse.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 6f789a8..5a532ce 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -714,10 +714,6 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
*nr_m_spare += 1;
}
}
-#else /* CONFIG_X86_IO_APIC */
-static
-inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
-#endif /* CONFIG_X86_IO_APIC */

static int
check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
@@ -731,6 +727,10 @@ check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)

return ret;
}
+#else /* CONFIG_X86_IO_APIC */
+static
+inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
+#endif /* CONFIG_X86_IO_APIC */

static int __init replace_intsrc_all(struct mpc_table *mpc,
unsigned long mpc_new_phys,