Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Driver core: fix 'dynamic_debug' cmd line parameter
HOWTO: Sync patch for jp_JP/HOWTO
Update stable tree documentation
sysfs: Fix return values for sysdev_store_{ulong,int}
driver core: drivers/base/sys.c: update comments
Document kernel taint flags properly

+34 -19
+7 -7
Documentation/ja_JP/HOWTO
··· 11 11 fork. So if you have any comments or updates for this file, please try 12 12 to update the original English file first. 13 13 14 - Last Updated: 2008/08/21 14 + Last Updated: 2008/10/24 15 15 ================================== 16 16 これは、 17 - linux-2.6.27/Documentation/HOWTO 17 + linux-2.6.28/Documentation/HOWTO 18 18 の和訳です。 19 19 20 20 翻訳団体: JF プロジェクト < http://www.linux.or.jp/JF/ > 21 - 翻訳日: 2008/8/5 21 + 翻訳日: 2008/10/24 22 22 翻訳者: Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com> 23 23 校正者: 松倉さん <nbh--mats at nifty dot com> 24 24 小林 雅典さん (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp> ··· 110 110 新しいドキュメントファイルも追加することを勧めます。 111 111 カーネルの変更が、カーネルがユーザ空間に公開しているインターフェイスの 112 112 変更を引き起こす場合、その変更を説明するマニュアルページのパッチや情報 113 - をマニュアルページのメンテナ mtk.manpages@gmail.com に送ることを勧めま 114 - す。 113 + をマニュアルページのメンテナ mtk.manpages@gmail.com に送り、CC を 114 + linux-api@ver.kernel.org に送ることを勧めます。 115 115 116 116 以下はカーネルソースツリーに含まれている読んでおくべきファイルの一覧で 117 117 す- ··· 149 149 この他にパッチを作る方法についてのよくできた記述は- 150 150 151 151 "The Perfect Patch" 152 - http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt 152 + http://userweb.kernel.org/~akpm/stuff/tpp.txt 153 153 "Linux kernel patch submission format" 154 154 http://linux.yyz.us/patch-format.html 155 155 ··· 664 664 これについて全てがどのようにあるべきかについての詳細は、以下のドキュメ 665 665 ントの ChangeLog セクションを見てください- 666 666 "The Perfect Patch" 667 - http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt 667 + http://userweb.kernel.org/~akpm/stuff/tpp.txt 668 668 669 669 これらのどれもが、時にはとても困難です。これらの慣例を完璧に実施するに 670 670 は数年かかるかもしれません。これは継続的な改善のプロセスであり、そのた
+1
Documentation/stable_kernel_rules.txt
··· 12 12 marked CONFIG_BROKEN), an oops, a hang, data corruption, a real 13 13 security issue, or some "oh, that's not good" issue. In short, something 14 14 critical. 15 + - New device IDs and quirks are also accepted. 15 16 - No "theoretical race condition" issues, unless an explanation of how the 16 17 race can be exploited is also provided. 17 18 - It cannot contain any "trivial" fixes in it (spelling changes,
+17 -7
Documentation/sysctl/kernel.txt
··· 363 363 Non-zero if the kernel has been tainted. Numeric values, which 364 364 can be ORed together: 365 365 366 - 1 - A module with a non-GPL license has been loaded, this 367 - includes modules with no license. 368 - Set by modutils >= 2.4.9 and module-init-tools. 369 - 2 - A module was force loaded by insmod -f. 370 - Set by modutils >= 2.4.9 and module-init-tools. 371 - 4 - Unsafe SMP processors: SMP with CPUs not designed for SMP. 372 - 64 - A module from drivers/staging was loaded. 366 + 1 - A module with a non-GPL license has been loaded, this 367 + includes modules with no license. 368 + Set by modutils >= 2.4.9 and module-init-tools. 369 + 2 - A module was force loaded by insmod -f. 370 + Set by modutils >= 2.4.9 and module-init-tools. 371 + 4 - Unsafe SMP processors: SMP with CPUs not designed for SMP. 372 + 8 - A module was forcibly unloaded from the system by rmmod -f. 373 + 16 - A hardware machine check error occurred on the system. 374 + 32 - A bad page was discovered on the system. 375 + 64 - The user has asked that the system be marked "tainted". This 376 + could be because they are running software that directly modifies 377 + the hardware, or for other reasons. 378 + 128 - The system has died. 379 + 256 - The ACPI DSDT has been overridden with one supplied by the user 380 + instead of using the one provided by the hardware. 381 + 512 - A kernel warning has occurred. 382 + 1024 - A module from drivers/staging was loaded. 373 383
+6 -4
drivers/base/sys.c
··· 355 355 * sysdev_suspend - Suspend all system devices. 356 356 * @state: Power state to enter. 357 357 * 358 - * We perform an almost identical operation as sys_device_shutdown() 358 + * We perform an almost identical operation as sysdev_shutdown() 359 359 * above, though calling ->suspend() instead. Interrupts are disabled 360 360 * when this called. Devices are responsible for both saving state and 361 361 * quiescing or powering down the device. ··· 437 437 /** 438 438 * sysdev_resume - Bring system devices back to life. 439 439 * 440 - * Similar to sys_device_suspend(), but we iterate the list forwards 440 + * Similar to sysdev_suspend(), but we iterate the list forwards 441 441 * to guarantee that parent devices are resumed before their children. 442 442 * 443 443 * Note: Interrupts are disabled when called. ··· 488 488 if (end == buf) 489 489 return -EINVAL; 490 490 *(unsigned long *)(ea->var) = new; 491 - return end - buf; 491 + /* Always return full write size even if we didn't consume all */ 492 + return size; 492 493 } 493 494 EXPORT_SYMBOL_GPL(sysdev_store_ulong); 494 495 ··· 512 511 if (end == buf || new > INT_MAX || new < INT_MIN) 513 512 return -EINVAL; 514 513 *(int *)(ea->var) = new; 515 - return end - buf; 514 + /* Always return full write size even if we didn't consume all */ 515 + return size; 516 516 } 517 517 EXPORT_SYMBOL_GPL(sysdev_store_int); 518 518
+3 -1
lib/dynamic_printk.c
··· 402 402 iter->logical_modname, 403 403 iter->flag_names, iter->hash, iter->hash2); 404 404 } 405 + if (dynamic_enabled == DYNAMIC_ENABLED_ALL) 406 + set_all(true); 405 407 return 0; 406 408 } 407 409 module_init(dynamic_printk_init); ··· 413 411 { 414 412 if (str) 415 413 return -ENOENT; 416 - set_all(true); 414 + dynamic_enabled = DYNAMIC_ENABLED_ALL; 417 415 return 0; 418 416 } 419 417 /* Use early_param(), so we can get debug output as early as possible */