Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / firmware / dmi_scan.c

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 948bd7e..852157d 100644 (file)
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -154,6 +154,8 @@ static void __init dmi_save_ipmi_device(struct dmi_header *dm)
        list_add(&dev->list, &dmi_devices);
 }
 
+int dmi_cpus;
+
 /*
  *     Process a DMI table entry. Right now all we care about are the BIOS
  *     and machine entries. For 2.5 we should pull the smbus controller info
@@ -178,6 +180,9 @@ static void __init dmi_decode(struct dmi_header *dm)
                dmi_save_ident(dm, DMI_BOARD_NAME, 5);
                dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
                break;
+       case 4:         /* Central Processor */
+               dmi_cpus++;
+               break;
        case 10:        /* Onboard Devices Information */
                dmi_save_devices(dm);
                break;
@@ -255,10 +260,15 @@ void __init dmi_scan_machine(void)
 /**
  *     dmi_check_system - check system DMI data
  *     @list: array of dmi_system_id structures to match against
+ *             All non-null elements of the list must match
+ *             their slot's (field index's) data (i.e., each
+ *             list string must be a substring of the specified
+ *             DMI slot's string data) to be considered a
+ *             successful match.
  *
  *     Walk the blacklist table running matching functions until someone
  *     returns non zero or we hit the end. Callback function is called for
- *     each successfull match. Returns the number of matches.
+ *     each successful match. Returns the number of matches.
  */
 int dmi_check_system(struct dmi_system_id *list)
 {
@@ -287,7 +297,7 @@ EXPORT_SYMBOL(dmi_check_system);
 
 /**
  *     dmi_get_system_info - return DMI data value
- *     @field: data index (see enum dmi_filed)
+ *     @field: data index (see enum dmi_field)
  *
  *     Returns one DMI data value, can be used to perform
  *     complex DMI data checks.
@@ -301,13 +311,13 @@ EXPORT_SYMBOL(dmi_get_system_info);
 /**
  *     dmi_find_device - find onboard device by type/name
  *     @type: device type or %DMI_DEV_TYPE_ANY to match all device types
- *     @desc: device name string or %NULL to match all
+ *     @name: device name string or %NULL to match all
  *     @from: previous device found in search, or %NULL for new search.
  *
  *     Iterates through the list of known onboard devices. If a device is
  *     found with a matching @vendor and @device, a pointer to its device
  *     structure is returned.  Otherwise, %NULL is returned.
- *     A new search is initiated by passing %NULL to the @from argument.
+ *     A new search is initiated by passing %NULL as the @from argument.
  *     If @from is not %NULL, searches continue from next device.
  */
 struct dmi_device * dmi_find_device(int type, const char *name,