From: Jayachandran C <jchandra@broadcom.com>
To: <linux-mips@linux-mips.org>
Cc: Jayachandran C <jchandra@broadcom.com>, <ralf@linux-mips.org>,
<chenhc@lemote.com>
Subject: [PATCH 2/2] MIPS: Move topology macros to topology.h
Date: Fri, 22 Aug 2014 09:48:32 +0530 [thread overview]
Message-ID: <1408681112-26744-2-git-send-email-jchandra@broadcom.com> (raw)
In-Reply-To: <1408681112-26744-1-git-send-email-jchandra@broadcom.com>
commit bda4584cd943 ("MIPS: Support CPU topology files in sysfs")
added MIPS topology related macros to asm/smp.h. Move these to
asm/topology.h.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
[Resending this, looks like linux-mips.org is down]
arch/mips/include/asm/smp.h | 5 -----
arch/mips/include/asm/topology.h | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index 1e0f20a..eacf865 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -37,11 +37,6 @@ extern int __cpu_logical_map[NR_CPUS];
#define NO_PROC_ID (-1)
-#define topology_physical_package_id(cpu) (cpu_data[cpu].package)
-#define topology_core_id(cpu) (cpu_data[cpu].core)
-#define topology_core_cpumask(cpu) (&cpu_core_map[cpu])
-#define topology_thread_cpumask(cpu) (&cpu_sibling_map[cpu])
-
#define SMP_RESCHEDULE_YOURSELF 0x1 /* XXX braindead */
#define SMP_CALL_FUNCTION 0x2
/* Octeon - Tell another core to flush its icache */
diff --git a/arch/mips/include/asm/topology.h b/arch/mips/include/asm/topology.h
index 20ea485..e012429 100644
--- a/arch/mips/include/asm/topology.h
+++ b/arch/mips/include/asm/topology.h
@@ -10,4 +10,9 @@
#include <topology.h>
+#define topology_physical_package_id(cpu) (cpu_data[cpu].package)
+#define topology_core_id(cpu) (cpu_data[cpu].core)
+#define topology_core_cpumask(cpu) (&cpu_core_map[cpu])
+#define topology_thread_cpumask(cpu) (&cpu_sibling_map[cpu])
+
#endif /* __ASM_TOPOLOGY_H */
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Jayachandran C <jchandra@broadcom.com>
To: linux-mips@linux-mips.org
Cc: Jayachandran C <jchandra@broadcom.com>,
ralf@linux-mips.org, chenhc@lemote.com
Subject: [PATCH 2/2] MIPS: Move topology macros to topology.h
Date: Fri, 22 Aug 2014 09:48:32 +0530 [thread overview]
Message-ID: <1408681112-26744-2-git-send-email-jchandra@broadcom.com> (raw)
Message-ID: <20140822041832.qrsXMjS_agKYLtDi5Q9TeUTZ77uJpu1BIBGW8lxfEz4@z> (raw)
In-Reply-To: <1408681112-26744-1-git-send-email-jchandra@broadcom.com>
commit bda4584cd943 ("MIPS: Support CPU topology files in sysfs")
added MIPS topology related macros to asm/smp.h. Move these to
asm/topology.h.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
[Resending this, looks like linux-mips.org is down]
arch/mips/include/asm/smp.h | 5 -----
arch/mips/include/asm/topology.h | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index 1e0f20a..eacf865 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -37,11 +37,6 @@ extern int __cpu_logical_map[NR_CPUS];
#define NO_PROC_ID (-1)
-#define topology_physical_package_id(cpu) (cpu_data[cpu].package)
-#define topology_core_id(cpu) (cpu_data[cpu].core)
-#define topology_core_cpumask(cpu) (&cpu_core_map[cpu])
-#define topology_thread_cpumask(cpu) (&cpu_sibling_map[cpu])
-
#define SMP_RESCHEDULE_YOURSELF 0x1 /* XXX braindead */
#define SMP_CALL_FUNCTION 0x2
/* Octeon - Tell another core to flush its icache */
diff --git a/arch/mips/include/asm/topology.h b/arch/mips/include/asm/topology.h
index 20ea485..e012429 100644
--- a/arch/mips/include/asm/topology.h
+++ b/arch/mips/include/asm/topology.h
@@ -10,4 +10,9 @@
#include <topology.h>
+#define topology_physical_package_id(cpu) (cpu_data[cpu].package)
+#define topology_core_id(cpu) (cpu_data[cpu].core)
+#define topology_core_cpumask(cpu) (&cpu_core_map[cpu])
+#define topology_thread_cpumask(cpu) (&cpu_sibling_map[cpu])
+
#endif /* __ASM_TOPOLOGY_H */
--
1.7.9.5
next prev parent reply other threads:[~2014-08-22 19:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 3:16 [PATCH 1/2] MIPS: Move CPU topology macros to topology.h Huacai Chen
2014-08-08 3:16 ` [PATCH 2/2] MIPS: Loongson: Fix COP2 usage for preemptible kernel Huacai Chen
2014-08-08 12:12 ` Sergei Shtylyov
2014-08-08 13:47 ` [PATCH 1/2] MIPS: Move CPU topology macros to topology.h Ralf Baechle
2014-08-13 0:18 ` Jayachandran C.
2014-08-13 0:18 ` Jayachandran C.
2014-08-20 3:57 ` Huacai Chen
2014-08-22 4:18 ` [PATCH 1/2] MIPS: Netlogic: Use MIPS topology.h Jayachandran C
2014-08-22 4:18 ` Jayachandran C
2014-08-22 4:18 ` Jayachandran C [this message]
2014-08-22 4:18 ` [PATCH 2/2] MIPS: Move topology macros to topology.h Jayachandran C
2014-08-25 13:20 ` [PATCH 1/2] MIPS: Netlogic: Use MIPS topology.h Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408681112-26744-2-git-send-email-jchandra@broadcom.com \
--to=jchandra@broadcom.com \
--cc=chenhc@lemote.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox