[PATCH] ia64: cpumask_t fixes

This patch coverts a few spots to use cpumask_t instead of unsigned
long.

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index ad80148825edbd4e361ab53e3ef5ed6185c9f712..b98ff5045104df94c29ad5a0c58a083e5e8ad0df 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1193,7 +1193,7 @@ static void
 ia64_mca_cmc_poll (unsigned long dummy)
 {
        /* Trigger a CMC interrupt cascade  */
-       platform_send_ipi(__ffs(cpu_online_map), IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);
+       platform_send_ipi(first_cpu(cpu_online_map), IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);
 }
 
 /*
@@ -1260,7 +1260,7 @@ static void
 ia64_mca_cpe_poll (unsigned long dummy)
 {
        /* Trigger a CPE interrupt cascade  */
-       platform_send_ipi(__ffs(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);
+       platform_send_ipi(first_cpu(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);
 }
 
 /*

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 156401c955f522dca80609d5c9d19a0e4ad9bd83..3c060585d4555f1d76b45c48859aa31e6b9943d8 100644 (file)
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -187,7 +187,7 @@ static inline void
 ia64_do_profile (struct pt_regs * regs)
 {
        unsigned long ip, slot;
-       extern unsigned long prof_cpu_mask;
+       extern cpumask_t prof_cpu_mask;
 
        profile_hook(regs);
 

diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index a6a87c92689fe16731a4c046e6f59a699b5809a6..c3a26e12cd07c612a457f21f56dcdeaf16e4922a 100644 (file)
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -23,7 +23,7 @@
 
 #include <linux/cache.h>
 extern volatile char cpu_to_node_map[NR_CPUS] __cacheline_aligned;
-extern volatile unsigned long node_to_cpu_mask[NR_NODES] __cacheline_aligned;
+extern volatile cpumask_t node_to_cpu_mask[NR_NODES] __cacheline_aligned;
 
 /* Stuff below this line could be architecture independent */
 

diff --git a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
index b2ed848afa38e3ade9b73a37198cc38b5b5f6e50..edf2693988841a12cbe27653709263f62dc2a7f2 100644 (file)
--- a/include/asm-ia64/sn/nodepda.h
+++ b/include/asm-ia64/sn/nodepda.h
@@ -128,7 +128,7 @@ typedef struct irqpda_s irqpda_t;
  * Check if given a compact node id the corresponding node has all the
  * cpus disabled. 
  */
-#define is_headless_node(cnode)                (!node_to_cpumask(cnode))
+#define is_headless_node(cnode)                (!any_online_cpu(node_to_cpumask(cnode)))
 
 /*
  * Check if given a node vertex handle the corresponding node has all the