2.6.27-rc5 updates for s390

GIT PULL Heiko Carstens 1 participant 1 message Aug 27, 2008 s390

lore

Share & tools

lore

Heiko Carstens

author

2008-08-27 14:28 UTC #0 lore raw

Hi Linus,

please pull from 'for-linus' branch of

	git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus

This contains just two s390 specific build fixes.

Heiko Carstens (2):
[S390] Fix linker script.
[S390] dcss: fix build bug.

 arch/s390/kernel/vmlinux.lds.S |    2 +-
 drivers/s390/block/dcssblk.c   |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

arch/s390/kernel/vmlinux.lds.S +1 -1

index 76c1e60..607bd67 100644
@@ -55,7 +55,7 @@ SECTIONS
 		__start___ex_table = .;
 		*(__ex_table)
 		__stop___ex_table = .;
-	}
+	} :data
 
 	.data : {		/* Data */
 		DATA_DATA

drivers/s390/block/dcssblk.c +3 -2

index db85f1f..711b300 100644
@@ -384,9 +384,10 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
 	 * get minor, add to list
 	 */
 	down_write(&dcssblk_devices_sem);
-	if (dcssblk_get_segment_by_name(local_buf)) {
+	if (dcssblk_get_device_by_name(local_buf)) {
+		up_write(&dcssblk_devices_sem);
 		rc = -EEXIST;
-		goto release_gd;
+		goto unload_seg;
 	}
 	rc = dcssblk_assign_free_minor(dev_info);
 	if (rc) {