Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83218
b: refs/heads/master
c: 83380cc
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 5, 2008
1 parent f0897fb commit 67541fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf53d85ec20c228e0efdadbdb12c0f92283fcfd0
refs/heads/master: 83380cc1c9694a05bcdb7c95d293e99d3475d906
20 changes: 4 additions & 16 deletions trunk/arch/um/drivers/ubd_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -460,20 +460,6 @@ __uml_help(udb_setup,
" in the boot output.\n\n"
);

static int fakehd_set = 0;
static int fakehd(char *str)
{
printk(KERN_INFO "fakehd : Changing ubd name to \"hd\".\n");
fakehd_set = 1;
return 1;
}

__setup("fakehd", fakehd);
__uml_help(fakehd,
"fakehd\n"
" Change the ubd device name to \"hd\".\n\n"
);

static void do_ubd_request(struct request_queue * q);

/* Only changed by ubd_init, which is an initcall. */
Expand Down Expand Up @@ -722,8 +708,10 @@ static int ubd_add(int n, char **error_out)
ubd_disk_register(fake_major, ubd_dev->size, n,
&fake_gendisk[n]);

/* perhaps this should also be under the "if (fake_major)" above */
/* using the fake_disk->disk_name and also the fakehd_set name */
/*
* Perhaps this should also be under the "if (fake_major)" above
* using the fake_disk->disk_name
*/
if (fake_ide)
make_ide_entries(ubd_gendisk[n]->disk_name);

Expand Down

0 comments on commit 67541fc

Please sign in to comment.