[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-1245e1668c6e52bee76a423f8fab3bfcdd6226ae@git.kernel.org>
Date: Fri, 28 Jan 2011 14:37:56 GMT
From: tip-bot for Tejun Heo <tj@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, penberg@...nel.org, gorcunov@...il.com,
tj@...nel.org, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/numa] x86: Make default_send_IPI_mask_sequence/allbutself_logical() 32bit only
Commit-ID: 1245e1668c6e52bee76a423f8fab3bfcdd6226ae
Gitweb: http://git.kernel.org/tip/1245e1668c6e52bee76a423f8fab3bfcdd6226ae
Author: Tejun Heo <tj@...nel.org>
AuthorDate: Sun, 23 Jan 2011 14:37:29 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Fri, 28 Jan 2011 14:54:05 +0100
x86: Make default_send_IPI_mask_sequence/allbutself_logical() 32bit only
Both functions are used only in 32bit. Put them inside
CONFIG_X86_32. This is to prepare for logical apicid handling
update.
- Cyrill Gorcunov spotted that I forgot to move declarations in
ipi.h under CONFIG_X86_32. Fixed.
Signed-off-by: Tejun Heo <tj@...nel.org>
Reviewed-by: Pekka Enberg <penberg@...nel.org>
Reviewed-by: Cyrill Gorcunov <gorcunov@...il.com>
Acked-by: Yinghai Lu <yinghai@...nel.org>
Cc: eric.dumazet@...il.com
Cc: brgerst@...il.com
Cc: shaohui.zheng@...el.com
Cc: rientjes@...gle.com
LKML-Reference: <1295789862-25482-4-git-send-email-tj@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/include/asm/ipi.h | 8 ++++----
arch/x86/kernel/apic/ipi.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/include/asm/ipi.h
index 0b72282..615fa90 100644
--- a/arch/x86/include/asm/ipi.h
+++ b/arch/x86/include/asm/ipi.h
@@ -123,10 +123,6 @@ extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,
int vector);
extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
int vector);
-extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
- int vector);
-extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
- int vector);
/* Avoid include hell */
#define NMI_VECTOR 0x02
@@ -150,6 +146,10 @@ static inline void __default_local_send_IPI_all(int vector)
}
#ifdef CONFIG_X86_32
+extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
+ int vector);
+extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
+ int vector);
extern void default_send_IPI_mask_logical(const struct cpumask *mask,
int vector);
extern void default_send_IPI_allbutself(int vector);
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index 08385e0..5037736 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -56,6 +56,8 @@ void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
local_irq_restore(flags);
}
+#ifdef CONFIG_X86_32
+
void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
int vector)
{
@@ -96,8 +98,6 @@ void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
local_irq_restore(flags);
}
-#ifdef CONFIG_X86_32
-
/*
* This is only used on smaller machines.
*/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists