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.
This commit is contained in:
commit
72e19b3b22
|
@ -55,7 +55,7 @@ SECTIONS
|
|||
__start___ex_table = .;
|
||||
*(__ex_table)
|
||||
__stop___ex_table = .;
|
||||
}
|
||||
} :data
|
||||
|
||||
.data : { /* Data */
|
||||
DATA_DATA
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue