Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc update from Benjamin Herrenschmidt:
 "The main highlight is probably some base POWER8 support.  There's more
  to come such as transactional memory support but that will wait for
  the next one.

  Overall it's pretty quiet, or rather I've been pretty poor at picking
  things up from patchwork and reviewing them this time around and Kumar
  no better on the FSL side it seems..."

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (73 commits)
  powerpc+of: Rename and fix OF reconfig notifier error inject module
  powerpc: mpc5200: Add a3m071 board support
  powerpc/512x: don't compile any platform DIU code if the DIU is not enabled
  powerpc/mpc52xx: use module_platform_driver macro
  powerpc+of: Export of_reconfig_notifier_[register,unregister]
  powerpc/dma/raidengine: add raidengine device
  powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct
  powerpc/mpc85xx: Change spin table to cached memory
  powerpc/fsl-pci: Add PCI controller ATMU PM support
  powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
  drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS]
  powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
  powerpc: Disable relocation on exceptions when kexecing
  powerpc: Enable relocation on during exceptions at boot
  powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function
  powerpc: Add wrappers to enable/disable relocation on exceptions
  powerpc: Add set_mode hcall
  powerpc: Setup relocation on exceptions for bare metal systems
  powerpc: Move initial mfspr LPCR out of __init_LPCR
  powerpc: Add relocation on exception vector handlers
  ...

2 files changed, 8 insertions, 13 deletions

diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c
index 0ce625738677..6c4c000671c5 100644
--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 
 #include <asm/page.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/vio.h>
 
 #include "nx_csbcpb.h" /* struct nx_csbcpb */
@@ -1014,26 +1013,23 @@ error_out:
  *      NOTIFY_BAD encoded with error number on failure, use
  *              notifier_to_errno() to decode this value
  */
-static int nx842_OF_notifier(struct notifier_block *np,
-                                        unsigned long action,
-                                        void *update)
+static int nx842_OF_notifier(struct notifier_block *np, unsigned long action,
+                             void *update)
 {
-        struct pSeries_reconfig_prop_update *upd;
+        struct of_prop_reconfig *upd = update;
         struct nx842_devdata *local_devdata;
         struct device_node *node = NULL;
 
-        upd = (struct pSeries_reconfig_prop_update *)update;
-
         rcu_read_lock();
         local_devdata = rcu_dereference(devdata);
         if (local_devdata)
                 node = local_devdata->dev->of_node;
 
         if (local_devdata &&
-                        action == PSERIES_UPDATE_PROPERTY &&
-                        !strcmp(upd->node->name, node->name)) {
+                        action == OF_RECONFIG_UPDATE_PROPERTY &&
+                        !strcmp(upd->dn->name, node->name)) {
                 rcu_read_unlock();
-                nx842_OF_upd(upd->property);
+                nx842_OF_upd(upd->prop);
         } else
                 rcu_read_unlock();
 
@@ -1182,7 +1178,7 @@ static int __init nx842_probe(struct vio_dev *viodev,
         synchronize_rcu();
         kfree(old_devdata);
 
-        pSeries_reconfig_notifier_register(&nx842_of_nb);
+        of_reconfig_notifier_register(&nx842_of_nb);
 
         ret = nx842_OF_upd(NULL);
         if (ret && ret != -ENODEV) {
@@ -1228,7 +1224,7 @@ static int __exit nx842_remove(struct vio_dev *viodev)
         spin_lock_irqsave(&devdata_mutex, flags);
         old_devdata = rcu_dereference_check(devdata,
                         lockdep_is_held(&devdata_mutex));
-        pSeries_reconfig_notifier_unregister(&nx842_of_nb);
+        of_reconfig_notifier_unregister(&nx842_of_nb);
         rcu_assign_pointer(devdata, NULL);
         spin_unlock_irqrestore(&devdata_mutex, flags);
         synchronize_rcu();
diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index 638110efae9b..f7a8a16aa7d3 100644
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -33,7 +33,6 @@
 #include <linux/scatterlist.h>
 #include <linux/device.h>
 #include <linux/of.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/hvcall.h>
 #include <asm/vio.h>