patch-1.3.58 linux/kernel/ksyms.c

• Lines: 248
• Date: Mon Jan 15 08:18:22 1996
• Orig file: v1.3.57/linux/kernel/ksyms.c
• Orig date: Sun Jan 14 16:30:15 1996

diff -u --recursive --new-file v1.3.57/linux/kernel/ksyms.c linux/kernel/ksyms.c
@@ -41,28 +41,10 @@
 #include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/sysctl.h>
+#include <linux/genhd.h>
 
 extern unsigned char aux_device_present, kbd_read_mask;
 
-#ifdef __alpha__
-# include <asm/io.h>
-# include <asm/hwrpb.h>
-
-extern void bcopy (const char *src, char *dst, int len);
-extern struct hwrpb_struct *hwrpb;
-
-/* these are C runtime functions with special calling conventions: */
-extern void __divl (void);
-extern void __reml (void);
-extern void __divq (void);
-extern void __remq (void);
-extern void __divlu (void);
-extern void __remlu (void);
-extern void __divqu (void);
-extern void __remqu (void);
-
-#endif
-
 #ifdef CONFIG_NET
 #include <linux/in.h>
 #include <linux/net.h>
@@ -84,9 +66,6 @@
 #include <net/tcp.h>
 #include <net/route.h>
 #include <linux/net_alias.h>
-#if defined(CONFIG_PPP) || defined(CONFIG_SLIP)
-#include "../drivers/net/slhc.h"
-#endif
 #endif
 #ifdef CONFIG_NET_ALIAS
 #include <linux/net_alias.h>
@@ -96,10 +75,6 @@
 #include <linux/bios32.h>
 #include <linux/pci.h>
 #endif
-#if defined(CONFIG_MSDOS_FS) && !defined(CONFIG_UMSDOS_FS)
-#include <linux/msdos_fs.h>
-#endif
-
 #if defined(CONFIG_PROC_FS)
 #include <linux/proc_fs.h>
 #endif
@@ -111,6 +86,19 @@
 #include <linux/smp.h>
 #endif
 
+#ifndef CONFIG_SCSI
+#if defined(CONFIG_PROC_FS)
+/*
+ * This is all required so that if we load all of scsi as a module,
+ * that the scsi code will be able to talk to the /proc/scsi handling
+ * in the procfs.
+ */
+extern int (* dispatch_scsi_info_ptr) (int ino, char *buffer, char **start,
+				off_t offset, int length, int inout);
+extern struct inode_operations proc_scsi_inode_operations;
+#endif
+#endif
+
 extern char *get_options(char *str, int *ints);
 extern void set_device_ro(int dev,int flag);
 extern struct file_operations * get_blkfops(unsigned int);
@@ -124,17 +112,6 @@
 #include "../drivers/net/8390.h"
 #endif
 
-#ifdef CONFIG_SCSI
-#include "../drivers/scsi/scsi.h"
-#include "../drivers/scsi/scsi_ioctl.h"
-#include "../drivers/scsi/hosts.h"
-#include "../drivers/scsi/constants.h"
-#include "../drivers/scsi/sd.h"
-#include <linux/scsicam.h>
-
-extern int generic_proc_info(char *, char **, off_t, int, int, int);
-#endif
-
 extern int sys_tz;
 extern int request_dma(unsigned int dmanr, char * deviceID);
 extern void free_dma(unsigned int dmanr);
@@ -154,30 +131,6 @@
 		SYMBOL_NAME_STR (Using_Versions) },
 #endif
 
-	/* platform dependent support */
-#ifdef __alpha__
-	X(_inb),
-	X(_inw),
-	X(_inl),
-	X(_outb),
-	X(_outw),
-	X(_outl),
-	X(bcopy),	/* generated by gcc-2.7.0 for string assignments */
-	X(hwrpb),
-	X(__divl),
-	X(__reml),
-	X(__divq),
-	X(__remq),
-	X(__divlu),
-	X(__remlu),
-	X(__divqu),
-	X(__remqu),
-	X(strlen),	/* used by ftape */
-	X(memcmp),
-	X(memmove),
-	X(__constant_c_memset),
-#endif
-
 	/* stackable module support */
 	X(rename_module_symbol),
 	X(register_symtab),
@@ -361,9 +314,6 @@
 	X(interruptible_sleep_on),
 	X(schedule),
 	X(current_set),
