projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 286939b5 JR |
1 | diff -urNp linux-660/arch/i386/kernel/edd.c linux-661/arch/i386/kernel/edd.c |
| 2 | --- linux-660/arch/i386/kernel/edd.c | |
| 3 | +++ linux-661/arch/i386/kernel/edd.c | |
| 4 | @@ -11,7 +11,7 @@ | |
| 5 | * fn41 - Check Extensions Present and | |
| 6 | * fn48 - Get Device Parametes with EDD extensions | |
| 7 | * made in setup.S, copied to safe structures in setup.c, | |
| 8 | - * and presents it in driverfs. | |
| 9 | + * and presents it in /proc. | |
| 10 | * | |
| 11 | * This program is free software; you can redistribute it and/or modify | |
| 12 | * it under the terms of the GNU General Public License v2.0 as published by | |
| 13 | @@ -26,7 +26,6 @@ | |
| 14 | ||
| 15 | /* | |
| 16 | * TODO: | |
| 17 | - * - Convert to using /proc instead of driverfs | |
| 18 | * - move edd.[ch] to better locations if/when one is decided | |
| 19 | * - keep current with 2.5 EDD code changes | |
| 20 | */ | |
| 21 | @@ -47,7 +46,7 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@ | |
| 22 | MODULE_DESCRIPTION("proc interface to BIOS EDD information"); | |
| 23 | MODULE_LICENSE("GPL"); | |
| 24 | ||
| 25 | -#define EDD_VERSION "0.08 2003-Jan-05" | |
| 26 | +#define EDD_VERSION "0.09 2003-Jan-22" | |
| 27 | #define EDD_DEVICE_NAME_SIZE 16 | |
| 28 | #define REPORT_URL "http://domsch.com/linux/edd30/results.html" | |
| 29 | ||
| 30 | @@ -601,7 +600,7 @@ edd_device_register(struct edd_device *e | |
| 31 | } | |
| 32 | ||
| 33 | /** | |
| 34 | - * edd_init() - creates driverfs tree of EDD data | |
| 35 | + * edd_init() - creates /proc tree of EDD data | |
| 36 | * | |
| 37 | * This assumes that eddnr and edd were | |
| 38 | * assigned in setup.c already. | |
| 39 | diff -urNp linux-660/arch/i386/kernel/setup.c linux-661/arch/i386/kernel/setup.c | |
| 40 | --- linux-660/arch/i386/kernel/setup.c | |
| 41 | +++ linux-661/arch/i386/kernel/setup.c | |
| 42 | @@ -698,7 +698,7 @@ static int __init copy_e820_map(struct e | |
| 43 | ||
| 44 | #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) | |
| 45 | unsigned char eddnr; | |
| 46 | -struct edd_info edd[EDDNR]; | |
| 47 | +struct edd_info edd[EDDMAXNR]; | |
| 48 | /** | |
| 49 | * copy_edd() - Copy the BIOS EDD information | |
| 50 | * from empty_zero_page into a safe place. | |
| 51 | diff -urNp linux-660/include/asm-i386/edd.h linux-661/include/asm-i386/edd.h | |
| 52 | --- linux-660/include/asm-i386/edd.h | |
| 53 | +++ linux-661/include/asm-i386/edd.h | |
| 54 | @@ -165,7 +165,7 @@ struct edd_info { | |
| 55 | struct edd_device_params params; | |
| 56 | } __attribute__ ((packed)); | |
| 57 | ||
| 58 | -extern struct edd_info edd[EDDNR]; | |
| 59 | +extern struct edd_info edd[EDDMAXNR]; | |
| 60 | extern unsigned char eddnr; | |
| 61 | #endif /*!__ASSEMBLY__ */ | |
| 62 |