public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Greg KH <gregkh@suse.de>
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] fix compile errors and warning after devfs removal patches
Date: Sat, 11 Jun 2005 22:14:44 +0200	[thread overview]
Message-ID: <20050611201444.GM3770@stusta.de> (raw)
In-Reply-To: <20050611074327.GA27785@kroah.com>

The patch below fixes three compile errors and one compile warning after 
applying the devfs removal patches.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/ide/ide-tape.c |    1 -
 drivers/md/md.c        |    1 -
 init/do_mounts_md.c    |    2 +-
 init/do_mounts_rd.c    |    4 ++--
 4 files changed, 3 insertions(+), 5 deletions(-)

--- linux-2.6.12-rc6-mm1-full/init/do_mounts_rd.c.old	2005-06-11 20:18:09.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/init/do_mounts_rd.c	2005-06-11 20:19:14.000000000 +0200
@@ -262,8 +262,8 @@
 {
 	if (rd_prompt)
 		change_floppy("root floppy disk to be loaded into RAM disk");
-	create_dev("/dev/root", ROOT_DEV, root_device_name);
-	create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, n), NULL);
+	create_dev("/dev/root", ROOT_DEV);
+	create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, n));
 	return rd_load_image("/dev/root");
 }
 
--- linux-2.6.12-rc6-mm1-full/init/do_mounts_md.c.old	2005-06-11 20:20:08.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/init/do_mounts_md.c	2005-06-11 20:20:17.000000000 +0200
@@ -275,7 +275,7 @@
 
 void __init md_run_setup(void)
 {
-	create_dev("/dev/md0", MKDEV(MD_MAJOR, 0), "md/0");
+	create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
 	if (raid_noautodetect)
 		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
 	else {
--- linux-2.6.12-rc6-mm1-full/drivers/ide/ide-tape.c.old	2005-06-11 20:41:08.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/drivers/ide/ide-tape.c	2005-06-11 20:42:00.000000000 +0200
@@ -4875,7 +4875,6 @@
 
 	idetape_setup(drive, tape, minor);
 
-	g->number = -1;
 	g->fops = &idetape_block_ops;
 	ide_register_region(g);
 
--- linux-2.6.12-rc6-mm1-full/drivers/md/md.c.old	2005-06-11 20:48:07.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/drivers/md/md.c	2005-06-11 20:49:16.000000000 +0200
@@ -3947,7 +3947,6 @@
 {
 	mddev_t *mddev;
 	struct list_head *tmp;
-	int i;
 	blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS);
 	blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS << MdpMinorShift);
 


  parent reply	other threads:[~2005-06-11 20:15 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-11  7:43 [RFC] Patch series to remove devfs [00/22] Greg KH
2005-06-11 10:21 ` Adrian Bunk
2005-06-11 14:39   ` Greg KH
2005-06-11 15:36     ` Adrian Bunk
2005-06-11 15:41       ` Christoph Hellwig
2005-06-11 15:59         ` Adrian Bunk
2005-06-11 15:44       ` Kay Sievers
2005-06-11 20:14 ` Adrian Bunk [this message]
2005-06-16 21:34   ` [2.6 patch] fix compile errors and warning after devfs removal patches Greg KH
2005-06-12 22:44 ` [RFC] Patch series to remove devfs [00/22] J.A. Magallon
2005-06-13 17:43   ` Greg KH
2005-06-13 19:51     ` J.A. Magallon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050611201444.GM3770@stusta.de \
    --to=bunk@stusta.de \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox