Hello community, here is the log from the commit of package tpctl checked in at Wed Aug 23 02:12:46 CEST 2006. -------- --- arch/i386/tpctl/tpctl.changes 2006-04-10 18:42:21.000000000 +0200 +++ tpctl/tpctl.changes 2006-08-23 00:56:48.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 23 00:56:42 CEST 2006 - ro@suse.de + +- fix build on 2.6.18 + +------------------------------------------------------------------- New: ---- inter_module-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tpctl.spec ++++++ --- /var/tmp/diff_new_pack.QNHO6e/_old 2006-08-23 02:12:38.000000000 +0200 +++ /var/tmp/diff_new_pack.QNHO6e/_new 2006-08-23 02:12:38.000000000 +0200 @@ -13,7 +13,7 @@ BuildRequires: apmd kernel-source kernel-syms udev %define module_version 5.8 Version: 4.17 -Release: 25 +Release: 30 Summary: ThinkPad configuration tools License: GPL Group: Hardware/Mobile @@ -34,6 +34,7 @@ Patch1: thinkpad.dif Patch5: get_put_cpu_ptr-gone.diff Patch6: thinkpad-module_param.dif +Patch7: inter_module-fix.diff %suse_kernel_module_package -p %_sourcedir/preamble kdump um xen xenpae %description @@ -78,6 +79,7 @@ %patch1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 cd .. mkdir source mkdir obj @@ -134,6 +136,8 @@ rm -rf %{buildroot} %changelog -n tpctl +* Wed Aug 23 2006 - ro@suse.de +- fix build on 2.6.18 * Mon Apr 10 2006 - agruen@suse.de - Add preamble `Enhances: kernel-$flavor' workaround to KMP sub-packages (156513). ++++++ inter_module-fix.diff ++++++ --- thinkpad-5.8/2.6/drivers/thinkpad.c 2006/08/22 22:28:13 1.1 +++ thinkpad-5.8/2.6/drivers/thinkpad.c 2006/08/22 22:41:03 @@ -236,13 +236,17 @@ pxint_do_t pxint_doSmapi; int intRet; if ( ! enable_smapi ) return -ETHINKPAD_MODULE_DISABLED; - pxint_doSmapi = (pxint_do_t)inter_module_get_request( "smapi_do" , _szSmapiName ); + pxint_doSmapi = (pxint_do_t)__symbol_get("smapi_do"); + if (!pxint_doSmapi) { + request_module(_szSmapiName + sizeof(MODULE_SYMBOL_PREFIX) - 1); + pxint_doSmapi = (pxint_do_t)__symbol_get("smapi_do"); + } if ( pxint_doSmapi == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND; intRet = (*pxint_doSmapi)( ulongIoctlArg, caller_has_w( pfileThe ) ); - inter_module_put("smapi_do"); + symbol_put_addr(pxint_doSmapi); if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING; return intRet; } @@ -251,13 +255,17 @@ pxint_do_t pxint_doSuperio; int intRet; if ( ! enable_superio ) return -ETHINKPAD_MODULE_DISABLED; - pxint_doSuperio = (pxint_do_t)inter_module_get_request( "superio_do" , _szSuperioName ); + pxint_doSuperio = (pxint_do_t)__symbol_get("superio_do"); + if (!pxint_doSuperio) { + request_module(_szSuperioName + sizeof(MODULE_SYMBOL_PREFIX) - 1); + pxint_doSuperio = (pxint_do_t)__symbol_get("superio_do"); + } if ( pxint_doSuperio == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND; intRet = (*pxint_doSuperio)( ulongIoctlArg, caller_has_w( pfileThe ) ); - inter_module_put("superio_do"); + symbol_put_addr(pxint_doSuperio); if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING; return intRet; } @@ -266,13 +274,17 @@ pxint_do_t pxint_doRtcmosram; int intRet; if ( ! enable_rtcmosram ) return -ETHINKPAD_MODULE_DISABLED; - pxint_doRtcmosram = (pxint_do_t)inter_module_get_request( "rtcmosram_do" , _szRtcmosramName ); + pxint_doRtcmosram = (pxint_do_t)__symbol_get("rtcmosram_do"); + if (!pxint_doRtcmosram) { + request_module(_szRtcmosramName + sizeof(MODULE_SYMBOL_PREFIX) - 1); + pxint_doRtcmosram = (pxint_do_t)__symbol_get("rtcmosram_do"); + } if ( pxint_doRtcmosram == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND; intRet = (*pxint_doRtcmosram)( ulongIoctlArg, caller_has_w( pfileThe ) ); - inter_module_put("rtcmosram_do"); + symbol_put_addr(pxint_doRtcmosram); if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING; return intRet; } @@ -281,13 +293,17 @@ pxint_do_t pxint_doThinkpadpm; int intRet; if ( ! enable_thinkpadpm ) return -ETHINKPAD_MODULE_DISABLED; - pxint_doThinkpadpm = (pxint_do_t)inter_module_get_request( "thinkpadpm_do" , _szThinkpadpmName ); + pxint_doThinkpadpm = (pxint_do_t)__symbol_get("thinkpadpm_do"); + if (!pxint_doThinkpadpm) { + request_module(_szThinkpadpmName + sizeof(MODULE_SYMBOL_PREFIX) - 1); + pxint_doThinkpadpm = (pxint_do_t)__symbol_get("thinkpadpm_do"); + } if ( pxint_doThinkpadpm == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND; intRet = (*pxint_doThinkpadpm)( ulongIoctlArg, caller_has_w( pfileThe ) ); - inter_module_put("thinkpadpm_do"); + symbol_put_addr(pxint_doThinkpadpm); if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING; return intRet; } --- thinkpad-5.8/2.6/drivers/smapi_core.c 2006/08/22 22:49:34 1.1 +++ thinkpad-5.8/2.6/drivers/smapi_core.c 2006/08/22 22:52:03 @@ -63,6 +63,7 @@ #endif +EXPORT_SYMBOL_GPL(smapi_do); /****** functions *******/ @@ -298,8 +299,6 @@ } /* proc entry created */ - inter_module_register( _szImName, THIS_MODULE, &smapi_do ); - return 0; } @@ -307,8 +306,6 @@ static void __exit smapi_exit( void ) { - inter_module_unregister( _szImName ); - remove_proc_entry( _szProcfile, NULL ); return; --- thinkpad-5.8/2.6/drivers/superio.c 2006/08/22 22:53:06 1.1 +++ thinkpad-5.8/2.6/drivers/superio.c 2006/08/22 22:53:32 @@ -41,6 +41,7 @@ #include "thinkpad_common.h" #include "superio.h" +EXPORT_SYMBOL_GPL(superio_do); /****** definitions ******/ @@ -887,8 +888,6 @@ } /* proc entry created */ - inter_module_register( _szImName, THIS_MODULE, &superio_do ); - return 0; } @@ -896,8 +895,6 @@ static void __exit superio_exit( void ) { - inter_module_unregister( _szImName ); - remove_proc_entry( _szProcfile, NULL ); if ( _presourceSuperio != NULL ) release_resource( _presourceSuperio ); --- thinkpad-5.8/2.6/drivers/rtcmosram.c 2006/08/22 22:54:13 1.1 +++ thinkpad-5.8/2.6/drivers/rtcmosram.c 2006/08/22 22:54:37 @@ -41,6 +41,7 @@ #include "thinkpad_common.h" #include "rtcmosram.h" +EXPORT_SYMBOL_GPL(rtcmosram_do); /****** definitions ******/ @@ -226,8 +227,6 @@ } /* proc entry created */ - inter_module_register( _szImName, THIS_MODULE, &rtcmosram_do ); - return 0; } @@ -235,8 +234,6 @@ static void __exit rtcmosram_exit( void ) { - inter_module_unregister( _szImName ); - remove_proc_entry( _szProcfile, NULL ); if ( _presourceRtcmosram != NULL ) release_resource( _presourceRtcmosram ); --- thinkpad-5.8/2.6/drivers/thinkpadpm.c 2006/08/22 22:55:28 1.1 +++ thinkpad-5.8/2.6/drivers/thinkpadpm.c 2006/08/22 22:55:48 @@ -42,6 +42,7 @@ #include "thinkpad_common.h" #include "thinkpadpm.h" +EXPORT_SYMBOL_GPL(thinkpadpm_do); /****** definitions ******/ @@ -510,8 +511,6 @@ } /* proc entry created */ - inter_module_register( _szImName, THIS_MODULE, &thinkpadpm_do ); - return 0; } @@ -519,8 +518,6 @@ static void __exit thinkpadpm_exit( void ) { - inter_module_unregister( _szImName ); - remove_proc_entry( _szProcfile, NULL ); return; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org