]>
Commit | Line | Data |
---|---|---|
1 | diff -urN linux-2.4.22.org/drivers/ide/ide.c linux-2.4.22/drivers/ide/ide.c | |
2 | --- linux-2.4.22.org/drivers/ide/ide.c 2003-11-23 23:01:39.000000000 +0100 | |
3 | +++ linux-2.4.22/drivers/ide/ide.c 2003-11-23 23:02:29.000000000 +0100 | |
4 | @@ -2349,8 +2349,8 @@ | |
5 | #ifdef CONFIG_BLK_DEV_CMD640 | |
6 | case -14: /* "cmd640_vlb" */ | |
7 | { | |
8 | - extern void init_cmd640_vlb (void); | |
9 | - init_cmd640_vlb(); | |
10 | +// extern void init_cmd640_vlb (void); | |
11 | +// init_cmd640_vlb(); | |
12 | goto done; | |
13 | } | |
14 | #endif /* CONFIG_BLK_DEV_CMD640 */ | |
15 | diff -urN linux-2.4.22.org/drivers/ide/ide-probe.c linux-2.4.22/drivers/ide/ide-probe.c | |
16 | --- linux-2.4.22.org/drivers/ide/ide-probe.c 2003-11-23 23:01:39.000000000 +0100 | |
17 | +++ linux-2.4.22/drivers/ide/ide-probe.c 2003-11-23 23:05:18.000000000 +0100 | |
18 | @@ -1416,22 +1416,30 @@ | |
19 | #ifdef MODULE | |
20 | extern int (*ide_xlate_1024_hook)(kdev_t, int, int, const char *); | |
21 | ||
22 | -int init_module (void) | |
23 | +static int ideprobe_real_done = 0; | |
24 | + | |
25 | +int ideprobe_init_module (void) | |
26 | { | |
27 | unsigned int index; | |
28 | + | |
29 | + if (ideprobe_real_done) | |
30 | + return -EBUSY; | |
31 | ||
32 | for (index = 0; index < MAX_HWIFS; ++index) | |
33 | ide_unregister(index); | |
34 | ideprobe_init(); | |
35 | create_proc_ide_interfaces(); | |
36 | ide_xlate_1024_hook = ide_xlate_1024; | |
37 | + ideprobe_real_done = 1; | |
38 | return 0; | |
39 | } | |
40 | ||
41 | -void cleanup_module (void) | |
42 | +void ideprobe_cleanup_module (void) | |
43 | { | |
44 | ide_probe = NULL; | |
45 | ide_xlate_1024_hook = 0; | |
46 | } | |
47 | +EXPORT_SYMBOL(ideprobe_init_module); | |
48 | +EXPORT_SYMBOL(ideprobe_cleanup_module); | |
49 | MODULE_LICENSE("GPL"); | |
50 | #endif /* MODULE */ | |
51 | diff -urN linux-2.4.22.org/drivers/ide/ide-probe-mini.c linux-2.4.22/drivers/ide/ide-probe-mini.c | |
52 | --- linux-2.4.22.org/drivers/ide/ide-probe-mini.c 1970-01-01 01:00:00.000000000 +0100 | |
53 | +++ linux-2.4.22/drivers/ide/ide-probe-mini.c 2003-11-23 23:08:21.000000000 +0100 | |
54 | @@ -0,0 +1,29 @@ | |
55 | +/* | |
56 | + * linux/drivers/ide/ide-probe-mini.c Version 1 | |
57 | + * | |
58 | + * Copyright (C) 1994-1998 Linus Torvalds & authors (see below) | |
59 | + */ | |
60 | + | |
61 | +#include <linux/config.h> | |
62 | +#include <linux/module.h> | |
63 | +#include <linux/types.h> | |
64 | +#include <linux/string.h> | |
65 | +#include <linux/kernel.h> | |
66 | +#include <linux/kmod.h> | |
67 | + | |
68 | +#ifdef MODULE | |
69 | +extern int ideprobe_init_module(void); | |
70 | + | |
71 | +int init_module (void) | |
72 | +{ | |
73 | + return ideprobe_init_module(); | |
74 | +} | |
75 | + | |
76 | +extern void ideprobe_cleanup_module(void); | |
77 | + | |
78 | +void cleanup_module (void) | |
79 | +{ | |
80 | + ideprobe_cleanup_module(); | |
81 | +} | |
82 | +MODULE_LICENSE("GPL"); | |
83 | +#endif /* MODULE */ | |
84 | diff -urN linux-2.4.22.org/drivers/ide/Makefile linux-2.4.22/drivers/ide/Makefile | |
85 | --- linux-2.4.22.org/drivers/ide/Makefile 2003-11-23 23:01:39.000000000 +0100 | |
86 | +++ linux-2.4.22/drivers/ide/Makefile 2003-11-23 23:02:29.000000000 +0100 | |
87 | @@ -9,7 +9,7 @@ | |
88 | # | |
89 | ||
90 | ||
91 | -export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-dma.o ide-lib.o setup-pci.o ide-io.o ide-disk.o | |
92 | +export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-probe-mini.o ide-dma.o ide-lib.o setup-pci.o ide-io.o ide-disk.o | |
93 | ||
94 | all-subdirs := arm legacy pci ppc raid | |
95 | mod-subdirs := arm legacy pci ppc raid | |
96 | @@ -28,9 +28,8 @@ | |
97 | ||
98 | # Core IDE code - must come before legacy | |
99 | ||
100 | -ide-core-objs := ide-iops.o ide-taskfile.o ide.o ide-lib.o ide-io.o ide-default.o ide-proc.o | |
101 | -ide-detect-objs := ide-probe.o ide-geometry.o | |
102 | - | |
103 | +ide-core-objs := ide-iops.o ide-taskfile.o ide.o ide-lib.o ide-io.o ide-default.o ide-proc.o ide-probe.o ide-geometry.o | |
104 | +ide-detect-objs := ide-probe-mini.o | |
105 | ||
106 | ifeq ($(CONFIG_BLK_DEV_IDEPCI),y) | |
107 | ide-core-objs += setup-pci.o |