Commit fdb072ba authored by David Mosberger's avatar David Mosberger

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

parent 655d0d45
...@@ -436,7 +436,7 @@ static void * ...@@ -436,7 +436,7 @@ static void *
c_start (struct seq_file *m, loff_t *pos) c_start (struct seq_file *m, loff_t *pos)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
while (*pos < NR_CPUS && !(cpu_online_map & (1 << *pos))) while (*pos < NR_CPUS && !(cpu_online_map & (1UL << *pos)))
++*pos; ++*pos;
#endif #endif
return *pos < NR_CPUS ? cpu_data(*pos) : NULL; return *pos < NR_CPUS ? cpu_data(*pos) : NULL;
......
...@@ -514,7 +514,7 @@ smp_boot_cpus (unsigned int max_cpus) ...@@ -514,7 +514,7 @@ smp_boot_cpus (unsigned int max_cpus)
} else { } else {
unsigned long bogosum = 0; unsigned long bogosum = 0;
for (cpu = 0; cpu < NR_CPUS; cpu++) 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; bogosum += cpu_data(cpu)->loops_per_jiffy;
printk(KERN_INFO"Total of %d processors activated (%lu.%02lu BogoMIPS).\n", printk(KERN_INFO"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
* No irq_cpustat_t for IA-64. The data is held in the per-CPU data structure. * 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 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 syscall_count(cpu) /* unused on IA-64 */
#define ksoftirqd_task(cpu) (cpu_data(cpu)->ksoftirqd)
#define nmi_count(cpu) 0 #define nmi_count(cpu) 0
#define local_softirq_pending() (local_cpu_data->softirq_pending) #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_syscall_count() /* unused on IA-64 */
#define local_ksoftirqd_task() (local_cpu_data->ksoftirqd)
#define local_nmi_count() 0 #define local_nmi_count() 0
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment