Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72e19b3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] dcss: fix build bug.
  [S390] Fix linker script.
parents f42ac38c dbe13d99

arch/s390/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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) {