From: S V. <vam...@in...> - 2002-04-09 11:00:48
|
I commited this into LKCD cvs. Regards.. Vamsi. Vamsi Krishna S. Linux Technology Center, IBM Software Lab, Bangalore. Ph: +91 80 5044959 Internet: vam...@in... |--------+--------------------------------------> | | "Howell, David P" | | | <dav...@in...> | | | Sent by: | | | lkc...@li...urc| | | eforge.net | | | | | | | | | 04/08/02 07:22 PM | | | Please respond to "Howell, | | | David P" | | | | |--------+--------------------------------------> >----------------------------------------------------------------------------------------------------------| | | | To: va...@li..., "Howell, David P" <dav...@in...> | | cc: george anzinger <ge...@mv...>, dev...@ca..., | | lkc...@li... | | Subject: [lkcd-devel] RE: [CarrierLinux Developer] Configure problem DUMP_COMPRESS | | | | | >----------------------------------------------------------------------------------------------------------| Vamsi, I've tried this and it appears to work. It's just been committed to TLT 1.1 for the builds. I guess the next step is to get it committed to the LKCD CVS, how best to proceed with this? Regards, Dave Howell -----Original Message----- From: Vamsi Krishna S . [mailto:va...@in...] Sent: Friday, April 05, 2002 2:28 AM To: Howell, David P Cc: george anzinger; dev...@ca...; lkc...@li... Subject: Re: [CarrierLinux Developer] Configure problem DUMP_COMPRESS Dave, If LKCD is compiled into the kernel and dump compression is built as a module (which is possible with your proposed changes to config.in) we some other changes too. How does this patch look to you? (cc'ing this to lkcd ml too, hope you don't mind). -- Vamsi Krishna S. Linux Technology Center, IBM Software Lab, Bangalore. Ph: +91 80 5262355 Extn: 3959 Internet: va...@in... -- diff -urN 2.4.ori/arch/i386/config.in 2.4/arch/i386/config.in --- 2.4.ori/arch/i386/config.in Tue Jan 22 15:18:43 2002 +++ 2.4/arch/i386/config.in Fri Apr 5 12:47:41 2002 @@ -406,11 +406,7 @@ comment 'Kernel hacking' tristate 'Linux Kernel Crash Dump (LKCD) Support' CONFIG_DUMP -if [ "$CONFIG_DUMP" = "y" ]; then - dep_bool ' LKCD RLE compression' CONFIG_DUMP_COMPRESS_RLE $CONFIG_DUMP - dep_bool ' LKCD GZIP compression' CONFIG_DUMP_COMPRESS_GZIP $CONFIG_DUMP -fi -if [ "$CONFIG_DUMP" = "m" ]; then +if [ "$CONFIG_DUMP" != "n" ]; then dep_tristate ' LKCD RLE compression' CONFIG_DUMP_COMPRESS_RLE $CONFIG_DUMP dep_tristate ' LKCD GZIP compression' CONFIG_DUMP_COMPRESS_GZIP $CONFIG_DUMP fi diff -urN 2.4.ori/drivers/dump/dump_gzip.c 2.4/drivers/dump/dump_gzip.c --- 2.4.ori/drivers/dump/dump_gzip.c Sun Mar 3 18:50:52 2002 +++ 2.4/drivers/dump/dump_gzip.c Fri Apr 5 12:48:42 2002 @@ -29,10 +29,6 @@ #define DUMP_PRINT(format, args...) \ printk(format , ## args); -/* external functions for dump compression registration */ -extern void dump_register_compression(dump_compress_t *); -extern void dump_unregister_compression(int); - /* * Name: dump_compress_gzip_alloc() * Func: The kmalloc function for gzip dump compression. diff -urN 2.4.ori/drivers/dump/dump_rle.c 2.4/drivers/dump/dump_rle.c --- 2.4.ori/drivers/dump/dump_rle.c Sun Mar 3 18:44:13 2002 +++ 2.4/drivers/dump/dump_rle.c Fri Apr 5 12:48:15 2002 @@ -16,10 +16,6 @@ #include <linux/init.h> #include <linux/dump.h> -/* external functions for dump compression registration */ -extern void dump_register_compression(dump_compress_t *); -extern void dump_unregister_compression(int); - /* * Name: dump_compress_rle() * Func: Compress a DUMP_PAGE_SIZE (hardware) page down to something more reasonable, diff -urN 2.4.ori/include/linux/dump.h 2.4/include/linux/dump.h --- 2.4.ori/include/linux/dump.h Thu Apr 4 12:02:32 2002 +++ 2.4/include/linux/dump.h Fri Apr 5 12:48:26 2002 @@ -299,7 +299,9 @@ int (*compress_func)(char *, int, char *, int); } dump_compress_t; - +/* functions for dump compression registration */ +extern void dump_register_compression(dump_compress_t *); +extern void dump_unregister_compression(int); /* * Structure dump_mbank[]: diff -urN 2.4.ori/kernel/ksyms.c 2.4/kernel/ksyms.c --- 2.4.ori/kernel/ksyms.c Tue Jan 22 15:18:43 2002 +++ 2.4/kernel/ksyms.c Fri Apr 5 12:49:29 2002 @@ -361,6 +361,8 @@ EXPORT_SYMBOL(dump_in_progress); EXPORT_SYMBOL(dumping_cpu); EXPORT_SYMBOL(panic_timeout); +EXPORT_SYMBOL(dump_register_compression); +EXPORT_SYMBOL(dump_unregister_compression); #endif /* interrupt handling */ -- On Thu, Apr 04, 2002 at 09:12:55AM -0800, Howell, David P wrote: > In arch/i386/config.in I just made the following change: > > --- config.in Fri Mar 22 14:56:01 2002 > +++ config.fix.in Thu Apr 4 11:54:36 2002 > @@ -406,12 +411,8 @@ > comment 'Kernel hacking' > > tristate 'Linux Kernel Crash Dump (LKCD) Support' CONFIG_DUMP > -if [ "$CONFIG_DUMP" = "y" ]; then > - dep_bool ' LKCD RLE compression' CONFIG_DUMP_COMPRESS_RLE $CONFIG_DUMP > - dep_bool ' LKCD GZIP compression' CONFIG_DUMP_COMPRESS_GZIP > $CONFIG_DUMP > -fi > -if [ "$CONFIG_DUMP" = "m" ]; then > - dep_tristate ' LKCD RLE compression' CONFIG_DUMP_COMPRESS_RLE > $CONFIG_DUMP > +if [ "$CONFIG_DUMP" != "n" ]; then > + dep_tristate ' LKCD RLE compression' CONFIG_DUMP_COMPRESS_RLE > $CONFIG_DUMP > dep_tristate ' LKCD GZIP compression' CONFIG_DUMP_COMPRESS_GZIP > $CONFIG_DUMP > fi > > This gets CONFIG_DUMP_COMPRESS_RLE and CONFIG_DUMP_COMPRESS_GZIP defined > and gets rid of the extra set of screen entries for these that was making > the xconfig screen busy and confusing for them. > > One deficit, some logic changed in that the values for the compression > variables could be "y" | "m" | "n", where in the original if CONFIG_DUMP > were "y" then the values for compression could have only been "y" | "n", > not "m"; this is not an problem if CONFIG_DUMP is "m". If this is an issue > we could add logic to catch and fix this case, but for now they should > have appropriate default values (i.e. matching CONFIG_DUMP). > > Does this work as you understand it needs to, Vamsi? Let me know and if > so I'll submit it for TLT 1.1 and to the lkcd mailing list. > > Thanks, > Dave Howell > > -----Original Message----- > From: Howell, David P [mailto:dav...@in...] > Sent: Thursday, April 04, 2002 11:14 AM > To: 'va...@in...'; george anzinger > Cc: dev...@ca... > Subject: RE: [CarrierLinux Developer] Configure problem DUMP_COMPRESS > > > I just looked at the latest CVS tree on sourceforge.net/projects/lkcd and > we match the latest CVS version for 2.4/arch/i386/config.in. This is a bug > and needs to be fixed, I'll take a look at getting it fixed and submit a > fix back to the lkcd mailing list. > > Dave Howell > > -----Original Message----- > From: Vamsi Krishna S . [mailto:va...@in...] > Sent: Thursday, April 04, 2002 3:25 AM > To: george anzinger > Cc: dev...@ca... > Subject: Re: [CarrierLinux Developer] Configure problem DUMP_COMPRESS > > > These CONFIG options are from LKCD. Look for "elif" construct > in arch/i386/config.in and replace it with fi;if. This was > fixed some time ago in the LKCD cvs. I don't know which version > of LKCD you are using but you need to something similar to: > > - elif [ "$CONFIG_DUMP" = "m" ]; then > + fi > + if [ "$CONFIG_DUMP" = "m" ]; then > > -- > Vamsi Krishna S. > Linux Technology Center, > IBM Software Lab, Bangalore. > Ph: +91 80 5262355 Extn: 3959 > Internet: va...@in... > > On Wed, Apr 03, 2002 at 08:26:31PM -0800, george anzinger wrote: > > I suppose this is unique to xconfig, but still something is wrong. This > > is the latest kernel with all patches thru high-res-timers. Anybody > > recognize those two CONFIG options. > > > > -g > > > > nice -10 make xconfig > > rm -f include/asm > > ( cd include ; ln -sf asm-i386 asm) > > make -C scripts kconfig.tk > > make[1]: Entering directory `/usr/src/linux-2.4.17-TLT-plus-hir/scripts' > > gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -c -o tkparse.o > > tkparse.c > > gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -c -o tkcond.o > > tkcond.c > > gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -c -o tkgen.o > > tkgen.c > > gcc -o tkparse tkparse.o tkcond.o tkgen.o > > cat header.tk >> ./kconfig.tk > > ./tkparse < ../arch/i386/config.in >> kconfig.tk > > echo "set defaults \"arch/i386/defconfig\"" >> kconfig.tk > > echo "set ARCH \"i386\"" >> kconfig.tk > > cat tail.tk >> kconfig.tk > > chmod 755 kconfig.tk > > make[1]: Leaving directory `/usr/src/linux-2.4.17-TLT-plus-hir/scripts' > > wish -f scripts/kconfig.tk > > ERROR - Attempting to write value for unconfigured variable > > (CONFIG_DUMP_COMPRESS_RLE). > > ERROR - Attempting to write value for unconfigured variable > > (CONFIG_DUMP_COMPRESS_GZIP). > > > > -- > > George Anzinger ge...@mv... > > High-res-timers: http://sourceforge.net/projects/high-res-timers/ > > Real time sched: http://sourceforge.net/projects/rtsched/ > > Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml _______________________________________________ lkcd-devel mailing list lkc...@li... https://lists.sourceforge.net/lists/listinfo/lkcd-devel |