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

* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] replace kmalloc+memset with kzalloc
  [IA64] resolve name clash by renaming is_available_memory()
  [IA64] Need export for csum_ipv6_magic
  [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
  [PATCH] Add support for type argument in PAL_GET_PSTATE
  [IA64] tidy up return value of ip_fast_csum
  [IA64] implement csum_ipv6_magic for ia64.
  [IA64] More Itanium PAL spec updates
  [IA64] Update processor_info features
  [IA64] Add se bit to Processor State Parameter structure
  [IA64] Add dp bit to cache and bus check structs
  [IA64] SN: Correctly update smp_affinty mask
  [IA64] sparse cleanups
  [IA64] IA64 Kexec/kdump

1 files changed, 19 insertions, 3 deletions

diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index c4c10a0b99d9..a71df9ae0397 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -16,6 +16,7 @@
  * 02/05/2001   S.Eranian       fixed module support
  * 10/23/2001   S.Eranian       updated pal_perf_mon_info bug fixes
  * 03/24/2004   Ashok Raj       updated to work with CPU Hotplug
+ * 10/26/2006   Russ Anderson   updated processor features to rev 2.2 spec
  */
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -314,13 +315,20 @@ vm_info(char *page)
                      "Protection Key Registers(PKR)  : %d\n"
                      "Implemented bits in PKR.key    : %d\n"
                      "Hash Tag ID                    : 0x%x\n"
-                     "Size of RR.rid                 : %d\n",
+                     "Size of RR.rid                 : %d\n"
+                     "Max Purges                     : ",
                      vm_info_1.pal_vm_info_1_s.phys_add_size,
                      vm_info_2.pal_vm_info_2_s.impl_va_msb+1,
                      vm_info_1.pal_vm_info_1_s.max_pkr+1,
                      vm_info_1.pal_vm_info_1_s.key_size,
                      vm_info_1.pal_vm_info_1_s.hash_tag_id,
                      vm_info_2.pal_vm_info_2_s.rid_size);
+                if (vm_info_2.pal_vm_info_2_s.max_purges == PAL_MAX_PURGES)
+                        p += sprintf(p, "unlimited\n");
+                else
+                        p += sprintf(p, "%d\n",
+                                vm_info_2.pal_vm_info_2_s.max_purges ?
+                                vm_info_2.pal_vm_info_2_s.max_purges : 1);
         }
 
         if (ia64_pal_mem_attrib(&attrib) == 0) {
@@ -467,7 +475,11 @@ static const char *proc_features[]={
         NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL,NULL,
         NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
         NULL,NULL,NULL,NULL,NULL, NULL,NULL,NULL,NULL,
-        NULL,NULL,NULL,NULL,NULL,
+        "Unimplemented instruction address fault",
+        "INIT, PMI, and LINT pins",
+        "Simple unimplemented instr addresses",
+        "Variable P-state performance",
+        "Virtual machine features implemented",
         "XIP,XPSR,XFS implemented",
         "XR1-XR3 implemented",
         "Disable dynamic predicate prediction",
@@ -475,7 +487,11 @@ static const char *proc_features[]={
         "Disable dynamic data cache prefetch",
         "Disable dynamic inst cache prefetch",
         "Disable dynamic branch prediction",
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL,
+        "Disable P-states",
+        "Enable MCA on Data Poisoning",
+        "Enable vmsw instruction",
+        "Enable extern environmental notification",
         "Disable BINIT on processor time-out",
         "Disable dynamic power management (DPM)",
         "Disable coherency",