]>
Commit | Line | Data |
---|---|---|
4cbbfae3 | 1 | diff -ur -X dontdiff linux-2.4.9-13.1/drivers/block/rd.c linux-2.4.9-13.1pt1/drivers/block/rd.c |
2 | --- linux-2.4.9-13.1/drivers/block/rd.c Tue Nov 6 19:19:21 2001 | |
3 | +++ linux-2.4.9-13.1pt1/drivers/block/rd.c Tue Nov 6 23:43:49 2001 | |
4 | @@ -704,9 +704,6 @@ | |
5 | ||
6 | static void __init rd_load_disk(int n) | |
7 | { | |
8 | -#ifdef CONFIG_BLK_DEV_INITRD | |
9 | - extern kdev_t real_root_dev; | |
10 | -#endif | |
11 | ||
12 | if (rd_doload == 0) | |
13 | return; | |
14 | diff -ur -X dontdiff linux-2.4.9-13.1/include/linux/fs.h linux-2.4.9-13.1pt1/include/linux/fs.h | |
15 | --- linux-2.4.9-13.1/include/linux/fs.h Tue Nov 6 19:19:10 2001 | |
16 | +++ linux-2.4.9-13.1pt1/include/linux/fs.h Tue Nov 6 23:46:44 2001 | |
17 | @@ -1471,7 +1471,7 @@ | |
18 | extern void mount_root(void); | |
19 | ||
20 | #ifdef CONFIG_BLK_DEV_INITRD | |
21 | -extern kdev_t real_root_dev; | |
22 | +extern unsigned int real_root_dev; | |
23 | extern int change_root(kdev_t, const char *); | |
24 | #endif | |
25 | ||
26 | diff -ur -X dontdiff linux-2.4.9-13.1/init/main.c linux-2.4.9-13.1pt1/init/main.c | |
27 | --- linux-2.4.9-13.1/init/main.c Tue Nov 6 19:19:19 2001 | |
28 | +++ linux-2.4.9-13.1pt1/init/main.c Tue Nov 6 23:46:12 2001 | |
29 | @@ -126,7 +126,7 @@ | |
30 | int rows, cols; | |
31 | ||
32 | #ifdef CONFIG_BLK_DEV_INITRD | |
33 | -kdev_t real_root_dev; | |
34 | +unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */ | |
35 | #endif | |
36 | ||
37 | int root_mountflags = MS_RDONLY; | |
38 |