Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 10 insertions, 3 deletions

diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index ecb609342feb..e09d0f7fb6b0 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -100,8 +100,8 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
         struct cpuinfo_parisc *p;
 
 #ifdef CONFIG_SMP
-        if (num_online_cpus() >= NR_CPUS) {
-                printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");
+        if (num_online_cpus() >= nr_cpu_ids) {
+                printk(KERN_INFO "num_online_cpus() >= nr_cpu_ids\n");
                 return 1;
         }
 #else
@@ -214,7 +214,7 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
          */
 #ifdef CONFIG_SMP
         if (cpuid) {
-                cpu_set(cpuid, cpu_present_map);
+                set_cpu_present(cpuid, true);
                 cpu_up(cpuid);
         }
 #endif
@@ -364,6 +364,13 @@ show_cpuinfo (struct seq_file *m, void *v)
                                  boot_cpu_data.cpu_hz / 1000000,
                                  boot_cpu_data.cpu_hz % 1000000  );
 
+                seq_printf(m, "capabilities\t:");
+                if (boot_cpu_data.pdc.capabilities & PDC_MODEL_OS32)
+                        seq_printf(m, " os32");
+                if (boot_cpu_data.pdc.capabilities & PDC_MODEL_OS64)
+                        seq_printf(m, " os64");
+                seq_printf(m, "\n");
+
                 seq_printf(m, "model\t\t: %s\n"
                                 "model name\t: %s\n",
                                  boot_cpu_data.pdc.sys_model_name,