From: Christoph Hellwig <hch@lst.de>
Some junk which was needed before we did the big cleansweep for the sysrq
syncing stuff.
drivers/char/sysrq.c | 1 -
include/linux/major.h | 30 ------------------------------
2 files changed, 31 deletions(-)
diff -puN drivers/char/sysrq.c~sysrq-cleanups drivers/char/sysrq.c
--- 25/drivers/char/sysrq.c~sysrq-cleanups 2003-09-19 09:59:45.000000000 -0700
+++ 25-akpm/drivers/char/sysrq.c 2003-09-19 09:59:45.000000000 -0700
@@ -56,7 +56,6 @@ static struct sysrq_key_op kgdb_op = {
extern void reset_vc(unsigned int);
-extern struct list_head super_blocks;
/* Whether we react on sysrq keys or just ignore them */
int sysrq_enabled = 1;
diff -puN include/linux/major.h~sysrq-cleanups include/linux/major.h
--- 25/include/linux/major.h~sysrq-cleanups 2003-09-19 09:59:45.000000000 -0700
+++ 25-akpm/include/linux/major.h 2003-09-19 09:59:45.000000000 -0700
@@ -160,34 +160,4 @@
#define IBM_TTY3270_MAJOR 227
#define IBM_FS3270_MAJOR 228
-/*
- * Tests for SCSI devices.
- */
-
-#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
- ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
- ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
-
-#define SCSI_BLK_MAJOR(M) \
- (SCSI_DISK_MAJOR(M) \
- || (M) == SCSI_CDROM_MAJOR)
-
-static __inline__ int scsi_blk_major(int m) {
- return SCSI_BLK_MAJOR(m);
-}
-
-/*
- * Tests for IDE devices
- */
-#define IDE_DISK_MAJOR(M) ((M) == IDE0_MAJOR || (M) == IDE1_MAJOR || \
- (M) == IDE2_MAJOR || (M) == IDE3_MAJOR || \
- (M) == IDE4_MAJOR || (M) == IDE5_MAJOR || \
- (M) == IDE6_MAJOR || (M) == IDE7_MAJOR || \
- (M) == IDE8_MAJOR || (M) == IDE9_MAJOR)
-
-static __inline__ int ide_blk_major(int m)
-{
- return IDE_DISK_MAJOR(m);
-}
-
#endif
_