Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEM
  [IA64] align high endpoint of VIRTUAL_MEM_MAP
  [PATCH] Fix RAID5 + IA64 compile
  [IA64] Don't alloc empty frame in ia64_switch_mode_phys
  [IA64] Do not assume output registers be reservered.
  [IA64] add platform check to snsc driver init
  [IA64] sparse cleanups
  [IA64] Fix breakage in simscsi.c
  [IA64] Format /proc/pal/*/version_info correctly

diff --combined arch/ia64/kernel/palinfo.c
index ab5b52413e918db331c599b69cdc9ed8db19546b,ce9f199bbf3982cdf24d5f89f28cd57088913392..0b546e2b36ac61c113b73ada6e98775a30294e25
--- 1/arch/ia64/kernel/palinfo.c
--- 2/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@@ -566,29 -566,23 +566,23 @@@ version_info(char *page
        pal_version_u_t min_ver, cur_ver;
        char *p = page;
  
-       /* The PAL_VERSION call is advertised as being able to support
-        * both physical and virtual mode calls. This seems to be a documentation
-        * bug rather than firmware bug. In fact, it does only support physical mode.
-        * So now the code reflects this fact and the pal_version() has been updated
-        * accordingly.
-        */
-       if (ia64_pal_version(&min_ver, &cur_ver) != 0) return 0;
+       if (ia64_pal_version(&min_ver, &cur_ver) != 0)
+               return 0;
  
        p += sprintf(p,
                     "PAL_vendor : 0x%02x (min=0x%02x)\n"
-                    "PAL_A      : %x.%x.%x (min=%x.%x.%x)\n"
-                    "PAL_B      : %x.%x.%x (min=%x.%x.%x)\n",
-                    cur_ver.pal_version_s.pv_pal_vendor, min_ver.pal_version_s.pv_pal_vendor,
- 
-                    cur_ver.pal_version_s.pv_pal_a_model>>4,
-                    cur_ver.pal_version_s.pv_pal_a_model&0xf, cur_ver.pal_version_s.pv_pal_a_rev,
-                    min_ver.pal_version_s.pv_pal_a_model>>4,
-                    min_ver.pal_version_s.pv_pal_a_model&0xf, min_ver.pal_version_s.pv_pal_a_rev,
- 
-                    cur_ver.pal_version_s.pv_pal_b_model>>4,
-                    cur_ver.pal_version_s.pv_pal_b_model&0xf, cur_ver.pal_version_s.pv_pal_b_rev,
-                    min_ver.pal_version_s.pv_pal_b_model>>4,
-                    min_ver.pal_version_s.pv_pal_b_model&0xf, min_ver.pal_version_s.pv_pal_b_rev);
+                    "PAL_A      : %02x.%02x (min=%02x.%02x)\n"
+                    "PAL_B      : %02x.%02x (min=%02x.%02x)\n",
+                    cur_ver.pal_version_s.pv_pal_vendor,
+                    min_ver.pal_version_s.pv_pal_vendor,
+                    cur_ver.pal_version_s.pv_pal_a_model,
+                    cur_ver.pal_version_s.pv_pal_a_rev,
+                    min_ver.pal_version_s.pv_pal_a_model,
+                    min_ver.pal_version_s.pv_pal_a_rev,
+                    cur_ver.pal_version_s.pv_pal_b_model,
+                    cur_ver.pal_version_s.pv_pal_b_rev,
+                    min_ver.pal_version_s.pv_pal_b_model,
+                    min_ver.pal_version_s.pv_pal_b_rev);
        return p - page;
  }
  
@@@ -958,9 -952,9 +952,9 @@@ remove_palinfo_proc_entries(unsigned in
        }
  }
  
 -static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
 -                                                              unsigned long action,
 -                                                              void *hcpu)
 +#ifdef CONFIG_HOTPLUG_CPU
 +static int palinfo_cpu_callback(struct notifier_block *nfb,
 +                                      unsigned long action, void *hcpu)
  {
        unsigned int hotcpu = (unsigned long)hcpu;
  
@@@ -968,19 -962,20 +962,19 @@@
        case CPU_ONLINE:
                create_palinfo_proc_entries(hotcpu);
                break;
 -#ifdef CONFIG_HOTPLUG_CPU
        case CPU_DEAD:
                remove_palinfo_proc_entries(hotcpu);
                break;
 -#endif
        }
        return NOTIFY_OK;
  }
  
 -static struct notifier_block __cpuinitdata palinfo_cpu_notifier =
 +static struct notifier_block palinfo_cpu_notifier =
  {
        .notifier_call = palinfo_cpu_callback,
        .priority = 0,
  };
 +#endif
  
  static int __init
  palinfo_init(void)
@@@ -1019,7 -1014,7 +1013,7 @@@ palinfo_exit(void
        /*
         * Unregister from cpu notifier callbacks
         */
 -      unregister_cpu_notifier(&palinfo_cpu_notifier);
 +      unregister_hotcpu_notifier(&palinfo_cpu_notifier);
  }
  
  module_init(palinfo_init);