3 files changed, 7 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 470db6efaeb6..a031d99becb7 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -176,7 +176,7 @@ static void __init pseries_mpic_init_IRQ(void)
                 return;
 
         cascade_irq = irq_of_parse_and_map(cascade, 0);
-        if (cascade == NO_IRQ) {
+        if (cascade_irq == NO_IRQ) {
                 printk(KERN_ERR "mpic: failed to map cascade interrupt");
                 return;
         }
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 68441e0e74b6..143ed8e154af 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -19,7 +19,7 @@ CFLAGS		+= -m31
 AFLAGS          += -m31
 UTS_MACHINE     := s390
 STACK_SIZE      := 8192
-CHECKFLAGS      += -D__s390__
+CHECKFLAGS      += -D__s390__ -msize-long
 else
 LDFLAGS         := -m elf64_s390
 MODFLAGS        += -fpic -D__PIC__
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 9a13b24ee1ab..8b8f136d9cc7 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -295,8 +295,8 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
 static struct subsys_attribute sys_ipl_device_attr =
         __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
 
-static ssize_t ipl_parameter_read(struct kobject *kobj, char *buf, loff_t off,
-                                  size_t count)
+static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,
+                                  char *buf, loff_t off, size_t count)
 {
         unsigned int size = IPL_PARMBLOCK_SIZE;
 
@@ -317,8 +317,8 @@ static struct bin_attribute ipl_parameter_attr = {
         .read = &ipl_parameter_read,
 };
 
-static ssize_t ipl_scp_data_read(struct kobject *kobj, char *buf, loff_t off,
-        size_t count)
+static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr,
+                                 char *buf, loff_t off, size_t count)
 {
         unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len;
         void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data;
@@ -337,7 +337,7 @@ static struct bin_attribute ipl_scp_data_attr = {
                 .mode = S_IRUGO,
         },
         .size = PAGE_SIZE,
-        .read = &ipl_scp_data_read,
+        .read = ipl_scp_data_read,
 };
 
 /* FCP ipl device attributes */