ia64: Allow for more than 32 CPUs. Minor formatting cleanups.

arch/ia64/kernel/setup.c

@@ -436,7 +436,7 @@ static void *
 c_start (struct seq_file *m, loff_t *pos)
 {
 #ifdef CONFIG_SMP
-	while (*pos < NR_CPUS && !(cpu_online_map & (1 << *pos)))
+	while (*pos < NR_CPUS && !(cpu_online_map & (1UL << *pos)))
 		++*pos;
 #endif
 	return *pos < NR_CPUS ? cpu_data(*pos) : NULL;

arch/ia64/kernel/smpboot.c

@@ -514,7 +514,7 @@ smp_boot_cpus (unsigned int max_cpus)
 		} else {
 			unsigned long bogosum = 0;
   			for (cpu = 0; cpu < NR_CPUS; cpu++)
-				if (cpu_online_map & (1<<cpu))
+				if (cpu_online_map & (1UL << cpu))
 					bogosum += cpu_data(cpu)->loops_per_jiffy;
 
 			printk(KERN_INFO"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",

include/asm-ia64/hardirq.h

@@ -17,13 +17,13 @@
  * No irq_cpustat_t for IA-64.  The data is held in the per-CPU data structure.
  */
 #define softirq_pending(cpu)		(cpu_data(cpu)->softirq_pending)
-#define ksoftirqd_task(cpu)		(cpu_data(cpu)->ksoftirqd)
 #define syscall_count(cpu)		/* unused on IA-64 */
+#define ksoftirqd_task(cpu)		(cpu_data(cpu)->ksoftirqd)
 #define nmi_count(cpu)			0
 
 #define local_softirq_pending()		(local_cpu_data->softirq_pending)
-#define local_ksoftirqd_task()		(local_cpu_data->ksoftirqd)
 #define local_syscall_count()		/* unused on IA-64 */
+#define local_ksoftirqd_task()		(local_cpu_data->ksoftirqd)
 #define local_nmi_count()		0
 
 /*