public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Robert Love <rml@tech9.net>
To: marcelo@conectiva.com.br, andre@linux-ide.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] silly ide without proc compile fix
Date: 28 Nov 2001 19:00:39 -0500	[thread overview]
Message-ID: <1006992039.813.6.camel@phantasy> (raw)

IDE subsystem fails to compile without proc support because
ide_remove_proc_entries is called but not defined.  Other uses of the
function are properly ifdef'ed, the following in ide-disk.c and
ide-floppy.c are not.

Please apply.

	Robert Love

diff -urN linux-2.4.17-pre1/drivers/ide/ide-disk.c linux/drivers/ide/ide-disk.c
--- linux-2.4.17-pre1/drivers/ide/ide-disk.c	Wed Nov 28 15:15:35 2001
+++ linux/drivers/ide/ide-disk.c	Wed Nov 28 17:05:07 2001
@@ -856,10 +856,12 @@
 			printk (KERN_ERR "%s: cleanup_module() called while still busy\n", drive->name);
 			failed++;
 		}
 		/* We must remove proc entries defined in this module.
 		   Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
 		if (drive->proc)
 			ide_remove_proc_entries(drive->proc, idedisk_proc);
+#endif
 	}
 	ide_unregister_module(&idedisk_module);
 }
diff -urN linux-2.4.17-pre1/drivers/ide/ide-floppy.c linux/drivers/ide/ide-floppy.c
--- linux-2.4.17-pre1/drivers/ide/ide-floppy.c	Wed Nov 28 15:15:35 2001
+++ linux/drivers/ide/ide-floppy.c	Wed Nov 28 17:09:21 2001
@@ -2071,8 +2071,10 @@
 		}
 		/* We must remove proc entries defined in this module.
 		   Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
 		if (drive->proc)
 			ide_remove_proc_entries(drive->proc, idefloppy_proc);
+#endif
 	}
 	ide_unregister_module(&idefloppy_module);
 }


                 reply	other threads:[~2001-11-29  0:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1006992039.813.6.camel@phantasy \
    --to=rml@tech9.net \
    --cc=andre@linux-ide.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcelo@conectiva.com.br \
    /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