2 files changed, 7 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 442cf36aa172..0ce45c2b42f8 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device,
                         MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE |
                         MSIC_CTRL_FIFO_SIZE);
 
+        msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG)
+                                & MSIC_FIFO_SIZE_MASK;
+
         device->dev.platform_data = msic;
 
         ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index f4e55be2eea9..afad9f5ac0ac 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -208,6 +208,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
                 break;
         case ERR_TYPE_KERNEL_PANIC:
         default:
+                WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
                 spin_unlock_irqrestore(&rtasd_log_lock, s);
                 return;
         }
@@ -227,6 +228,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
         /* Check to see if we need to or have stopped logging */
         if (fatal || !logging_enabled) {
                 logging_enabled = 0;
+                WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
                 spin_unlock_irqrestore(&rtasd_log_lock, s);
                 return;
         }
@@ -249,11 +251,13 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
                 else
                         rtas_log_start += 1;
 
+                WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
                 spin_unlock_irqrestore(&rtasd_log_lock, s);
                 wake_up_interruptible(&rtas_log_wait);
                 break;
         case ERR_TYPE_KERNEL_PANIC:
         default:
+                WARN_ON_ONCE(!irqs_disabled()); /* @@@ DEBUG @@@ */
                 spin_unlock_irqrestore(&rtasd_log_lock, s);
                 return;
         }