-#if defined(__i386__) && defined(__SMP__)
-	X(apic_reg),		/* Needed internally for the I386 inlines */
-#endif	
 	X(jiffies),
 	X(xtime),
 	X(do_gettimeofday),
@@ -431,15 +381,6 @@
 	X(ethdev_init),
 	X(NS8390_init),
 #endif
-#if defined(CONFIG_PPP) || defined(CONFIG_SLIP)
-    	/* VJ header compression */
-	X(slhc_init),
-	X(slhc_free),
-	X(slhc_remember),
-	X(slhc_compress),
-	X(slhc_uncompress),
-	X(slhc_toss),
-#endif
 #ifdef CONFIG_NET_ALIAS
 #include <linux/net_alias.h>
 #endif
@@ -484,50 +425,24 @@
 	X(tty_register_ldisc),
 	X(kill_fasync),
 #endif
-#ifdef CONFIG_SCSI
-	/* Supports loadable scsi drivers 
- 	 * technically some of this stuff could be moved to scsi.c, but
- 	 * scsi.c is initialized before the memory manager is set up.
- 	 * So we add it here too.  There is a duplicate set in scsi.c
- 	 * that is used when the entire scsi subsystem is a loadable
- 	 * module.
-	 */
-	X(scsi_register_module),
-	X(scsi_unregister_module),
-	X(scsi_free),
-	X(scsi_malloc),
-	X(scsi_register),
-	X(scsi_unregister),
-	X(scsicam_bios_param),
- 	X(allocate_device),
- 	X(scsi_do_cmd),
- 	X(scsi_command_size),
- 	X(scsi_init_malloc),
- 	X(scsi_init_free),
- 	X(scsi_ioctl),
-	X(scsi_mark_host_bus_reset),
-  	X(print_command),
-      	X(print_msg),
-  	X(print_status),
- 	X(print_sense),
- 	X(dma_free_sectors),
- 	X(kernel_scsi_ioctl),
- 	X(need_isa_buffer),
- 	X(request_queueable),
-	X(generic_proc_info),
- 	X(scsi_devices),
-	X(gendisk_head), /* Needed for sd.c */
-	X(resetup_one_dev), /* Needed for sd.c */
-#if defined(CONFIG_PROC_FS)
-	X(proc_print_scsidevice),
-#endif
-#else
+#ifndef CONFIG_SCSI
 	/*
 	 * With no scsi configured, we still need to export a few
 	 * symbols so that scsi can be loaded later via insmod.
+	 * Don't remove this unless you are 100% sure of what you are
+	 * doing.  If you want to remove this, you don't know what
+	 * you are doing!
 	 */
 	X(gendisk_head),
 	X(resetup_one_dev),
+#if defined(CONFIG_PROC_FS)
+	/*
+	 * This is required so that if we load scsi later, that the
+	 * scsi code can attach to /proc/scsi in the correct manner.
+	 */
+	X(proc_scsi_inode_operations),
+	X(dispatch_scsi_info_ptr),
+#endif
 #endif
 	/* Added to make file system as module */
 	X(set_writetime),
@@ -547,38 +462,6 @@
 	X(insert_inode_hash),
 	X(event),
 	X(__down),
-#if defined(CONFIG_MSDOS_FS) && !defined(CONFIG_UMSDOS_FS)
-	/* support for umsdos fs */
-	X(msdos_bmap),
-	X(msdos_create),
-	X(msdos_file_read),
-	X(msdos_file_write),
-	X(msdos_lookup),
-	X(msdos_mkdir),
-	X(msdos_mmap),
-	X(msdos_put_inode),
-	X(msdos_put_super),
-	X(msdos_read_inode),
-	X(msdos_read_super),
-	X(msdos_readdir),
-	X(msdos_rename),
-	X(msdos_rmdir),
-	X(msdos_smap),
-	X(msdos_statfs),
-	X(msdos_truncate),
-	X(msdos_unlink),
-	X(msdos_unlink_umsdos),
-	X(msdos_write_inode),
-#endif
-#ifdef CONFIG_PROC_FS
-	X(proc_register),
-	X(proc_unregister),
-	X(in_group_p),
-	X(generate_cluster),
-	X(proc_scsi),
-	X(proc_net_inode_operations),
-	X(proc_net),
-#endif
 /* all busmice */
 	X(add_mouse_randomness),
 	X(fasync_helper),