Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:

 - the "misc" tree - stuff from all over the map

 - checkpatch updates

 - fatfs

 - kmod changes

 - procfs

 - cpumask

 - UML

 - kexec

 - mqueue

 - rapidio

 - pidns

 - some checkpoint-restore feature work.  Reluctantly.  Most of it
   delayed a release.  I'm still rather worried that we don't have a
   clear roadmap to completion for this work.

* emailed from Andrew Morton <akpm@linux-foundation.org>: (78 patches)
  kconfig: update compression algorithm info
  c/r: prctl: add ability to set new mm_struct::exe_file
  c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
  c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
  syscalls, x86: add __NR_kcmp syscall
  fs, proc: introduce /proc/<pid>/task/<tid>/children entry
  sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
  aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
  eventfd: change int to __u64 in eventfd_signal()
  fs/nls: add Apple NLS
  pidns: make killed children autoreap
  pidns: use task_active_pid_ns in do_notify_parent
  rapidio/tsi721: add DMA engine support
  rapidio: add DMA engine support for RIO data transfers
  ipc/mqueue: add rbtree node caching support
  tools/selftests: add mq_perf_tests
  ipc/mqueue: strengthen checks on mqueue creation
  ipc/mqueue: correct mq_attr_ok test
  ipc/mqueue: improve performance of send/recv
  selftests: add mq_open_tests
  ...

2 files changed, 5 insertions, 11 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 444143e5f28c..d99db5623acf 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1653,7 +1653,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)
         unsigned long    port;
         u32              msize;
         u32              psize;
-        u8               revision;
         int              r = -ENODEV;
         struct pci_dev *pdev;
 
@@ -1670,8 +1669,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)
                 return r;
         }
 
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-
         if (sizeof(dma_addr_t) > 4) {
                 const uint64_t required_mask = dma_get_required_mask
                     (&pdev->dev);
@@ -1779,7 +1776,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         MPT_ADAPTER     *ioc;
         u8               cb_idx;
         int              r = -ENODEV;
-        u8               revision;
         u8               pcixcmd;
         static int       mpt_ids = 0;
 #ifdef CONFIG_PROC_FS
@@ -1887,8 +1883,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "facts @ %p, pfacts[0] @ %p\n",
             ioc->name, &ioc->facts, &ioc->pfacts[0]));
 
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-        mpt_get_product_name(pdev->vendor, pdev->device, revision, ioc->prod_name);
+        mpt_get_product_name(pdev->vendor, pdev->device, pdev->revision,
+                             ioc->prod_name);
 
         switch (pdev->device)
         {
@@ -1903,7 +1899,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 break;
 
         case MPI_MANUFACTPAGE_DEVICEID_FC929X:
-                if (revision < XL_929) {
+                if (pdev->revision < XL_929) {
                         /* 929X Chip Fix. Set Split transactions level
                         * for PCIX. Set MOST bits to zero.
                         */
@@ -1934,7 +1930,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 /* 1030 Chip Fix. Disable Split transactions
                  * for PCIX. Set MOST bits to zero if Rev < C0( = 8).
                  */
-                if (revision < C0_1030) {
+                if (pdev->revision < C0_1030) {
                         pci_read_config_byte(pdev, 0x6a, &pcixcmd);
                         pcixcmd &= 0x8F;
                         pci_write_config_byte(pdev, 0x6a, pcixcmd);
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 6e6e16aab9da..b383b6961e59 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1250,7 +1250,6 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         int                     iocnum;
         unsigned int            port;
         int                     cim_rev;
-        u8                      revision;
         struct scsi_device      *sdev;
         VirtDevice              *vdevice;
 
@@ -1324,8 +1323,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         pdev = (struct pci_dev *) ioc->pcidev;
 
         karg->pciId = pdev->device;
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-        karg->hwRev = revision;
+        karg->hwRev = pdev->revision;
         karg->subSystemDevice = pdev->subsystem_device;
         karg->subSystemVendor = pdev->subsystem_vendor;