From a453c42aed630c396865aeed184a9e91d523e03a Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Fri, 21 Aug 2009 14:32:48 -0400
Subject: [PATCH] --- yaml --- r: 157010 b: refs/heads/master c:
 6777d773a463ac045d333b989d4e44660f8d92ad h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/s390/kernel/setup.c  | 25 +++++++------------------
 trunk/drivers/s390/block/dasd.c |  2 +-
 trunk/drivers/s390/cio/device.c |  4 +++-
 trunk/fs/exec.c                 |  4 ++--
 trunk/include/linux/fs.h        |  2 +-
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 3a670b37be10..6d17257007bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 637952ca689013339b977558061fa4ca8e07e1c1
+refs/heads/master: 6777d773a463ac045d333b989d4e44660f8d92ad
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index cbb897bc50bd..9717717c6fea 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -154,20 +154,6 @@ static int __init condev_setup(char *str)
 
 __setup("condev=", condev_setup);
 
-static void __init set_preferred_console(void)
-{
-	if (MACHINE_IS_KVM) {
-		add_preferred_console("hvc", 0, NULL);
-		s390_virtio_console_init();
-		return;
-	}
-
-	if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)
-		add_preferred_console("ttyS", 0, NULL);
-	if (CONSOLE_IS_3270)
-		add_preferred_console("tty3270", 0, NULL);
-}
-
 static int __init conmode_setup(char *str)
 {
 #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
@@ -182,7 +168,6 @@ static int __init conmode_setup(char *str)
 	if (strncmp(str, "3270", 5) == 0)
 		SET_CONSOLE_3270;
 #endif
-	set_preferred_console();
         return 1;
 }
 
@@ -795,6 +780,9 @@ static void __init setup_hwcaps(void)
 void __init
 setup_arch(char **cmdline_p)
 {
+	/* set up preferred console */
+	add_preferred_console("ttyS", 0, NULL);
+
         /*
          * print what head.S has found out about the machine
          */
@@ -814,9 +802,11 @@ setup_arch(char **cmdline_p)
 	if (MACHINE_IS_VM)
 		pr_info("Linux is running as a z/VM "
 			"guest operating system in 64-bit mode\n");
-	else if (MACHINE_IS_KVM)
+	else if (MACHINE_IS_KVM) {
 		pr_info("Linux is running under KVM in 64-bit mode\n");
-	else
+		add_preferred_console("hvc", 0, NULL);
+		s390_virtio_console_init();
+	} else
 		pr_info("Linux is running natively in 64-bit mode\n");
 #endif /* CONFIG_64BIT */
 
@@ -861,7 +851,6 @@ setup_arch(char **cmdline_p)
 
         /* Setup default console */
 	conmode_default();
-	set_preferred_console();
 
 	/* Setup zfcpdump support */
 	setup_zfcpdump(console_devno);
diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c
index 3f62dd50bbbe..749836668655 100644
--- a/trunk/drivers/s390/block/dasd.c
+++ b/trunk/drivers/s390/block/dasd.c
@@ -2135,9 +2135,9 @@ static int dasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 	struct dasd_device *base;
 
 	block = bdev->bd_disk->private_data;
+	base = block->base;
 	if (!block)
 		return -ENODEV;
-	base = block->base;
 
 	if (!base->discipline ||
 	    !base->discipline->fill_geometry)
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index d593bc76afe3..3c57c1a18bb8 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -772,8 +772,10 @@ static struct ccw_device * io_subchannel_create_ccwdev(struct subchannel *sch)
 	cdev = io_subchannel_allocate_dev(sch);
 	if (!IS_ERR(cdev)) {
 		ret = io_subchannel_initialize_dev(sch, cdev);
-		if (ret)
+		if (ret) {
+			kfree(cdev);
 			cdev = ERR_PTR(ret);
+		}
 	}
 	return cdev;
 }
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 4a8849e45b21..fb4f3cdda78c 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -678,8 +678,8 @@ struct file *open_exec(const char *name)
 }
 EXPORT_SYMBOL(open_exec);
 
-int kernel_read(struct file *file, unsigned long offset,
-	char *addr, unsigned long count)
+int kernel_read(struct file *file, loff_t offset,
+		char *addr, unsigned long count)
 {
 	mm_segment_t old_fs;
 	loff_t pos = offset;
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 67888a9e0655..73e9b643e455 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -2123,7 +2123,7 @@ extern struct file *do_filp_open(int dfd, const char *pathname,
 		int open_flag, int mode, int acc_mode);
 extern int may_open(struct path *, int, int);
 
-extern int kernel_read(struct file *, unsigned long, char *, unsigned long);
+extern int kernel_read(struct file *, loff_t, char *, unsigned long);
 extern struct file * open_exec(const char *);
  
 /* fs/dcache.c -- generic fs support functions */